diff --git a/package-lock.json b/package-lock.json
index 3d93c33..fa8e8a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,9 +15,9 @@
         "@awesome-cordova-plugins/web-intent": "^6.3.0",
         "@capacitor-community/background-geolocation": "^1.2.14",
         "@capacitor/android": "^5.0.4",
-        "@capacitor/browser": "^5.0.2",
+        "@capacitor/browser": "^5.0.3",
         "@capacitor/core": "^5.0.4",
-        "@capacitor/filesystem": "^5.0.2",
+        "@capacitor/filesystem": "^5.0.3",
         "@capacitor/ios": "^5.0.4",
         "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
         "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
@@ -53,7 +53,7 @@
         "@types/pouchdb": "^6.4.0",
         "@types/proj4": "^2.5.2",
         "@types/shelljs": "^0.8.12",
-        "@vitest/ui": "^0.31.4",
+        "@vitest/ui": "^0.32.0",
         "jsdom": "^22.1.0",
         "license-checker": "^25.0.1",
         "license-compatibility-checker": "^0.3.5",
@@ -62,7 +62,7 @@
         "typescript": "^5.1.3",
         "vite": ">=4.3.9",
         "vite-plugin-solid": "^2.7.0",
-        "vitest": "^0.31.4"
+        "vitest": "^0.32.0"
       }
     },
     "node_modules/@adobe/css-tools": {
@@ -661,9 +661,9 @@
       }
     },
     "node_modules/@capacitor/browser": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@capacitor/browser/-/browser-5.0.2.tgz",
-      "integrity": "sha512-chupqeXz3RopPpT+Uhcz+z81uc2HZqIFbcAy9mlrdJj10iCE53JRjeZDVlMmcL5OxqfGPl9NKTRNhGQvD6sIQQ==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@capacitor/browser/-/browser-5.0.3.tgz",
+      "integrity": "sha512-dFvuQRCt6HtkI/ZtOaocCu3aqsvw3r/Z7mvTXhhX9hlj3oUmGDYXFXhZD8AGLXwR2xjcNmGgLhRsHVAzdZpS4A==",
       "peerDependencies": {
         "@capacitor/core": "^5.0.0"
       }
@@ -709,9 +709,9 @@
       }
     },
     "node_modules/@capacitor/filesystem": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@capacitor/filesystem/-/filesystem-5.0.2.tgz",
-      "integrity": "sha512-seAyASEPhHzpJRap+zZRzvcY+R4LSgMgiKCzen8aReGM5+l6ZFENnzCIeHL4ib5HEMMI4s/sbPGpcwpMndfDdA==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@capacitor/filesystem/-/filesystem-5.0.3.tgz",
+      "integrity": "sha512-FkOy6Jt/utt3klLCL+3ki2wpQRrs69FFiAaWfia5W+vYqMKeYtK6jI03/mOtCFUuu2oAm7TlvAAz9/AReZIq8Q==",
       "peerDependencies": {
         "@capacitor/core": "^5.0.0"
       }
@@ -2288,13 +2288,13 @@
       "dev": true
     },
     "node_modules/@vitest/expect": {
-      "version": "0.31.4",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.31.4.tgz",
-      "integrity": "sha512-tibyx8o7GUyGHZGyPgzwiaPaLDQ9MMuCOrc03BYT0nryUuhLbL7NV2r/q98iv5STlwMgaKuFJkgBW/8iPKwlSg==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.32.0.tgz",
+      "integrity": "sha512-VxVHhIxKw9Lux+O9bwLEEk2gzOUe93xuFHy9SzYWnnoYZFYg1NfBtnfnYWiJN7yooJ7KNElCK5YtA7DTZvtXtg==",
       "dev": true,
       "dependencies": {
-        "@vitest/spy": "0.31.4",
-        "@vitest/utils": "0.31.4",
+        "@vitest/spy": "0.32.0",
+        "@vitest/utils": "0.32.0",
         "chai": "^4.3.7"
       },
       "funding": {
@@ -2302,12 +2302,12 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "0.31.4",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.31.4.tgz",
-      "integrity": "sha512-Wgm6UER+gwq6zkyrm5/wbpXGF+g+UBB78asJlFkIOwyse0pz8lZoiC6SW5i4gPnls/zUcPLWS7Zog0LVepXnpg==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.32.0.tgz",
+      "integrity": "sha512-QpCmRxftHkr72xt5A08xTEs9I4iWEXIOCHWhQQguWOKE4QH7DXSKZSOFibuwEIMAD7G0ERvtUyQn7iPWIqSwmw==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "0.31.4",
+        "@vitest/utils": "0.32.0",
         "concordance": "^5.0.4",
         "p-limit": "^4.0.0",
         "pathe": "^1.1.0"
@@ -2317,9 +2317,9 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "0.31.4",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.31.4.tgz",
-      "integrity": "sha512-LemvNumL3NdWSmfVAMpXILGyaXPkZbG5tyl6+RQSdcHnTj6hvA49UAI8jzez9oQyE/FWLKRSNqTGzsHuk89LRA==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.32.0.tgz",
+      "integrity": "sha512-yCKorPWjEnzpUxQpGlxulujTcSPgkblwGzAUEL+z01FTUg/YuCDZ8dxr9sHA08oO2EwxzHXNLjQKWJ2zc2a19Q==",
       "dev": true,
       "dependencies": {
         "magic-string": "^0.30.0",
@@ -2343,9 +2343,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "0.31.4",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.31.4.tgz",
-      "integrity": "sha512-3ei5ZH1s3aqbEyftPAzSuunGICRuhE+IXOmpURFdkm5ybUADk+viyQfejNk6q8M5QGX8/EVKw+QWMEP3DTJDag==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.32.0.tgz",
+      "integrity": "sha512-MruAPlM0uyiq3d53BkwTeShXY0rYEfhNGQzVO5GHBmmX3clsxcWp79mMnkOVcV244sNTeDcHbcPFWIjOI4tZvw==",
       "dev": true,
       "dependencies": {
         "tinyspy": "^2.1.0"
@@ -2355,12 +2355,12 @@
       }
     },
     "node_modules/@vitest/ui": {
-      "version": "0.31.4",
-      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-0.31.4.tgz",
-      "integrity": "sha512-sKM16ITX6HrNFF+lNZ2AQAen4/6Bx2i6KlBfIvkUjcTgc5YII/j2ltcX14oCUv4EA0OTWGQuGhO3zDoAsTENGA==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-0.32.0.tgz",
+      "integrity": "sha512-55gugh6+owrOqW83RCgLm9q+o3SlzvFVgl1lyfnr0WB8ABxLoM+3pgusEjosscgEYGzTjTXaZY6xLd4qlfH/RQ==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "0.31.4",
+        "@vitest/utils": "0.32.0",
         "fast-glob": "^3.2.12",
         "fflate": "^0.7.4",
         "flatted": "^3.2.7",
@@ -2376,9 +2376,9 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "0.31.4",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.31.4.tgz",
-      "integrity": "sha512-DobZbHacWznoGUfYU8XDPY78UubJxXfMNY1+SUdOp1NsI34eopSA6aZMeaGu10waSOeYwE8lxrd/pLfT0RMxjQ==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.32.0.tgz",
+      "integrity": "sha512-53yXunzx47MmbuvcOPpLaVljHaeSu1G2dHdmy7+9ngMnQIkBQcvwOcoclWFnxDMxFbnq8exAfh3aKSZaK71J5A==",
       "dev": true,
       "dependencies": {
         "concordance": "^5.0.4",
@@ -8928,9 +8928,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "0.31.4",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.31.4.tgz",
-      "integrity": "sha512-uzL377GjJtTbuc5KQxVbDu2xfU/x0wVjUtXQR2ihS21q/NK6ROr4oG0rsSkBBddZUVCwzfx22in76/0ZZHXgkQ==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.32.0.tgz",
+      "integrity": "sha512-220P/y8YacYAU+daOAqiGEFXx2A8AwjadDzQqos6wSukjvvTWNqleJSwoUn0ckyNdjHIKoxn93Nh1vWBqEKr3Q==",
       "dev": true,
       "dependencies": {
         "cac": "^6.7.14",
@@ -8996,19 +8996,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "0.31.4",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.31.4.tgz",
-      "integrity": "sha512-GoV0VQPmWrUFOZSg3RpQAPN+LPmHg2/gxlMNJlyxJihkz6qReHDV6b0pPDcqFLNEPya4tWJ1pgwUNP9MLmUfvQ==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.32.0.tgz",
+      "integrity": "sha512-SW83o629gCqnV3BqBnTxhB10DAwzwEx3z+rqYZESehUB+eWsJxwcBQx7CKy0otuGMJTYh7qCVuUX23HkftGl/Q==",
       "dev": true,
       "dependencies": {
         "@types/chai": "^4.3.5",
         "@types/chai-subset": "^1.3.3",
         "@types/node": "*",
-        "@vitest/expect": "0.31.4",
-        "@vitest/runner": "0.31.4",
-        "@vitest/snapshot": "0.31.4",
-        "@vitest/spy": "0.31.4",
-        "@vitest/utils": "0.31.4",
+        "@vitest/expect": "0.32.0",
+        "@vitest/runner": "0.32.0",
+        "@vitest/snapshot": "0.32.0",
+        "@vitest/spy": "0.32.0",
+        "@vitest/utils": "0.32.0",
         "acorn": "^8.8.2",
         "acorn-walk": "^8.2.0",
         "cac": "^6.7.14",
@@ -9024,7 +9024,7 @@
         "tinybench": "^2.5.0",
         "tinypool": "^0.5.0",
         "vite": "^3.0.0 || ^4.0.0",
-        "vite-node": "0.31.4",
+        "vite-node": "0.32.0",
         "why-is-node-running": "^2.2.2"
       },
       "bin": {
diff --git a/package.json b/package.json
index 0b18714..561fa31 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "@types/pouchdb": "^6.4.0",
     "@types/proj4": "^2.5.2",
     "@types/shelljs": "^0.8.12",
-    "@vitest/ui": "^0.31.4",
+    "@vitest/ui": "^0.32.0",
     "jsdom": "^22.1.0",
     "license-checker": "^25.0.1",
     "license-compatibility-checker": "^0.3.5",
@@ -30,7 +30,7 @@
     "typescript": "^5.1.3",
     "vite": ">=4.3.9",
     "vite-plugin-solid": "^2.7.0",
-    "vitest": "^0.31.4"
+    "vitest": "^0.32.0"
   },
   "dependencies": {
     "@awesome-cordova-plugins/android-full-screen": "^6.3.0",
@@ -38,9 +38,9 @@
     "@awesome-cordova-plugins/web-intent": "^6.3.0",
     "@capacitor-community/background-geolocation": "^1.2.14",
     "@capacitor/android": "^5.0.4",
-    "@capacitor/browser": "^5.0.2",
+    "@capacitor/browser": "^5.0.3",
     "@capacitor/core": "^5.0.4",
-    "@capacitor/filesystem": "^5.0.2",
+    "@capacitor/filesystem": "^5.0.3",
     "@capacitor/ios": "^5.0.4",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
diff --git a/src/components/overlays/overlay-definitions.ts b/src/components/overlays/overlay-definitions.ts
index f1e1393..bdb86e9 100644
--- a/src/components/overlays/overlay-definitions.ts
+++ b/src/components/overlays/overlay-definitions.ts
@@ -1,6 +1,222 @@
 import { indexOf } from 'lodash';
 import { Feature } from 'ol';
 
+export const overlayDefinitions = {
+  hiking: {
+    amenity: {
+      bar: { drinking: true },
+      fast_food: { eating: true },
+      food_court: { eating: true },
+      pub: { eating: true, drinking: true },
+      restaurant: { eating: true },
+      cafe: { drinking: true },
+      atm: { money: true, dayToDay: true },
+      bank: { money: true, dayToDay: true },
+      doctors: { health: true },
+      hospital: { health: true },
+      pharmacy: { health: true },
+      police: { security: true },
+      fire_station: { security: true },
+      drinking_water: { drinking: true },
+      water_point: { drinking: true },
+      waste_basket: { dayToDay: true },
+      waste_disposal: { dayToDay: true },
+      vending_machine: { dayToDay: true },
+    },
+    shop: {
+      bakery: { eating: true },
+      butcher: { eating: true },
+      cheese: { eating: true },
+      chocolate: { eating: true },
+      convenience: { eating: true },
+      dairy: { eating: true },
+      farm: { eating: true },
+      greengrocer: { eating: true },
+      health_food: { eating: true },
+      pasta: { eating: true },
+      pastry: { eating: true },
+      seafood: { eating: true },
+      water: { drinking: true },
+      department_store: { dayToDay: true },
+      general: { dayToDay: true },
+      mall: { dayToDay: true },
+      supermarket: { eating: true },
+      wholesale: { eating: true },
+      outdoor: { eating: true },
+      laundry: { dayToDay: true },
+    },
+    tourism: {
+      hotel: { sleeping: true },
+      alpine_hut: { sleeping: true },
+      apartment: { sleeping: true },
+      camp_site: { sleeping: true },
+      chalet: { sleeping: true },
+      guest_house: { sleeping: true },
+      hostel: { sleeping: true },
+      motel: { sleeping: true },
+      wilderness_hut: { sleeping: true },
+      viewpoint: { naturalSites: true },
+    },
+    waterway: { waterfall: { naturalSites: true } },
+    natural: {
+      peak: { naturalSites: true },
+      cave_entrance: { naturalSites: true },
+      volcano: { naturalSites: true },
+      arch: { naturalSites: true },
+      arete: { naturalSites: true },
+      fumarole: { naturalSites: true },
+      rock: { naturalSites: true },
+      saddle: { naturalSites: true },
+      sinkhole: { naturalSites: true },
+      stone: { naturalSites: true },
+      glacier: { naturalSites: true },
+      spring: { naturalSites: true },
+      hot_spring: { naturalSites: true },
+      geyser: { naturalSites: true },
+    },
+  },
+  cycling: {
+    amenity: {
+      bar: { drinking: true },
+      fast_food: { eating: true },
+      food_court: { eating: true },
+      pub: { eating: true, drinking: true },
+      restaurant: { eating: true },
+      cafe: { drinking: true },
+      atm: { money: true, dayToDay: true },
+      bank: { money: true, dayToDay: true },
+      doctors: { health: true },
+      hospital: { health: true },
+      pharmacy: { health: true },
+      police: { security: true },
+      fire_station: { security: true },
+      drinking_water: { drinking: true },
+      water_point: { drinking: true },
+      waste_basket: { dayToDay: true },
+      waste_disposal: { dayToDay: true },
+      vending_machine: { dayToDay: true },
+      bicycle_parking: { parking: true },
+    },
+    shop: {
+      bakery: { eating: true },
+      butcher: { eating: true },
+      cheese: { eating: true },
+      chocolate: { eating: true },
+      convenience: { eating: true },
+      dairy: { eating: true },
+      farm: { eating: true },
+      greengrocer: { eating: true },
+      health_food: { eating: true },
+      pasta: { eating: true },
+      pastry: { eating: true },
+      seafood: { eating: true },
+      water: { drinking: true },
+      department_store: { dayToDay: true },
+      general: { dayToDay: true },
+      mall: { dayToDay: true },
+      supermarket: { eating: true },
+      wholesale: { eating: true },
+      outdoor: { eating: true },
+      laundry: { dayToDay: true },
+    },
+    tourism: {
+      hotel: { sleeping: true },
+      alpine_hut: { sleeping: true },
+      apartment: { sleeping: true },
+      camp_site: { sleeping: true },
+      chalet: { sleeping: true },
+      guest_house: { sleeping: true },
+      hostel: { sleeping: true },
+      motel: { sleeping: true },
+      wilderness_hut: { sleeping: true },
+      viewpoint: { naturalSites: true },
+    },
+    waterway: { waterfall: { naturalSites: true } },
+    natural: {
+      peak: { naturalSites: true },
+      cave_entrance: { naturalSites: true },
+      volcano: { naturalSites: true },
+      arch: { naturalSites: true },
+      arete: { naturalSites: true },
+      fumarole: { naturalSites: true },
+      rock: { naturalSites: true },
+      saddle: { naturalSites: true },
+      sinkhole: { naturalSites: true },
+      stone: { naturalSites: true },
+      glacier: { naturalSites: true },
+      spring: { naturalSites: true },
+      hot_spring: { naturalSites: true },
+      geyser: { naturalSites: true },
+    },
+  },
+  vanlife: {
+    amenity: {
+      bar: { drinking: true },
+      fast_food: { eating: true },
+      food_court: { eating: true },
+      pub: { eating: true, drinking: true },
+      restaurant: { eating: true },
+      cafe: { drinking: true },
+      atm: { money: true, dayToDay: true },
+      bank: { money: true, dayToDay: true },
+      doctors: { health: true },
+      hospital: { health: true },
+      pharmacy: { health: true },
+      police: { security: true },
+      fire_station: { security: true },
+      drinking_water: { drinking: true },
+      water_point: { drinking: true },
+      waste_basket: { dayToDay: true },
+      waste_disposal: { dayToDay: true },
+      vending_machine: { dayToDay: true },
+      parking: { parking: true, sleeping: true },
+    },
+    shop: {
+      bakery: { eating: true },
+      butcher: { eating: true },
+      cheese: { eating: true },
+      chocolate: { eating: true },
+      convenience: { eating: true },
+      dairy: { eating: true },
+      farm: { eating: true },
+      greengrocer: { eating: true },
+      health_food: { eating: true },
+      pasta: { eating: true },
+      pastry: { eating: true },
+      seafood: { eating: true },
+      water: { drinking: true },
+      department_store: { dayToDay: true },
+      general: { dayToDay: true },
+      mall: { dayToDay: true },
+      supermarket: { eating: true },
+      wholesale: { eating: true },
+      outdoor: { eating: true },
+      laundry: { dayToDay: true },
+    },
+    tourism: {
+      camp_site: { sleeping: true },
+      viewpoint: { naturalSites: true },
+    },
+    waterway: { waterfall: { naturalSites: true } },
+    natural: {
+      peak: { naturalSites: true },
+      cave_entrance: { naturalSites: true },
+      volcano: { naturalSites: true },
+      arch: { naturalSites: true },
+      arete: { naturalSites: true },
+      fumarole: { naturalSites: true },
+      rock: { naturalSites: true },
+      saddle: { naturalSites: true },
+      sinkhole: { naturalSites: true },
+      stone: { naturalSites: true },
+      glacier: { naturalSites: true },
+      spring: { naturalSites: true },
+      hot_spring: { naturalSites: true },
+      geyser: { naturalSites: true },
+    },
+  },
+};
+
 export const legacyOverlayDefinitions = {
   amenity: {
     bar: {