diff --git a/data/presets.yaml b/data/presets.yaml
index c975f7959..f04b94426 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -321,6 +321,9 @@ en:
       collection_times:
         # collection_times=*
         label: Collection Times
+      colour:
+        # colour=*
+        label: Colour
       comment:
         # comment=*
         label: Changeset Comment
@@ -1149,6 +1152,26 @@ en:
         # phone field placeholder
         placeholder: +31 42 123 4567
       piste/difficulty:
+        # 'piste:difficulty=*'
+        label: Difficulty
+        options:
+          # 'piste:difficulty=advanced'
+          advanced: Advanced
+          # 'piste:difficulty=easy'
+          easy: Easy
+          # 'piste:difficulty=expert'
+          expert: Expert
+          # 'piste:difficulty=extreme'
+          extreme: Extreme
+          # 'piste:difficulty=freeride'
+          freeride: Freeride
+          # 'piste:difficulty=intermediate'
+          intermediate: Intermediate
+          # 'piste:difficulty=novice'
+          novice: Novice
+        # piste/difficulty field placeholder
+        placeholder: 'Easy, Intermediate, Advanced...'
+      piste/difficulty_downhill:
         # 'piste:difficulty=*'
         label: Difficulty
         options:
@@ -1166,7 +1189,43 @@ en:
           intermediate: Intermediate (blue square)
           # 'piste:difficulty=novice'
           novice: Novice (instructional)
-        # piste/difficulty field placeholder
+        # piste/difficulty_downhill field placeholder
+        placeholder: 'Easy, Intermediate, Advanced...'
+      piste/difficulty_nordic:
+        # 'piste:difficulty=*'
+        label: Difficulty
+        options:
+          # 'piste:difficulty=advanced'
+          advanced: 'Advanced - Narrow, steep or icy section, sharp turn'
+          # 'piste:difficulty=easy'
+          easy: 'Easy - Soft hills, short steep section'
+          # 'piste:difficulty=expert'
+          expert: Expert - Dangerous terrain around
+          # 'piste:difficulty=intermediate'
+          intermediate: Intermediate - Steep section
+          # 'piste:difficulty=novice'
+          novice: 'Novice - Flat, no effort needed'
+        # piste/difficulty_nordic field placeholder
+        placeholder: 'Easy, Intermediate, Advanced...'
+      piste/difficulty_skitour:
+        # 'piste:difficulty=*'
+        label: Difficulty
+        options:
+          # 'piste:difficulty=advanced'
+          advanced: 'Advanced - S: 40-45° incline'
+          # 'piste:difficulty=easy'
+          easy: 'Easy - WS: 30-35° incline'
+          # 'piste:difficulty=expert'
+          expert: 'Expert - SS: 45–50° incline'
+          # 'piste:difficulty=extreme'
+          extreme: 'Extreme - EX: >55° incline'
+          # 'piste:difficulty=freeride'
+          freeride: 'Freeride - AS: 50–55° incline'
+          # 'piste:difficulty=intermediate'
+          intermediate: 'Intermediate - ZS: 35-40° incline'
+          # 'piste:difficulty=novice'
+          novice: 'Novice - L: <30° incline'
+        # piste/difficulty_skitour field placeholder
         placeholder: 'Easy, Intermediate, Advanced...'
       piste/grooming:
         # 'piste:grooming=*'
@@ -1184,6 +1243,38 @@ en:
           scooter: Scooter/Snowmobile
           # 'piste:grooming=skating'
           skating: Skating
+      piste/grooming_downhill:
+        # 'piste:grooming=*'
+        label: Grooming
+        options:
+          # 'piste:grooming=backcountry'
+          backcountry: Backcountry - no grooming
+          # 'piste:grooming=classic'
+          classic: Classic
+          # 'piste:grooming=mogul'
+          mogul: Mogul
+      piste/grooming_hike:
+        # 'piste:grooming=*'
+        label: Grooming
+        options:
+          # 'piste:grooming=backcountry'
+          backcountry: Backcountry - Snowshoeing
+          # 'piste:grooming=classic'
+          classic: Classic - Winter Hiking
+      piste/grooming_nordic:
+        # 'piste:grooming=*'
+        label: Grooming
+        options:
+          # 'piste:grooming=backcountry'
+          backcountry: 'Backcountry, no grooming'
+          # 'piste:grooming=classic'
+          classic: Classic
+          # 'piste:grooming=classic+skating'
+          classic+skating: Classic and Skating
+          # 'piste:grooming=scooter'
+          scooter: Scooter/Snowmobile
+          # 'piste:grooming=skating'
+          skating: Skating
       piste/type:
         # 'piste:type=*'
         label: Type
@@ -1208,6 +1299,28 @@ en:
           sleigh: Sleigh
           # 'piste:type=snow_park'
           snow_park: Snow Park
+      piste/type_downhill:
+        # 'piste:type=*'
+        label: Type
+        options:
+          # 'piste:type=connection'
+          connection: Connection between pistes
+          # 'piste:type=downhill'
+          downhill: Downhill
+          # 'piste:type=playground'
+          playground: Playground
+          # 'piste:type=snow_park'
+          snow_park: Snow Park
+      piste/type_nordic:
+        # 'piste:type=*'
+        label: Type
+        options:
+          # 'piste:type=connection'
+          connection: Connection between pistes
+          # 'piste:type=downhill'
+          downhill: Nordic
+          # 'piste:type=playground'
+          playground: Playground
       place:
         # place=*
         label: Type
@@ -4887,11 +5000,46 @@ en:
         name: Water Utility Office
         # 'terms: water board,utility'
         terms: '<translate with synonyms or related terms for ''Water Utility Office'', separated by commas>'
-      piste:
+      piste/downhill:
+        # 'piste:type=downhill'
+        name: Downhill Piste/Ski Run
+        # 'terms: ski,alpine,snowboard,downhill,piste'
+        terms: '<translate with synonyms or related terms for ''Downhill Piste/Ski Run'', separated by commas>'
+      piste/hike:
+        # 'piste:type=hike'
+        name: Snowshoeing or Winter Hiking Trail
+        # 'terms: hike,winter hiking,snowshoe,snowshoeing,piste,ski'
+        terms: '<translate with synonyms or related terms for ''Snowshoeing or Winter Hiking Trail'', separated by commas>'
+      piste/ice_skate:
+        # 'piste:type=ice_skate'
+        name: Ice Skating Piste
+        # 'terms: ice,skating,ski,piste'
+        terms: '<translate with synonyms or related terms for ''Ice Skating Piste'', separated by commas>'
+      piste/nordic:
+        # 'piste:type=nordic'
+        name: Nordic or Crosscountry Piste/Ski Trail
+        # 'terms: ski,nordic,crosscountry,skating,piste'
+        terms: '<translate with synonyms or related terms for ''Nordic or Crosscountry Piste/Ski Trail'', separated by commas>'
+      piste/piste:
         # 'piste:type=*'
-        name: Piste/Ski Trail
-        # 'terms: ski,sled,sleigh,snowboard,nordic,downhill,snowmobile'
-        terms: '<translate with synonyms or related terms for ''Piste/Ski Trail'', separated by commas>'
+        name: Winter Sport Trails
+        # 'terms: ski,nordic,crosscountry,downhill,alpine,snowboard,skitour,ski touring,sled,luge,sleigh,sledge,ski-joring,husky,horse,winter hiking,snowshoe,snowshoeing,ice,skating'
+        terms: '<translate with synonyms or related terms for ''Winter Sport Trails'', separated by commas>'
+      piste/skitour:
+        # 'piste:type=skitour'
+        name: Ski Touring Trail
+        # 'terms: ski,skitour,crosscountry,ski touring,piste'
+        terms: '<translate with synonyms or related terms for ''Ski Touring Trail'', separated by commas>'
+      piste/sled:
+        # 'piste:type=sled'
+        name: Sled Piste
+        # 'terms: ski,sled,luge,sleigh,sledge,piste'
+        terms: '<translate with synonyms or related terms for ''Sled Piste'', separated by commas>'
+      piste/sleigh:
+        # 'piste:type=sleigh'
+        name: Sleigh Piste
+        # 'terms: ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse'
+        terms: '<translate with synonyms or related terms for ''Sleigh Piste'', separated by commas>'
       place:
         # place=*
         name: Place
diff --git a/data/presets/fields.json b/data/presets/fields.json
index b0ec1b069..801eb4d74 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -53,6 +53,7 @@
     "clothes": {"key": "clothes", "type": "semiCombo", "label": "Clothes"},
     "club": {"key": "club", "type": "typeCombo", "label": "Type"},
     "collection_times": {"key": "collection_times", "type": "text", "label": "Collection Times"},
+    "colour": {"key": "colour", "type": "text", "label": "Colour"},
     "comment": {"key": "comment", "type": "textarea", "label": "Changeset Comment", "placeholder": "Brief description of your contributions (required)"},
     "communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"},
     "construction": {"key": "construction", "type": "combo", "label": "Type"},
@@ -201,8 +202,16 @@
     "payment_multi": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "universal": true},
     "phases": {"key": "phases", "type": "number", "minValue": 1, "label": "Phases", "placeholder": "1, 2, 3..."},
     "phone": {"key": "phone", "type": "tel", "icon": "maki-telephone", "universal": true, "label": "Telephone", "placeholder": "+31 42 123 4567"},
-    "piste/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice (instructional)", "easy": "Easy (green circle)", "intermediate": "Intermediate (blue square)", "advanced": "Advanced (black diamond)", "expert": "Expert (double black diamond)", "freeride": "Freeride (off-piste)", "extreme": "Extreme (climbing equipment required)"}}},
+    "piste/difficulty_downhill": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice (instructional)", "easy": "Easy (green circle)", "intermediate": "Intermediate (blue square)", "advanced": "Advanced (black diamond)", "expert": "Expert (double black diamond)", "freeride": "Freeride (off-piste)", "extreme": "Extreme (climbing equipment required)"}}},
+    "piste/difficulty_nordic": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - Flat, no effort needed", "easy": "Easy - Soft hills, short steep section", "intermediate": "Intermediate - Steep section", "advanced": "Advanced - Narrow, steep or icy section, sharp turn", "expert": "Expert - Dangerous terrain around"}}},
+    "piste/difficulty_skitour": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - L: <30° incline", "easy": "Easy - WS: 30-35° incline", "intermediate": "Intermediate - ZS: 35-40° incline", "advanced": "Advanced - S: 40-45° incline", "expert": "Expert - SS: 45–50° incline", "freeride": "Freeride - AS: 50–55° incline", "extreme": "Extreme - EX: >55° incline"}}},
+    "piste/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice", "easy": "Easy", "intermediate": "Intermediate", "advanced": "Advanced", "expert": "Expert", "freeride": "Freeride", "extreme": "Extreme"}}},
+    "piste/grooming_downhill": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry - no grooming"}}},
+    "piste/grooming_hike": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - Winter Hiking", "backcountry": "Backcountry - Snowshoeing"}}},
+    "piste/grooming_nordic": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "backcountry": "Backcountry, no grooming", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
     "piste/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
+    "piste/type_downhill": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection between pistes"}}},
+    "piste/type_nordic": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Nordic", "playground": "Playground", "connection": "Connection between pistes"}}},
     "piste/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "nordic": "Nordic", "skitour": "Skitour", "sled": "Sled", "hike": "Hike", "sleigh": "Sleigh", "ice_skate": "Ice Skate", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection"}}},
     "place": {"key": "place", "type": "typeCombo", "label": "Type"},
     "plant": {"key": "plant", "type": "combo", "label": "Plant"},
diff --git a/data/presets/fields/colour.json b/data/presets/fields/colour.json
new file mode 100644
index 000000000..6ab9de9af
--- /dev/null
+++ b/data/presets/fields/colour.json
@@ -0,0 +1,5 @@
+{
+    "key": "colour",
+    "type": "text",
+    "label": "Colour"
+}
diff --git a/data/presets/fields/piste/difficulty.json b/data/presets/fields/piste/difficulty.json
index 7d3b3608a..a06a3d18b 100644
--- a/data/presets/fields/piste/difficulty.json
+++ b/data/presets/fields/piste/difficulty.json
@@ -5,13 +5,13 @@
     "placeholder": "Easy, Intermediate, Advanced...",
     "strings": {
         "options": {
-            "novice": "Novice (instructional)",
-            "easy": "Easy (green circle)",
-            "intermediate": "Intermediate (blue square)",
-            "advanced": "Advanced (black diamond)",
-            "expert": "Expert (double black diamond)",
-            "freeride": "Freeride (off-piste)",
-            "extreme": "Extreme (climbing equipment required)"
+            "novice": "Novice",
+            "easy": "Easy",
+            "intermediate": "Intermediate",
+            "advanced": "Advanced",
+            "expert": "Expert",
+            "freeride": "Freeride",
+            "extreme": "Extreme"
         }
     }
 }
diff --git a/data/presets/fields/piste/difficulty_downhill.json b/data/presets/fields/piste/difficulty_downhill.json
new file mode 100644
index 000000000..7d3b3608a
--- /dev/null
+++ b/data/presets/fields/piste/difficulty_downhill.json
@@ -0,0 +1,17 @@
+{
+    "key": "piste:difficulty",
+    "type": "combo",
+    "label": "Difficulty",
+    "placeholder": "Easy, Intermediate, Advanced...",
+    "strings": {
+        "options": {
+            "novice": "Novice (instructional)",
+            "easy": "Easy (green circle)",
+            "intermediate": "Intermediate (blue square)",
+            "advanced": "Advanced (black diamond)",
+            "expert": "Expert (double black diamond)",
+            "freeride": "Freeride (off-piste)",
+            "extreme": "Extreme (climbing equipment required)"
+        }
+    }
+}
diff --git a/data/presets/fields/piste/difficulty_nordic.json b/data/presets/fields/piste/difficulty_nordic.json
new file mode 100644
index 000000000..52d173667
--- /dev/null
+++ b/data/presets/fields/piste/difficulty_nordic.json
@@ -0,0 +1,15 @@
+{
+    "key": "piste:difficulty",
+    "type": "combo",
+    "label": "Difficulty",
+    "placeholder": "Easy, Intermediate, Advanced...",
+    "strings": {
+        "options": {
+            "novice": "Novice - Flat, no effort needed",
+            "easy": "Easy - Soft hills, short steep section",
+            "intermediate": "Intermediate - Steep section",
+            "advanced": "Advanced - Narrow, steep or icy section, sharp turn",
+            "expert": "Expert - Dangerous terrain around"
+        }
+    }
+}
diff --git a/data/presets/fields/piste/difficulty_skitour.json b/data/presets/fields/piste/difficulty_skitour.json
new file mode 100644
index 000000000..f4b68e209
--- /dev/null
+++ b/data/presets/fields/piste/difficulty_skitour.json
@@ -0,0 +1,17 @@
+{
+    "key": "piste:difficulty",
+    "type": "combo",
+    "label": "Difficulty",
+    "placeholder": "Easy, Intermediate, Advanced...",
+    "strings": {
+        "options": {
+            "novice": "Novice - L: <30° incline",
+            "easy": "Easy - WS: 30-35° incline",
+            "intermediate": "Intermediate - ZS: 35-40° incline",
+            "advanced": "Advanced - S: 40-45° incline",
+            "expert": "Expert - SS: 45–50° incline",
+            "freeride": "Freeride - AS: 50–55° incline",
+            "extreme": "Extreme - EX: >55° incline"
+        }
+    }
+}
diff --git a/data/presets/fields/piste/grooming_downhill.json b/data/presets/fields/piste/grooming_downhill.json
new file mode 100644
index 000000000..ad415eb25
--- /dev/null
+++ b/data/presets/fields/piste/grooming_downhill.json
@@ -0,0 +1,12 @@
+{
+    "key": "piste:grooming",
+    "type": "combo",
+    "label": "Grooming",
+    "strings": {
+        "options": {
+            "classic": "Classic",
+            "mogul": "Mogul",
+            "backcountry": "Backcountry - no grooming"
+        }
+    }
+}
diff --git a/data/presets/fields/piste/grooming_hike.json b/data/presets/fields/piste/grooming_hike.json
new file mode 100644
index 000000000..733b9da41
--- /dev/null
+++ b/data/presets/fields/piste/grooming_hike.json
@@ -0,0 +1,11 @@
+{
+    "key": "piste:grooming",
+    "type": "combo",
+    "label": "Grooming",
+    "strings": {
+        "options": {
+            "classic": "Classic - Winter Hiking",
+            "backcountry": "Backcountry - Snowshoeing"
+        }
+    }
+}
diff --git a/data/presets/fields/piste/grooming_nordic.json b/data/presets/fields/piste/grooming_nordic.json
new file mode 100644
index 000000000..71b07d971
--- /dev/null
+++ b/data/presets/fields/piste/grooming_nordic.json
@@ -0,0 +1,14 @@
+{
+    "key": "piste:grooming",
+    "type": "combo",
+    "label": "Grooming",
+    "strings": {
+        "options": {
+            "classic": "Classic",
+            "backcountry": "Backcountry, no grooming",
+            "classic+skating": "Classic and Skating",
+            "scooter": "Scooter/Snowmobile",
+            "skating": "Skating"
+        }
+    }
+}
diff --git a/data/presets/fields/piste/type_downhill.json b/data/presets/fields/piste/type_downhill.json
new file mode 100644
index 000000000..597f838e2
--- /dev/null
+++ b/data/presets/fields/piste/type_downhill.json
@@ -0,0 +1,13 @@
+{
+    "key": "piste:type",
+    "type": "typeCombo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "downhill": "Downhill",
+            "snow_park": "Snow Park",
+            "playground": "Playground",
+            "connection": "Connection between pistes"
+        }
+    }
+}
diff --git a/data/presets/fields/piste/type_nordic.json b/data/presets/fields/piste/type_nordic.json
new file mode 100644
index 000000000..2065421f4
--- /dev/null
+++ b/data/presets/fields/piste/type_nordic.json
@@ -0,0 +1,12 @@
+{
+    "key": "piste:type",
+    "type": "typeCombo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "downhill": "Nordic",
+            "playground": "Playground",
+            "connection": "Connection between pistes"
+        }
+    }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4d1f7eb42..814adcd7b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -659,7 +659,14 @@
     "office/telecommunication": {"icon": "maki-telephone", "fields": ["name", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"office": "telecommunication"}, "terms": ["communication", "internet", "phone", "voice"], "name": "Telecom Office"},
     "office/therapist": {"icon": "maki-suitcase", "fields": ["name", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"office": "therapist"}, "terms": ["therapy"], "name": "Therapist Office"},
     "office/water_utility": {"icon": "maki-suitcase", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"office": "water_utility"}, "terms": ["water board", "utility"], "name": "Water Utility Office"},
-    "piste": {"icon": "maki-skiing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "sled", "sleigh", "snowboard", "nordic", "downhill", "snowmobile"], "tags": {"piste:type": "*"}, "name": "Piste/Ski Trail"},
+    "piste/downhill": {"icon": "maki-skiing", "fields": ["name", "piste/type_downhill", "piste/difficulty_downhill", "piste/grooming_downhill", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "alpine", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill"}, "name": "Downhill Piste/Ski Run"},
+    "piste/hike": {"icon": "fas-snowflake", "fields": ["name", "piste/difficulty", "piste/grooming_hike", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["hike", "winter hiking", "snowshoe", "snowshoeing", "piste", "ski"], "tags": {"piste:type": "hike"}, "name": "Snowshoeing or Winter Hiking Trail"},
+    "piste/ice_skate": {"icon": "fas-snowflake", "fields": ["name", "sport_ice", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ice", "skating", "ski", "piste"], "tags": {"piste:type": "ice_skate"}, "name": "Ice Skating Piste"},
+    "piste/nordic": {"icon": "maki-skiing", "fields": ["name", "piste/type_nordic", "piste/difficulty_nordic", "piste/grooming_nordic", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "skating", "piste"], "tags": {"piste:type": "nordic"}, "name": "Nordic or Crosscountry Piste/Ski Trail"},
+    "piste/piste": {"icon": "maki-skiing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "downhill", "alpine", "snowboard", "skitour", "ski touring", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse", "winter hiking", "snowshoe", "snowshoeing", "ice", "skating"], "tags": {"piste:type": "*"}, "name": "Winter Sport Trails"},
+    "piste/skitour": {"icon": "maki-skiing", "fields": ["name", "piste/difficulty_skitour", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "skitour", "crosscountry", "ski touring", "piste"], "tags": {"piste:type": "skitour"}, "name": "Ski Touring Trail"},
+    "piste/sled": {"icon": "fas-snowflake", "fields": ["name", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "sled", "luge", "sleigh", "sledge", "piste"], "tags": {"piste:type": "sled"}, "name": "Sled Piste"},
+    "piste/sleigh": {"icon": "fas-snowflake", "fields": ["name", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "piste", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse"], "tags": {"piste:type": "sleigh"}, "name": "Sleigh Piste"},
     "place/farm": {"icon": "maki-farm", "geometry": ["point", "area"], "fields": ["name"], "tags": {"place": "farm"}, "name": "Farm", "searchable": false},
     "place/city": {"icon": "maki-city", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "city"}, "name": "City"},
     "place/hamlet": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "hamlet"}, "name": "Hamlet"},
@@ -971,7 +978,7 @@
     "type/route/horse": {"icon": "iD-route-horse", "fields": ["name", "ref_route", "operator", "network_horse", "description", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"},
     "type/route/light_rail": {"icon": "iD-route-light-rail", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"},
     "type/route/pipeline": {"icon": "iD-route-pipeline", "fields": ["name", "ref_route", "operator"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"},
-    "type/route/piste": {"icon": "iD-route-piste", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"},
+    "type/route/piste": {"icon": "iD-route-piste", "fields": ["name", "piste/type", "colour", "ref_route", "operator"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"},
     "type/route/power": {"icon": "iD-route-power", "fields": ["name", "ref_route", "operator"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"},
     "type/route/road": {"icon": "iD-route-road", "fields": ["name", "ref_route", "network_road"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"},
     "type/route/subway": {"icon": "iD-route-subway", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"},
diff --git a/data/presets/presets/piste/downhill.json b/data/presets/presets/piste/downhill.json
new file mode 100644
index 000000000..a93097c42
--- /dev/null
+++ b/data/presets/presets/piste/downhill.json
@@ -0,0 +1,26 @@
+{
+    "icon": "maki-skiing",
+    "fields": [
+        "name",
+        "piste/type_downhill",
+        "piste/difficulty_downhill",
+        "piste/grooming_downhill",
+        "oneway",
+        "lit"
+    ],
+    "geometry": [
+        "line",
+        "area"
+    ],
+    "terms": [
+        "ski",
+        "alpine",
+        "snowboard",
+        "downhill",
+        "piste"
+    ],
+    "tags": {
+        "piste:type": "downhill"
+    },
+    "name": "Downhill Piste/Ski Run"
+}
diff --git a/data/presets/presets/piste/hike.json b/data/presets/presets/piste/hike.json
new file mode 100644
index 000000000..9376515b7
--- /dev/null
+++ b/data/presets/presets/piste/hike.json
@@ -0,0 +1,26 @@
+{
+    "icon": "fas-snowflake",
+    "fields": [
+        "name",
+        "piste/difficulty",
+        "piste/grooming_hike",
+        "oneway",
+        "lit"
+    ],
+    "geometry": [
+        "line",
+        "area"
+    ],
+    "terms": [
+        "hike",
+        "winter hiking",
+        "snowshoe",
+        "snowshoeing",
+        "piste",
+        "ski"
+    ],
+    "tags": {
+        "piste:type": "hike"
+    },
+    "name": "Snowshoeing or Winter Hiking Trail"
+}
diff --git a/data/presets/presets/piste/ice_skate.json b/data/presets/presets/piste/ice_skate.json
new file mode 100644
index 000000000..4e6a86bde
--- /dev/null
+++ b/data/presets/presets/piste/ice_skate.json
@@ -0,0 +1,23 @@
+{
+    "icon": "fas-snowflake",
+    "fields": [
+        "name",
+        "sport_ice",
+        "oneway",
+        "lit"
+    ],
+    "geometry": [
+        "line",
+        "area"
+    ],
+    "terms": [
+        "ice",
+        "skating",
+        "ski",
+        "piste"
+    ],
+    "tags": {
+        "piste:type": "ice_skate"
+    },
+    "name": "Ice Skating Piste"
+}
diff --git a/data/presets/presets/piste/nordic.json b/data/presets/presets/piste/nordic.json
new file mode 100644
index 000000000..42a95f751
--- /dev/null
+++ b/data/presets/presets/piste/nordic.json
@@ -0,0 +1,26 @@
+{
+    "icon": "maki-skiing",
+    "fields": [
+        "name",
+        "piste/type_nordic",
+        "piste/difficulty_nordic",
+        "piste/grooming_nordic",
+        "oneway",
+        "lit"
+    ],
+    "geometry": [
+        "line",
+        "area"
+    ],
+    "terms": [
+        "ski",
+        "nordic",
+        "crosscountry",
+        "skating",
+        "piste"
+    ],
+    "tags": {
+        "piste:type": "nordic"
+    },
+    "name": "Nordic or Crosscountry Piste/Ski Trail"
+}
diff --git a/data/presets/presets/piste/piste.json b/data/presets/presets/piste/piste.json
new file mode 100644
index 000000000..c6c38f060
--- /dev/null
+++ b/data/presets/presets/piste/piste.json
@@ -0,0 +1,41 @@
+{
+    "icon": "maki-skiing",
+    "fields": [
+        "name",
+        "piste/type",
+        "piste/difficulty",
+        "piste/grooming",
+        "oneway",
+        "lit"
+    ],
+    "geometry": [
+        "line",
+        "area"
+    ],
+    "terms": [
+        "ski",
+        "nordic",
+        "crosscountry",
+        "downhill",
+        "alpine",
+        "snowboard",
+        "skitour",
+        "ski touring",
+        "sled",
+        "luge",
+        "sleigh",
+        "sledge",
+        "ski-joring",
+        "husky",
+        "horse",
+        "winter hiking",
+        "snowshoe",
+        "snowshoeing",
+        "ice",
+        "skating"
+    ],
+    "tags": {
+        "piste:type": "*"
+    },
+    "name": "Winter Sport Trails"
+}
diff --git a/data/presets/presets/piste/skitour.json b/data/presets/presets/piste/skitour.json
new file mode 100644
index 000000000..a8ab25a0b
--- /dev/null
+++ b/data/presets/presets/piste/skitour.json
@@ -0,0 +1,25 @@
+{
+    "icon": "maki-skiing",
+    "fields": [
+        "name",
+        "piste/difficulty_skitour",
+        "piste/grooming",
+        "oneway",
+        "lit"
+    ],
+    "geometry": [
+        "line",
+        "area"
+    ],
+    "terms": [
+        "ski",
+        "skitour",
+        "crosscountry",
+        "ski touring",
+        "piste"
+    ],
+    "tags": {
+        "piste:type": "skitour"
+    },
+    "name": "Ski Touring Trail"
+}
diff --git a/data/presets/presets/piste.json b/data/presets/presets/piste/sled.json
similarity index 57%
rename from data/presets/presets/piste.json
rename to data/presets/presets/piste/sled.json
index b838e1b0c..594cb743a 100644
--- a/data/presets/presets/piste.json
+++ b/data/presets/presets/piste/sled.json
@@ -1,29 +1,26 @@
 {
-    "icon": "maki-skiing",
+    "icon": "fas-snowflake",
     "fields": [
         "name",
-        "piste/type",
         "piste/difficulty",
         "piste/grooming",
         "oneway",
         "lit"
     ],
     "geometry": [
-        "point",
         "line",
         "area"
     ],
     "terms": [
         "ski",
         "sled",
+        "luge",
         "sleigh",
-        "snowboard",
-        "nordic",
-        "downhill",
-        "snowmobile"
+        "sledge",
+        "piste"
     ],
     "tags": {
-        "piste:type": "*"
+        "piste:type": "sled"
     },
-    "name": "Piste/Ski Trail"
+    "name": "Sled Piste"
 }
diff --git a/data/presets/presets/piste/sleigh.json b/data/presets/presets/piste/sleigh.json
new file mode 100644
index 000000000..8b919c431
--- /dev/null
+++ b/data/presets/presets/piste/sleigh.json
@@ -0,0 +1,29 @@
+{
+    "icon": "fas-snowflake",
+    "fields": [
+        "name",
+        "piste/difficulty",
+        "piste/grooming",
+        "oneway",
+        "lit"
+    ],
+    "geometry": [
+        "line",
+        "area"
+    ],
+    "terms": [
+        "ski",
+        "piste",
+        "sled",
+        "luge",
+        "sleigh",
+        "sledge",
+        "ski-joring",
+        "husky",
+        "horse"
+    ],
+    "tags": {
+        "piste:type": "sleigh"
+    },
+    "name": "Sleigh Piste"
+}
diff --git a/data/presets/presets/type/route/piste.json b/data/presets/presets/type/route/piste.json
index d670b77b3..42993a796 100644
--- a/data/presets/presets/type/route/piste.json
+++ b/data/presets/presets/type/route/piste.json
@@ -2,9 +2,10 @@
     "icon": "iD-route-piste",
     "fields": [
         "name",
+        "piste/type",
+        "colour",
         "ref_route",
-        "operator",
-        "network"
+        "operator"
     ],
     "geometry": [
         "relation"
diff --git a/data/taginfo.json b/data/taginfo.json
index 244690dee..299bcf6ee 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -4414,10 +4414,59 @@
     },
     {
       "key": "piste:type",
-      "description": "Piste/Ski Trail",
-      "object_types": ["node", "way", "area"],
+      "value": "downhill",
+      "description": "Downhill Piste/Ski Run, Type",
+      "object_types": ["way", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
     },
+    {
+      "key": "piste:type",
+      "value": "hike",
+      "description": "Snowshoeing or Winter Hiking Trail, Type",
+      "object_types": ["way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "value": "ice_skate",
+      "description": "Ice Skating Piste, Type",
+      "object_types": ["way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "value": "nordic",
+      "description": "Nordic or Crosscountry Piste/Ski Trail, Type",
+      "object_types": ["way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "description": "Winter Sport Trails",
+      "object_types": ["way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "value": "skitour",
+      "description": "Ski Touring Trail, Type",
+      "object_types": ["way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "value": "sled",
+      "description": "Sled Piste, Type",
+      "object_types": ["way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "value": "sleigh",
+      "description": "Sleigh Piste, Type",
+      "object_types": ["way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
+    },
     {
       "key": "place",
       "value": "farm",
@@ -6640,6 +6689,7 @@
     {"key": "castle_type", "description": "Type"},
     {"key": "clothes", "description": "Clothes"},
     {"key": "collection_times", "description": "Collection Times"},
+    {"key": "colour", "description": "Colour"},
     {"key": "comment", "description": "Changeset Comment"},
     {"key": "communication:", "description": "Communication Types"},
     {"key": "construction", "description": "Type"},
@@ -7092,13 +7142,6 @@
     },
     {"key": "piste:grooming", "value": "scooter", "description": "Grooming"},
     {"key": "piste:grooming", "value": "skating", "description": "Grooming"},
-    {"key": "piste:type", "value": "downhill", "description": "Type"},
-    {"key": "piste:type", "value": "nordic", "description": "Type"},
-    {"key": "piste:type", "value": "skitour", "description": "Type"},
-    {"key": "piste:type", "value": "sled", "description": "Type"},
-    {"key": "piste:type", "value": "hike", "description": "Type"},
-    {"key": "piste:type", "value": "sleigh", "description": "Type"},
-    {"key": "piste:type", "value": "ice_skate", "description": "Type"},
     {"key": "piste:type", "value": "snow_park", "description": "Type"},
     {"key": "piste:type", "value": "playground", "description": "Type"},
     {"key": "piste:type", "value": "connection", "description": "Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index cac517781..431da2fe2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1730,6 +1730,9 @@
                 "collection_times": {
                     "label": "Collection Times"
                 },
+                "colour": {
+                    "label": "Colour"
+                },
                 "comment": {
                     "label": "Changeset Comment",
                     "placeholder": "Brief description of your contributions (required)"
@@ -2427,7 +2430,7 @@
                     "label": "Telephone",
                     "placeholder": "+31 42 123 4567"
                 },
-                "piste/difficulty": {
+                "piste/difficulty_downhill": {
                     "label": "Difficulty",
                     "placeholder": "Easy, Intermediate, Advanced...",
                     "options": {
@@ -2440,6 +2443,68 @@
                         "extreme": "Extreme (climbing equipment required)"
                     }
                 },
+                "piste/difficulty_nordic": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice - Flat, no effort needed",
+                        "easy": "Easy - Soft hills, short steep section",
+                        "intermediate": "Intermediate - Steep section",
+                        "advanced": "Advanced - Narrow, steep or icy section, sharp turn",
+                        "expert": "Expert - Dangerous terrain around"
+                    }
+                },
+                "piste/difficulty_skitour": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice - L: <30° incline",
+                        "easy": "Easy - WS: 30-35° incline",
+                        "intermediate": "Intermediate - ZS: 35-40° incline",
+                        "advanced": "Advanced - S: 40-45° incline",
+                        "expert": "Expert - SS: 45–50° incline",
+                        "freeride": "Freeride - AS: 50–55° incline",
+                        "extreme": "Extreme - EX: >55° incline"
+                    }
+                },
+                "piste/difficulty": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice",
+                        "easy": "Easy",
+                        "intermediate": "Intermediate",
+                        "advanced": "Advanced",
+                        "expert": "Expert",
+                        "freeride": "Freeride",
+                        "extreme": "Extreme"
+                    }
+                },
+                "piste/grooming_downhill": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic",
+                        "mogul": "Mogul",
+                        "backcountry": "Backcountry - no grooming"
+                    }
+                },
+                "piste/grooming_hike": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic - Winter Hiking",
+                        "backcountry": "Backcountry - Snowshoeing"
+                    }
+                },
+                "piste/grooming_nordic": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic",
+                        "backcountry": "Backcountry, no grooming",
+                        "classic+skating": "Classic and Skating",
+                        "scooter": "Scooter/Snowmobile",
+                        "skating": "Skating"
+                    }
+                },
                 "piste/grooming": {
                     "label": "Grooming",
                     "options": {
@@ -2451,6 +2516,23 @@
                         "skating": "Skating"
                     }
                 },
+                "piste/type_downhill": {
+                    "label": "Type",
+                    "options": {
+                        "downhill": "Downhill",
+                        "snow_park": "Snow Park",
+                        "playground": "Playground",
+                        "connection": "Connection between pistes"
+                    }
+                },
+                "piste/type_nordic": {
+                    "label": "Type",
+                    "options": {
+                        "downhill": "Nordic",
+                        "playground": "Playground",
+                        "connection": "Connection between pistes"
+                    }
+                },
                 "piste/type": {
                     "label": "Type",
                     "options": {
@@ -5714,9 +5796,37 @@
                     "name": "Water Utility Office",
                     "terms": "water board,utility"
                 },
-                "piste": {
-                    "name": "Piste/Ski Trail",
-                    "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
+                "piste/downhill": {
+                    "name": "Downhill Piste/Ski Run",
+                    "terms": "ski,alpine,snowboard,downhill,piste"
+                },
+                "piste/hike": {
+                    "name": "Snowshoeing or Winter Hiking Trail",
+                    "terms": "hike,winter hiking,snowshoe,snowshoeing,piste,ski"
+                },
+                "piste/ice_skate": {
+                    "name": "Ice Skating Piste",
+                    "terms": "ice,skating,ski,piste"
+                },
+                "piste/nordic": {
+                    "name": "Nordic or Crosscountry Piste/Ski Trail",
+                    "terms": "ski,nordic,crosscountry,skating,piste"
+                },
+                "piste/piste": {
+                    "name": "Winter Sport Trails",
+                    "terms": "ski,nordic,crosscountry,downhill,alpine,snowboard,skitour,ski touring,sled,luge,sleigh,sledge,ski-joring,husky,horse,winter hiking,snowshoe,snowshoeing,ice,skating"
+                },
+                "piste/skitour": {
+                    "name": "Ski Touring Trail",
+                    "terms": "ski,skitour,crosscountry,ski touring,piste"
+                },
+                "piste/sled": {
+                    "name": "Sled Piste",
+                    "terms": "ski,sled,luge,sleigh,sledge,piste"
+                },
+                "piste/sleigh": {
+                    "name": "Sleigh Piste",
+                    "terms": "ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse"
                 },
                 "place/farm": {
                     "name": "Farm",