diff --git a/package.json b/package.json
index 348f4c0..1b8ccfb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hsl-map-style",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "",
   "main": "index.js",
   "bin": {
diff --git a/style.json b/style.json
index 4ae71fa..ea4498c 100644
--- a/style.json
+++ b/style.json
@@ -5,10 +5,10 @@
   "sources": {
     "vector": {
       "type": "vector",
-      "url": "https://api.digitransit.fi/map/v2/hsl-vector-map/index.json"
+      "url": "https://api.digitransit.fi/map/v3/hsl-vector-map/index.json"
     },
     "parkandride": {
-      "url": "https://api.digitransit.fi/map/v2/hsl-parkandride-map/index.json",
+      "url": "https://api.digitransit.fi/map/v3/hsl/fi/vehicleParking/tilejson.json",
       "type": "vector"
     },
     "borders": {
@@ -36,8 +36,8 @@
       "type": "geojson"
     },
     "ticket-sales": {
-      "url": "https://api.digitransit.fi/map/v2/hsl-ticket-sales-map/index.json",
-      "type": "vector"
+      "data": "https://data-hslhrt.opendata.arcgis.com/datasets/f9388fc8a8f848fda3bc584b607afe97_0.geojson",
+      "type": "geojson"
     },
     "stops": {
       "url": "https://kartat.hsl.fi/jore/tiles/stops/index.json",
@@ -48,7 +48,7 @@
       "type": "vector"
     },
     "citybike": {
-      "url": "https://api.digitransit.fi/map/v2/hsl-citybike-map/index.json",
+      "url": "https://api.digitransit.fi/map/v3/hsl/fi/rentalStations/tilejson.json",
       "type": "vector"
     },
     "terminals": {
@@ -3099,29 +3099,13 @@
         "text-halo-width": 1.5
       }
     },
-    {
-      "id": "park-and-ride_landuse",
-      "type": "fill",
-      "source": "parkandride",
-      "source-layer": "facilities",
-      "minzoom": 14,
-      "filter": ["!=", "status", "INACTIVE"],
-      "paint": {
-        "fill-color": "#007ac9",
-        "fill-opacity": 0.15
-      }
-    },
     {
       "id": "park-and-ride_icon_hub",
       "type": "symbol",
       "source": "parkandride",
-      "source-layer": "facilities",
+      "source-layer": "vehicleParking",
       "minzoom": 14,
-      "filter": [
-        "all",
-        ["!=", ["get", "status"], "INACTIVE"],
-        ["in", "CAR", ["get", "builtCapacity"]]
-      ],
+      "filter": ["==", ["get", "carPlaces"], true],
       "layout": {
         "icon-image": "icon-park-and-ride",
         "icon-allow-overlap": false,
@@ -3343,7 +3327,6 @@
       "id": "ticket-sales_icon_sales-point",
       "type": "symbol",
       "source": "ticket-sales",
-      "source-layer": "ticket-sales",
       "minzoom": 15,
       "filter": [
         "all",
@@ -3358,7 +3341,6 @@
       "id": "ticket-sales_icon_ticket-machine",
       "type": "symbol",
       "source": "ticket-sales",
-      "source-layer": "ticket-sales",
       "minzoom": 15,
       "filter": [
         "all",
@@ -3373,7 +3355,6 @@
       "id": "ticket-sales_icon_ticket-machine-parking",
       "type": "symbol",
       "source": "ticket-sales",
-      "source-layer": "ticket-sales",
       "minzoom": 15,
       "filter": [
         "all",
@@ -3389,7 +3370,6 @@
       "id": "ticket-sales_icon_service-point",
       "type": "symbol",
       "source": "ticket-sales",
-      "source-layer": "ticket-sales",
       "minzoom": 15,
       "filter": ["all", ["==", "$type", "Point"], ["==", "Tyyppi", "Palvelupiste"]],
       "layout": {
@@ -3663,7 +3643,7 @@
       "id": "citybike_stops_case",
       "type": "circle",
       "source": "citybike",
-      "source-layer": "stations",
+      "source-layer": "rentalStations",
       "minzoom": 13,
       "maxzoom": 14,
       "paint": {
@@ -3683,7 +3663,7 @@
       "id": "citybike_stops",
       "type": "circle",
       "source": "citybike",
-      "source-layer": "stations",
+      "source-layer": "rentalStations",
       "minzoom": 13,
       "maxzoom": 14,
       "paint": {
@@ -3703,7 +3683,7 @@
       "id": "citybike_icon",
       "type": "symbol",
       "source": "citybike",
-      "source-layer": "stations",
+      "source-layer": "rentalStations",
       "minzoom": 14,
       "layout": {
         "icon-offset": [0, -6],
diff --git a/style/hsl-map-style-base.json b/style/hsl-map-style-base.json
index ad9e696..cf19e15 100644
--- a/style/hsl-map-style-base.json
+++ b/style/hsl-map-style-base.json
@@ -3510,7 +3510,7 @@
   "sources": {
     "vector": {
       "type": "vector",
-      "url": "https://api.digitransit.fi/map/v2/hsl-vector-map/index.json"
+      "url": "https://api.digitransit.fi/map/v3/hsl-vector-map/index.json"
     }
   }
 }
diff --git a/style/hsl-map-style-citybikes.json b/style/hsl-map-style-citybikes.json
index ddca478..431d7a5 100644
--- a/style/hsl-map-style-citybikes.json
+++ b/style/hsl-map-style-citybikes.json
@@ -4,7 +4,7 @@
       "id": "citybike_stops_case",
       "type": "circle",
       "source": "citybike",
-      "source-layer": "stations",
+      "source-layer": "rentalStations",
       "minzoom": 13,
       "maxzoom": 14,
       "paint": {
@@ -29,7 +29,7 @@
       "id": "citybike_stops",
       "type": "circle",
       "source": "citybike",
-      "source-layer": "stations",
+      "source-layer": "rentalStations",
       "minzoom": 13,
       "maxzoom": 14,
       "paint": {
@@ -54,7 +54,7 @@
       "id": "citybike_icon",
       "type": "symbol",
       "source": "citybike",
-      "source-layer": "stations",
+      "source-layer": "rentalStations",
       "minzoom": 14,
       "layout": {
         "icon-offset": [
@@ -80,7 +80,7 @@
   ],
   "sources": {
     "citybike": {
-      "url": "https://api.digitransit.fi/map/v2/hsl-citybike-map/index.json",
+      "url": "https://api.digitransit.fi/map/v3/hsl/fi/rentalStations/tilejson.json",
       "type": "vector"
     }
   }
diff --git a/style/hsl-map-style-icon.json b/style/hsl-map-style-icon.json
index 4a8ad79..f94e4ba 100644
--- a/style/hsl-map-style-icon.json
+++ b/style/hsl-map-style-icon.json
@@ -190,7 +190,7 @@
     },
     "vector": {
       "type": "vector",
-      "url": "https://api.digitransit.fi/map/v2/hsl-vector-map/index.json"
+      "url": "https://api.digitransit.fi/map/v3/hsl-vector-map/index.json"
     }
   }
 }
diff --git a/style/hsl-map-style-park-and-ride.json b/style/hsl-map-style-park-and-ride.json
index 0da5e04..09d7d6e 100644
--- a/style/hsl-map-style-park-and-ride.json
+++ b/style/hsl-map-style-park-and-ride.json
@@ -1,45 +1,18 @@
 {
   "layers": [
-    {
-      "id": "park-and-ride_landuse",
-      "type": "fill",
-      "source": "parkandride",
-      "source-layer": "facilities",
-      "minzoom": 14,
-      "filter": [
-        "!=",
-        "status",
-        "INACTIVE"
-      ],
-      "paint": {
-        "fill-color": "#007ac9",
-        "fill-opacity": 0.15
-      }
-    },
     {
       "id": "park-and-ride_icon_hub",
       "type": "symbol",
       "source": "parkandride",
-      "source-layer": "facilities",
+      "source-layer": "vehicleParking",
       "minzoom": 14,
       "filter": [
-        "all",
+        "==",
         [
-          "!=",
-          [
-            "get",
-            "status"
-          ],
-          "INACTIVE"
+          "get",
+          "carPlaces"
         ],
-        [
-          "in",
-          "CAR",
-          [
-            "get",
-            "builtCapacity"
-          ]
-        ]
+        true
       ],
       "layout": {
         "icon-image": "icon-park-and-ride",
@@ -56,7 +29,7 @@
   ],
   "sources": {
     "parkandride": {
-      "url": "https://api.digitransit.fi/map/v2/hsl-parkandride-map/index.json",
+      "url": "https://api.digitransit.fi/map/v3/hsl/fi/vehicleParking/tilejson.json",
       "type": "vector"
     }
   }
diff --git a/style/hsl-map-style-subway-entrance.json b/style/hsl-map-style-subway-entrance.json
index d6e4a5b..73fd1fc 100644
--- a/style/hsl-map-style-subway-entrance.json
+++ b/style/hsl-map-style-subway-entrance.json
@@ -170,7 +170,7 @@
   "sources": {
     "vector": {
       "type": "vector",
-      "url": "https://api.digitransit.fi/map/v2/hsl-vector-map/index.json"
+      "url": "https://api.digitransit.fi/map/v3/hsl-vector-map/index.json"
     }
   }
 }
diff --git a/style/hsl-map-style-text.json b/style/hsl-map-style-text.json
index dda9be7..7636178 100644
--- a/style/hsl-map-style-text.json
+++ b/style/hsl-map-style-text.json
@@ -774,7 +774,7 @@
   "sources": {
     "vector": {
       "type": "vector",
-      "url": "https://api.digitransit.fi/map/v2/hsl-vector-map/index.json"
+      "url": "https://api.digitransit.fi/map/v3/hsl-vector-map/index.json"
     }
   }
 }
diff --git a/style/hsl-map-style-ticket-sales.json b/style/hsl-map-style-ticket-sales.json
index 2dbafb2..4a75d3d 100644
--- a/style/hsl-map-style-ticket-sales.json
+++ b/style/hsl-map-style-ticket-sales.json
@@ -4,7 +4,6 @@
       "id": "ticket-sales_icon_sales-point",
       "type": "symbol",
       "source": "ticket-sales",
-      "source-layer": "ticket-sales",
       "minzoom": 15,
       "filter": [
         "all",
@@ -28,7 +27,6 @@
       "id": "ticket-sales_icon_ticket-machine",
       "type": "symbol",
       "source": "ticket-sales",
-      "source-layer": "ticket-sales",
       "minzoom": 15,
       "filter": [
         "all",
@@ -52,7 +50,6 @@
       "id": "ticket-sales_icon_ticket-machine-parking",
       "type": "symbol",
       "source": "ticket-sales",
-      "source-layer": "ticket-sales",
       "minzoom": 15,
       "filter": [
         "all",
@@ -76,7 +73,6 @@
       "id": "ticket-sales_icon_service-point",
       "type": "symbol",
       "source": "ticket-sales",
-      "source-layer": "ticket-sales",
       "minzoom": 15,
       "filter": [
         "all",
@@ -98,8 +94,8 @@
   ],
   "sources": {
     "ticket-sales": {
-      "url": "https://api.digitransit.fi/map/v2/hsl-ticket-sales-map/index.json",
-      "type": "vector"
+      "data": "https://data-hslhrt.opendata.arcgis.com/datasets/f9388fc8a8f848fda3bc584b607afe97_0.geojson",
+      "type": "geojson"
     }
   }
 }