diff --git a/assets/layers/aerialway/aerialway.json b/assets/layers/aerialway/aerialway.json
new file mode 100644
index 0000000000..6596c80273
--- /dev/null
+++ b/assets/layers/aerialway/aerialway.json
@@ -0,0 +1,141 @@
+{
+ "pointRendering": [
+ {
+ "location": ["start"],
+ "marker": [
+ {
+ "icon": "square"
+ }
+ ],
+ "iconSize": "12,12"
+ },
+
+ {
+ "location": [
+ "point",
+ "projected_centerpoint"
+ ],
+ "label": {
+ "render": {
+ "en": "{name}"
+ },
+ "condition": "name~*",
+ "classes": "bg-white p-1 px-2 rounded"
+ },
+ "labelCssClasses": "bg-white px-2 py-1 no-weblate"
+ }
+ ],
+ "tagRenderings": [
+ "images",
+ {
+ "question": {
+ "en": "What type of aerialway is this?"
+ },
+ "id": "type",
+ "mappings": [
+ {
+ "if": "aerialway=cable_car",
+ "then": {
+ "en": "This is a cable car where the car goes up and down again on the same cable."
+ },
+ "icon": "./assets/layers/aerialway/cable_car.svg"
+ },
+ {
+ "if": "aerialway=gondola",
+ "then": {
+ "en": "This is a gondola where the cars go around in continuous circles"
+ },
+ "icon": "./assets/layers/aerialway/gondola_lift.svg"
+ },
+ {
+ "if": "aerialway=chair_lift",
+ "then": {
+ "en": "An open chairlift with seats to sit on and open to the outside air."
+ },
+ "icon": "./assets/layers/aerialway/chair_lift.svg"
+ },
+ {
+ "if": "aerialway=mixed",
+ "then": {
+ "en": "An aerialway which has both chairs and gondolas in the same continuous track"
+ }
+ },
+ {
+ "if": "aerialway=drag_lift",
+ "then": {
+ "en": "A drag lift"
+ },
+ "hideInAnswer": true
+ },
+ {
+ "if": "aerialway=t-bar",
+ "then": {
+ "en": "A drag lift with T-shaped carriers for two passengers at a time"
+ }
+ },
+ {
+ "if": "aerialway=j-bar",
+ "then": {
+ "en": "A drag lift with L-shaped bars for a single passenger at a time"
+ }
+ },
+ {
+ "if": "aerialway=platter",
+ "then": {
+ "en": "A drag lift with a platter to drag a single passenger at a time"
+ }
+ },
+ {
+ "if": "aerialway=rope_tow",
+ "then": {
+ "en": "A tow line which which drags skieers"
+ }
+ },
+ {
+ "if": "aerialway=magic_carpet",
+ "then": {
+ "en": "A magic carpet (a conveyor belt on the ground)"
+ }
+ },
+ {"if": "aerialway=zip_line",
+ "then": {
+ "en": "A zip line. (A touristical attraction where adventurous people go down at high speeds) "
+ }
+ }
+ ]
+ },
+ {
+ "id": "length",
+ "render": {
+ "en": "This aerialway is {_length:km} kilometer long"
+ }
+ }
+ ],
+ "lineRendering": [
+ {
+ "width": "4",
+ "color": "black"
+ }
+ ],
+ "id": "aerialway",
+ "name": {
+ "en": "Aerialways"
+ },
+ "description": {
+ "en": "Various forms of transport for passengers and goods that use wires, including cable cars, gondolas, chair lifts, drag lifts, and zip lines. "
+ },
+ "source": {
+ "osmTags": {
+ "and": [
+ "aerialway~*",
+ "aerialway!=pylon",
+ "aerialway!=station"
+ ]
+ }
+ },
+ "title": {
+ "render": {
+ "en": "Aerialway {name}"
+ }
+ }
+}
diff --git a/assets/layers/aerialway/cable_car.svg b/assets/layers/aerialway/cable_car.svg
new file mode 100644
index 0000000000..27fe83f577
--- /dev/null
+++ b/assets/layers/aerialway/cable_car.svg
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/assets/layers/aerialway/cable_car.svg.license b/assets/layers/aerialway/cable_car.svg.license
new file mode 100644
index 0000000000..3d555d02d0
--- /dev/null
+++ b/assets/layers/aerialway/cable_car.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: SuperFLoh
+SPDX-License-Identifier: CC-BY 3.0
\ No newline at end of file
diff --git a/assets/layers/aerialway/chair_lift.svg b/assets/layers/aerialway/chair_lift.svg
new file mode 100644
index 0000000000..e97e20f577
--- /dev/null
+++ b/assets/layers/aerialway/chair_lift.svg
@@ -0,0 +1,46 @@
+
+
+
+
diff --git a/assets/layers/aerialway/chair_lift.svg.license b/assets/layers/aerialway/chair_lift.svg.license
new file mode 100644
index 0000000000..52a4a188f3
--- /dev/null
+++ b/assets/layers/aerialway/chair_lift.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Gouvernement fran��ais, Roulex 45
+SPDX-License-Identifier: CC0
\ No newline at end of file
diff --git a/assets/layers/aerialway/gondola_lift.svg b/assets/layers/aerialway/gondola_lift.svg
new file mode 100644
index 0000000000..40f894b6fd
--- /dev/null
+++ b/assets/layers/aerialway/gondola_lift.svg
@@ -0,0 +1,54 @@
+
+
+
+
diff --git a/assets/layers/aerialway/gondola_lift.svg.license b/assets/layers/aerialway/gondola_lift.svg.license
new file mode 100644
index 0000000000..ca04df1116
--- /dev/null
+++ b/assets/layers/aerialway/gondola_lift.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Vasily Astanin
+SPDX-License-Identifier: CC-BY-SA 4.0
\ No newline at end of file
diff --git a/assets/layers/aerialway/license_info.json b/assets/layers/aerialway/license_info.json
new file mode 100644
index 0000000000..340647ea33
--- /dev/null
+++ b/assets/layers/aerialway/license_info.json
@@ -0,0 +1,32 @@
+[
+ {
+ "path": "cable_car.svg",
+ "license": "CC-BY 3.0",
+ "authors": [
+ "SuperFLoh"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Pictogram_Cable_Car_small.svg"
+ ]
+ },
+ {
+ "path": "chair_lift.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "Gouvernement fran��ais, Roulex 45"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:France_road_sign_CE20b.svg"
+ ]
+ },
+ {
+ "path": "gondola_lift.svg",
+ "license": "CC-BY-SA 4.0",
+ "authors": [
+ "Vasily Astanin"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Pictogram_Gondola_Lift.svg"
+ ]
+ }
+]
\ No newline at end of file
diff --git a/assets/layers/ski_piste/ski_piste.json b/assets/layers/ski_piste/ski_piste.json
new file mode 100644
index 0000000000..debef75be9
--- /dev/null
+++ b/assets/layers/ski_piste/ski_piste.json
@@ -0,0 +1,125 @@
+{
+ "pointRendering": [
+ {
+ "location": [
+ "point"
+ ],
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ }
+ ]
+ }
+ ],
+ "tagRenderings": [
+ "images",
+ {
+ "question": {
+ "en": "What is the difficulty of this piste?"
+ },
+ "id": "piste_difficulty",
+ "condition": "piste:type!=connection",
+ "mappings": [
+ {
+ "if": "piste:difficulty=novice",
+ "then": {
+ "en": "Novice (green)"
+ }
+ },
+ {
+ "if": "piste:difficulty=easy",
+ "then": {
+ "en": "Easy (blue)"
+ }
+ },
+ {
+ "if": "piste:difficulty=intermediate",
+ "then": {
+ "en": "Intermediate (red)"
+ }
+ },
+ {
+ "if": "piste:difficulty=advanced",
+ "then": {
+ "en": "Advanced (black)"
+ }
+ },
+ {
+ "if": "piste:difficulty=expert",
+ "then": {
+ "en": "Expert (orange/double black)"
+ }
+ },
+ {
+ "if": "piste:difficulty=freeride",
+ "then": {
+ "en": "Freeride"
+ }
+ }
+ ]
+ },
+ {
+ "id": "length",
+ "render": {
+ "en": "This part of the ski piste is {_length:km} kilometer long"
+ }
+ }
+ ],
+ "lineRendering": [
+ {
+ "width": "10",
+ "color": {
+ "mappings": [
+ {
+ "then": "green",
+ "if": "piste:difficulty=novice"
+ },
+ {
+ "if": "piste:difficulty=easy",
+ "then": "blue"
+ },
+ {
+ "if": "piste:difficulty=intermediate",
+ "then": "red"
+ },
+ {
+ "if": "piste:difficulty=advanced",
+ "then": "black"
+ },
+ {
+ "if": "piste:difficulty=expert",
+ "then": "orange"
+ },
+ {
+ "if": "piste:difficulty=",
+ "then": "gray"
+ }
+ ]
+ }
+ }
+ ],
+ "id": "ski_piste",
+ "name": {
+ "en": "Ski and snowboard pistes"
+ },
+ "description": {
+ "en": "Ski and snowboard pistes"
+ },
+ "source": {
+ "osmTags": {
+ "and": [
+ {"or":
+ [ "piste:type=downhill",
+ "piste:type=connection"]
+ },
+ "area!=yes"
+ ]
+ }
+ },
+ "title": {
+ "render": {
+ "en": "Ski piste {name}"
+ }
+ }
+}