diff --git a/package-lock.json b/package-lock.json
index 845aa2b65..bb7b70d09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,15 +14,15 @@
         "@mdi/svg": "^7.4.47",
         "@nextcloud/auth": "^2.5.1",
         "@nextcloud/axios": "^2.5.1",
-        "@nextcloud/dialogs": "^6.3.2",
+        "@nextcloud/dialogs": "^7.3.0",
         "@nextcloud/event-bus": "^3.3.3",
-        "@nextcloud/files": "^3.12.0",
+        "@nextcloud/files": "^4.0.0",
         "@nextcloud/l10n": "^3.1.0",
         "@nextcloud/moment": "^1.3.4",
         "@nextcloud/paths": "^2.1.0",
         "@nextcloud/router": "^3.0.1",
         "@nextcloud/sharing": "^0.2.5",
-        "@nextcloud/vue": "^8.27.0",
+        "@nextcloud/vue": "^9.5.0",
         "@raruto/leaflet-elevation": "^2.5.2",
         "axios": "^1.13.5",
         "geojson": "^0.5.0",
@@ -43,14 +43,11 @@
         "nouislider": "^15.8.1",
         "opening_hours": "^3.9.0",
         "ua-parser-js": "^2.0.5",
-        "vue": "^2.7.16",
-        "vue-click-outside": "^1.1.0",
-        "vue-loader": "^15.11.1",
+        "vue": "^3.4.21",
+        "vue-loader": "^17.4.2",
         "vue-material-design-icons": "^5.3.1",
         "vue-types": "^5.1.3",
-        "vue2-leaflet": "^2.6.0",
-        "vue2-leaflet-markercluster": "^3.1.0",
-        "vuex": "^3.6.2"
+        "vuex": "^4.1.0"
       },
       "devDependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
@@ -58,8 +55,9 @@
         "@nextcloud/browserslist-config": "^3.0.1",
         "@nextcloud/eslint-config": "^8.4.1",
         "@nextcloud/stylelint-config": "^3.1.0",
-        "@nextcloud/webpack-vue-config": "^6.3.0",
+        "@nextcloud/webpack-vue-config": "^7.0.0",
         "@types/leaflet": "^1.9.21",
+        "@vue/compiler-sfc": "^3.4.21",
         "@vue/tsconfig": "^0.5.1",
         "typescript": "^5.9.2"
       },
@@ -162,15 +160,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
-      "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
-      "dev": true,
+      "version": "7.29.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
+      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@babel/parser": "^7.28.0",
-        "@babel/types": "^7.28.0",
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -417,9 +413,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -467,12 +463,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
-      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
+      "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.0"
+        "@babel/types": "^7.29.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1737,13 +1733,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.1.tgz",
-      "integrity": "sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1"
+        "@babel/helper-validator-identifier": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1847,6 +1843,15 @@
         "@csstools/css-tokenizer": "^3.0.4"
       }
     },
+    "node_modules/@ctrl/tinycolor": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
+      "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
@@ -2004,28 +2009,28 @@
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.2.tgz",
-      "integrity": "sha512-wNB5ooIKHQc+Kui96jE/n69rHFWAVoxn5CAzL1Xdd8FG03cgY3MLO+GF9U3W737fYDSgPWA6MReKhBQBop6Pcw==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
+      "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.10"
+        "@floating-ui/utils": "^0.2.11"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.2.tgz",
-      "integrity": "sha512-7cfaOQuCS27HD7DX+6ib2OrnW+b4ZBwDNnCcT0uTyidcmyWb03FnQqJybDBoCnpdxwBSfA94UAYlRCt7mV+TbA==",
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
+      "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.7.2",
-        "@floating-ui/utils": "^0.2.10"
+        "@floating-ui/core": "^1.7.5",
+        "@floating-ui/utils": "^0.2.11"
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
-      "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
+      "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
       "license": "MIT"
     },
     "node_modules/@fortawesome/fontawesome-free": {
@@ -2106,18 +2111,26 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
       "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
+    "node_modules/@jridgewell/remapping": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -2134,18 +2147,16 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
-      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
-      "license": "MIT",
-      "peer": true
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.29",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
       "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -2230,18 +2241,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/@linusborg/vue-simple-portal": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@linusborg/vue-simple-portal/-/vue-simple-portal-0.1.5.tgz",
-      "integrity": "sha512-dq+oubEVW4UabBoQxmH97GiDa+F6sTomw4KcXFHnXEpw69rdkXFCxo1WzwuvWjoLiUVYJTyN1dtlUvTa50VcXg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "nanoid": "^3.1.20"
-      },
-      "peerDependencies": {
-        "vue": "^2.6.6"
-      }
-    },
     "node_modules/@mapbox/corslite": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/@mapbox/corslite/-/corslite-0.0.7.tgz",
@@ -2261,42 +2260,6 @@
         "geojson-rewind": "geojson-rewind"
       }
     },
-    "node_modules/@mapbox/hast-util-table-cell-style": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.2.1.tgz",
-      "integrity": "sha512-LyQz4XJIdCdY/+temIhD/Ed0x/p4GAOUycpFSEK2Ads1CPKZy6b7V/2ROEtQiLLQ8soIs0xe/QAoR6kwpyW/yw==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "unist-util-visit": "^1.4.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@mapbox/hast-util-table-cell-style/node_modules/unist-util-is": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
-      "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==",
-      "license": "MIT"
-    },
-    "node_modules/@mapbox/hast-util-table-cell-style/node_modules/unist-util-visit": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
-      "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
-      "license": "MIT",
-      "dependencies": {
-        "unist-util-visit-parents": "^2.0.0"
-      }
-    },
-    "node_modules/@mapbox/hast-util-table-cell-style/node_modules/unist-util-visit-parents": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz",
-      "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==",
-      "license": "MIT",
-      "dependencies": {
-        "unist-util-is": "^3.0.0"
-      }
-    },
     "node_modules/@mapbox/jsonlint-lines-primitives": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
@@ -2445,28 +2408,18 @@
         "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
       }
     },
-    "node_modules/@nextcloud/auth/node_modules/@nextcloud/browser-storage": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/browser-storage/-/browser-storage-0.5.0.tgz",
-      "integrity": "sha512-usYr4GlJQlK3hgZURvklqWb9ivi7sgsSuFqXrs7s4hl1LTS4enzPrnkQumm6nRsQruf0ITS+OBsK+oELEbvYPA==",
-      "license": "GPL-3.0-or-later",
-      "engines": {
-        "node": "^24 || ^22 || ^20"
-      }
-    },
     "node_modules/@nextcloud/axios": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-2.5.1.tgz",
-      "integrity": "sha512-AA7BPF/rsOZWAiVxqlobGSdD67AEwjOnymZCKUIwEIBArKxYK7OQEqcILDjQwgj6G0e/Vg9Y8zTVsPZp+mlvwA==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-2.5.2.tgz",
+      "integrity": "sha512-8frJb77jNMbz00TjsSqs1PymY0nIEbNM4mVmwen2tXY7wNgRai6uXilIlXKOYB9jR/F/HKRj6B4vUwVwZbhdbw==",
       "license": "GPL-3.0-or-later",
       "dependencies": {
-        "@nextcloud/auth": "^2.3.0",
+        "@nextcloud/auth": "^2.5.1",
         "@nextcloud/router": "^3.0.1",
-        "axios": "^1.6.8"
+        "axios": "^1.12.2"
       },
       "engines": {
-        "node": "^20.0.0",
-        "npm": "^10.0.0"
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
       }
     },
     "node_modules/@nextcloud/babel-config": {
@@ -2484,16 +2437,12 @@
       }
     },
     "node_modules/@nextcloud/browser-storage": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/browser-storage/-/browser-storage-0.4.0.tgz",
-      "integrity": "sha512-D6XxznxCYmJ3oBCC3p0JB6GZJ2RZ9dgbB1UqtTePXrIvHUMBAeF/YkiGKYxLAVZCZb+NSNZXgAYHm/3LnIUbDg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/browser-storage/-/browser-storage-0.5.0.tgz",
+      "integrity": "sha512-usYr4GlJQlK3hgZURvklqWb9ivi7sgsSuFqXrs7s4hl1LTS4enzPrnkQumm6nRsQruf0ITS+OBsK+oELEbvYPA==",
       "license": "GPL-3.0-or-later",
-      "dependencies": {
-        "core-js": "3.37.0"
-      },
       "engines": {
-        "node": "^20.0.0",
-        "npm": "^10.0.0"
+        "node": "^24 || ^22 || ^20"
       }
     },
     "node_modules/@nextcloud/browserslist-config": {
@@ -2529,36 +2478,66 @@
       }
     },
     "node_modules/@nextcloud/dialogs": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-6.3.2.tgz",
-      "integrity": "sha512-ioZ483wmKdNX1HdSJ1EG7ewTSyQAqlmbBALkhT4guZdR9JG8VIdnijX15qwKgAWITG2y36PWoi9Rimb3dDf+7A==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-7.3.0.tgz",
+      "integrity": "sha512-pFuM10Dkvip+wSBaElcbSAN7Jynp41HJUh5kndRYpJipYl0SpNfjIe32+uNfOI43/tln4ScTlrfjIX6cK+3uHg==",
+      "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@mdi/js": "^7.4.47",
-        "@nextcloud/auth": "^2.5.1",
-        "@nextcloud/axios": "^2.5.1",
-        "@nextcloud/browser-storage": "^0.4.0",
-        "@nextcloud/event-bus": "^3.3.2",
-        "@nextcloud/files": "^3.10.2",
-        "@nextcloud/initial-state": "^2.2.0",
-        "@nextcloud/l10n": "^3.3.0",
-        "@nextcloud/router": "^3.0.1",
-        "@nextcloud/sharing": "^0.2.4",
-        "@nextcloud/typings": "^1.9.1",
+        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/axios": "^2.5.2",
+        "@nextcloud/browser-storage": "^0.5.0",
+        "@nextcloud/event-bus": "^3.3.3",
+        "@nextcloud/files": "^4.0.0",
+        "@nextcloud/initial-state": "^3.0.0",
+        "@nextcloud/l10n": "^3.4.1",
+        "@nextcloud/paths": "^3.0.0",
+        "@nextcloud/router": "^3.1.0",
+        "@nextcloud/sharing": "^0.4.0",
+        "@nextcloud/vue": "^9.5.0",
         "@types/toastify-js": "^1.12.4",
-        "@vueuse/core": "^11.3.0",
-        "cancelable-promise": "^4.3.1",
-        "p-queue": "^8.1.0",
+        "@vueuse/core": "^14.2.1",
+        "p-queue": "^9.0.1",
         "toastify-js": "^1.12.0",
-        "vue-frag": "^1.4.3",
+        "vue": "^3.5.28",
         "webdav": "^5.8.0"
       },
       "engines": {
-        "node": "^20.0.0 || ^22.0.0 || ^24.0.0",
-        "npm": "^10.5.1"
+        "node": "^20 || ^22 || ^24"
+      }
+    },
+    "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/initial-state": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-3.0.0.tgz",
+      "integrity": "sha512-cV+HBdkQJGm8FxkBI5rFT/FbMNWNBvpbj6OPrg4Ae4YOOsQ15CL8InPOAw1t4XkOkQK2NEdUGQLVUz/19wXbdQ==",
+      "license": "GPL-3.0-or-later",
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      }
+    },
+    "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/paths": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/paths/-/paths-3.1.0.tgz",
+      "integrity": "sha512-vtFYA/kthaUDzu6KejTOL1OwnOy7/yynq5zdB/UBpYacAWjUX5Ddh4OMWx3rEavkBJ9/QGhrFryNJLjNfe8OQA==",
+      "license": "GPL-3.0-or-later",
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      }
+    },
+    "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/sharing": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/sharing/-/sharing-0.4.0.tgz",
+      "integrity": "sha512-1hUNyc7uJdBpnimOnEshJjEtAPAjzDYVl6qmWqF5ZxoN9wOvbExw0QjX3xFIbHbX2dmvbRNLBj0RzLzipmZyeg==",
+      "license": "GPL-3.0-or-later",
+      "dependencies": {
+        "@nextcloud/initial-state": "^3.0.0",
+        "is-svg": "^6.1.0"
+      },
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
       },
-      "peerDependencies": {
-        "@nextcloud/vue": "^8.24.0",
-        "vue": "^2.7.16"
+      "optionalDependencies": {
+        "@nextcloud/files": "^3.12.2 || ^4.0.0"
       }
     },
     "node_modules/@nextcloud/eslint-config": {
@@ -2647,10 +2626,32 @@
       }
     },
     "node_modules/@nextcloud/files": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-4.0.0.tgz",
+      "integrity": "sha512-TmecnZIS+PGWGtRh7RpGEboCT4K6iTbHULUcfR6hs3eEzjDVsCc1Ldf8popGY/70lbpdlfYle8xbXnPIo3qaXA==",
+      "license": "AGPL-3.0-or-later",
+      "dependencies": {
+        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/capabilities": "^1.2.1",
+        "@nextcloud/l10n": "^3.4.1",
+        "@nextcloud/logger": "^3.0.3",
+        "@nextcloud/paths": "^3.0.0",
+        "@nextcloud/router": "^3.1.0",
+        "@nextcloud/sharing": "^0.3.0",
+        "is-svg": "^6.1.0",
+        "typescript-event-target": "^1.1.2",
+        "webdav": "^5.9.0"
+      },
+      "engines": {
+        "node": "^24.0.0"
+      }
+    },
+    "node_modules/@nextcloud/files/node_modules/@nextcloud/files": {
       "version": "3.12.2",
       "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.12.2.tgz",
       "integrity": "sha512-vBo8tf3Xh6efiF8CrEo3pKj9AtvAF6RdDGO1XKL65IxV8+UUd9Uxl2lUExHlzoDRRczCqfGfaWfRRaFhYqce5Q==",
       "license": "AGPL-3.0-or-later",
+      "optional": true,
       "dependencies": {
         "@nextcloud/auth": "^2.5.3",
         "@nextcloud/capabilities": "^1.2.1",
@@ -2807,18 +2808,6 @@
         "stylelint-config-recommended-vue": "^1.5.0"
       }
     },
-    "node_modules/@nextcloud/timezones": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/timezones/-/timezones-0.2.0.tgz",
-      "integrity": "sha512-1mwQ+asTFOgv9rxPoAMEbDF8JfnenIa2EGNS+8MATCyi6WXxYh0Lhkaq1d3l2+xNbUPHgMnk4cRYsvIo319lkA==",
-      "license": "AGPL-3.0-or-later",
-      "dependencies": {
-        "ical.js": "^2.1.0"
-      },
-      "engines": {
-        "node": "^20 || ^22"
-      }
-    },
     "node_modules/@nextcloud/typings": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-1.10.0.tgz",
@@ -2832,146 +2821,374 @@
       }
     },
     "node_modules/@nextcloud/vue": {
-      "version": "8.28.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.28.0.tgz",
-      "integrity": "sha512-m0Ei6LpySq5OBb2zNqOx5vasDsmmiDTYtCoWb20ZBCT3+uk3D2m02US9g+1dS4v/Gb4BcwFLYm5mwlRH9zNERw==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-9.5.0.tgz",
+      "integrity": "sha512-CQxBfHhF+Q+2r7RXd+l/eSjttJU8A2JFUyq5VpvjfpIql355kejc8bbNnM1pKgGRGSBuW9qw5Ohx0puzHge10w==",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
-        "@floating-ui/dom": "^1.1.0",
-        "@linusborg/vue-simple-portal": "^0.1.5",
-        "@nextcloud/auth": "^2.4.0",
-        "@nextcloud/axios": "^2.5.0",
-        "@nextcloud/browser-storage": "^0.4.0",
-        "@nextcloud/capabilities": "^1.2.0",
-        "@nextcloud/event-bus": "^3.3.2",
-        "@nextcloud/initial-state": "^2.2.0",
-        "@nextcloud/l10n": "^3.4.0",
-        "@nextcloud/logger": "^3.0.2",
-        "@nextcloud/router": "^3.0.1",
-        "@nextcloud/sharing": "^0.2.3",
-        "@nextcloud/timezones": "^0.2.0",
-        "@nextcloud/vue-select": "^3.25.1",
-        "@vueuse/components": "^11.0.0",
-        "@vueuse/core": "^11.0.0",
+        "@ckpack/vue-color": "^1.6.0",
+        "@floating-ui/dom": "^1.7.5",
+        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/axios": "^2.5.2",
+        "@nextcloud/browser-storage": "^0.5.0",
+        "@nextcloud/capabilities": "^1.2.1",
+        "@nextcloud/event-bus": "^3.3.3",
+        "@nextcloud/initial-state": "^3.0.0",
+        "@nextcloud/l10n": "^3.4.1",
+        "@nextcloud/logger": "^3.0.3",
+        "@nextcloud/router": "^3.1.0",
+        "@nextcloud/sharing": "^0.3.0",
+        "@vuepic/vue-datepicker": "^11.0.3",
+        "@vueuse/components": "^14.2.0",
+        "@vueuse/core": "^14.0.0",
         "blurhash": "^2.0.5",
         "clone": "^2.1.2",
-        "debounce": "^2.2.0",
-        "dompurify": "^3.2.4",
-        "emoji-mart-vue-fast": "^15.0.4",
+        "debounce": "^3.0.0",
+        "dompurify": "^3.3.1",
+        "emoji-mart-vue-fast": "^15.0.5",
         "escape-html": "^1.0.3",
-        "floating-vue": "^1.0.0-beta.19",
-        "focus-trap": "^7.4.3",
-        "linkify-string": "^4.0.0",
-        "md5": "^2.3.0",
-        "p-queue": "^8.1.0",
+        "floating-vue": "^5.2.2",
+        "focus-trap": "^8.0.0",
+        "linkifyjs": "^4.3.2",
+        "p-queue": "^9.1.0",
         "rehype-external-links": "^3.0.0",
         "rehype-highlight": "^7.0.2",
-        "rehype-react": "^7.1.2",
+        "rehype-react": "^8.0.0",
         "remark-breaks": "^4.0.0",
         "remark-parse": "^11.0.0",
-        "remark-rehype": "^11.0.0",
+        "remark-rehype": "^11.1.2",
         "remark-unlink-protocols": "^1.0.0",
-        "splitpanes": "^2.4.1",
-        "string-length": "^5.0.1",
+        "splitpanes": "^4.0.4",
         "striptags": "^3.2.0",
-        "tabbable": "^6.2.0",
+        "tabbable": "^6.4.0",
         "tributejs": "^5.1.3",
-        "unified": "^11.0.1",
+        "ts-md5": "^2.0.1",
+        "unified": "^11.0.5",
         "unist-builder": "^4.0.0",
-        "unist-util-visit": "^5.0.0",
-        "vue": "^2.7.16",
-        "vue-color": "^2.8.1",
-        "vue-frag": "^1.4.3",
-        "vue-router": "^3.6.5",
-        "vue2-datepicker": "^3.11.0"
+        "unist-util-visit": "^5.1.0",
+        "vue": "^3.5.18",
+        "vue-router": "^5.0.2",
+        "vue-select": "^4.0.0-beta.6"
       },
       "engines": {
-        "node": "^20.0.0",
-        "npm": "^10.0.0"
+        "node": "^20.11.0 || ^22 || ^24"
       }
     },
-    "node_modules/@nextcloud/vue-select": {
-      "version": "3.25.1",
-      "resolved": "https://registry.npmjs.org/@nextcloud/vue-select/-/vue-select-3.25.1.tgz",
-      "integrity": "sha512-jqCi4G+Q0H6+Hm8wSN3vRX2+eXG2jXR2bwBX/sErVEsH5UaxT4Nb7KqgdeIjVfeF7ccIdRqpmIb4Pkf0lao67w==",
+    "node_modules/@nextcloud/vue/node_modules/@ckpack/vue-color": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@ckpack/vue-color/-/vue-color-1.6.0.tgz",
+      "integrity": "sha512-b9kFTKhYbNArfgP1lmnaVm0VNsWdZjqIbyHUYry7mZ+E7JeTQclbjq1+2xWn0SE3wzqRYlXmAVjECPOgteWmMQ==",
       "license": "MIT",
+      "dependencies": {
+        "@ctrl/tinycolor": "^3.6.0",
+        "material-colors": "^1.2.6"
+      },
       "engines": {
-        "node": "^20.0.0"
+        "node": ">=12"
       },
       "peerDependencies": {
-        "vue": "2.x"
+        "vue": "^3.2.0"
       }
     },
-    "node_modules/@nextcloud/webpack-vue-config": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-6.3.0.tgz",
-      "integrity": "sha512-Reciadvarap6j3d0arMH34zNiXx6d7B5QXDiosV6ZwDu63mR1lSm4ZUdLr6lv4gfmrADmQ5iP7PQMr99MBeTvw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "engines": {
-        "node": "^20.0.0",
-        "npm": "^9.0.0 || ^10.0.0"
+    "node_modules/@nextcloud/vue/node_modules/@nextcloud/files": {
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.12.2.tgz",
+      "integrity": "sha512-vBo8tf3Xh6efiF8CrEo3pKj9AtvAF6RdDGO1XKL65IxV8+UUd9Uxl2lUExHlzoDRRczCqfGfaWfRRaFhYqce5Q==",
+      "license": "AGPL-3.0-or-later",
+      "optional": true,
+      "dependencies": {
+        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/capabilities": "^1.2.1",
+        "@nextcloud/l10n": "^3.4.1",
+        "@nextcloud/logger": "^3.0.3",
+        "@nextcloud/paths": "^3.0.0",
+        "@nextcloud/router": "^3.1.0",
+        "@nextcloud/sharing": "^0.3.0",
+        "cancelable-promise": "^4.3.1",
+        "is-svg": "^6.1.0",
+        "typescript-event-target": "^1.1.1",
+        "webdav": "^5.8.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.22.9",
-        "babel-loader": "^10.0.0",
-        "css-loader": "^7.1.1",
-        "node-polyfill-webpack-plugin": "4.0.0",
-        "sass": "^1.64.2",
-        "sass-loader": "^16.0.2",
-        "style-loader": "^4.0.0",
-        "ts-loader": "^9.4.4",
-        "vue": "^2.7.16 || ^3.5.13",
-        "vue-loader": "^15.11.1 || ^17.4.2",
-        "webpack": "^5.88.2",
-        "webpack-cli": "^6.0.1",
-        "webpack-dev-server": "^5.0.2"
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
       }
     },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
-      "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "eslint-scope": "5.1.1"
+    "node_modules/@nextcloud/vue/node_modules/@nextcloud/initial-state": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-3.0.0.tgz",
+      "integrity": "sha512-cV+HBdkQJGm8FxkBI5rFT/FbMNWNBvpbj6OPrg4Ae4YOOsQ15CL8InPOAw1t4XkOkQK2NEdUGQLVUz/19wXbdQ==",
+      "license": "GPL-3.0-or-later",
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
       }
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
+    "node_modules/@nextcloud/vue/node_modules/@nextcloud/paths": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/paths/-/paths-3.1.0.tgz",
+      "integrity": "sha512-vtFYA/kthaUDzu6KejTOL1OwnOy7/yynq5zdB/UBpYacAWjUX5Ddh4OMWx3rEavkBJ9/QGhrFryNJLjNfe8OQA==",
+      "license": "GPL-3.0-or-later",
+      "optional": true,
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      }
+    },
+    "node_modules/@nextcloud/vue/node_modules/@nextcloud/sharing": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/sharing/-/sharing-0.3.0.tgz",
+      "integrity": "sha512-kV7qeUZvd1fTKeFyH+W5Qq5rNOqG9rLATZM3U9MBxWXHJs3OxMqYQb8UQ3NYONzsX3zDGJmdQECIGHm1ei2sCA==",
+      "license": "GPL-3.0-or-later",
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
+        "@nextcloud/initial-state": "^3.0.0",
+        "is-svg": "^6.1.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      },
+      "optionalDependencies": {
+        "@nextcloud/files": "^3.12.0"
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
+    "node_modules/@nextcloud/vue/node_modules/@vuepic/vue-datepicker": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@vuepic/vue-datepicker/-/vue-datepicker-11.0.3.tgz",
+      "integrity": "sha512-sb2adwqwK2PizLQOpxCYps2SwhVT6/ic2HMIOqHJXuYa6iAJZWGL5YVlS7O4aW+sk6ZyxlDURLO7kDZPL4HB/w==",
       "license": "MIT",
-      "peer": true,
+      "dependencies": {
+        "date-fns": "^4.1.0"
+      },
       "engines": {
-        "node": ">= 8"
+        "node": ">=18.12.0"
+      },
+      "peerDependencies": {
+        "vue": ">=3.3.0"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
+    "node_modules/@nextcloud/vue/node_modules/@vueuse/components": {
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/components/-/components-14.2.1.tgz",
+      "integrity": "sha512-wB0SvwJ22mNm1hWCMI1wTWz4x55nDTugT5RIg/KCwlWc1vITWL6ry5VTU3SQzsMD2XcazJK8Be1siIsrBb/Vcw==",
       "license": "MIT",
-      "peer": true,
+      "dependencies": {
+        "@vueuse/core": "14.2.1",
+        "@vueuse/shared": "14.2.1"
+      },
+      "peerDependencies": {
+        "vue": "^3.5.0"
+      }
+    },
+    "node_modules/@nextcloud/vue/node_modules/chokidar": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
+      "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
+      "license": "MIT",
+      "dependencies": {
+        "readdirp": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@nextcloud/vue/node_modules/floating-vue": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-5.2.2.tgz",
+      "integrity": "sha512-afW+h2CFafo+7Y9Lvw/xsqjaQlKLdJV7h1fCHfcYQ1C4SVMlu7OAekqWgu5d4SgvkBVU0pVpLlVsrSTBURFRkg==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/dom": "~1.1.1",
+        "vue-resize": "^2.0.0-alpha.1"
+      },
+      "peerDependencies": {
+        "@nuxt/kit": "^3.2.0",
+        "vue": "^3.2.0"
+      },
+      "peerDependenciesMeta": {
+        "@nuxt/kit": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nextcloud/vue/node_modules/floating-vue/node_modules/@floating-ui/dom": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.1.1.tgz",
+      "integrity": "sha512-TpIO93+DIujg3g7SykEAGZMDtbJRrmnYRCNYSjJlvIbGhBjRSNTLVbNeDQBrzy9qDgUbiWdc7KA0uZHZ2tJmiw==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/core": "^1.1.0"
+      }
+    },
+    "node_modules/@nextcloud/vue/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@nextcloud/vue/node_modules/readdirp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
+      "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@nextcloud/vue/node_modules/splitpanes": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/splitpanes/-/splitpanes-4.0.4.tgz",
+      "integrity": "sha512-RbysugZhjbCw5fgplvk3hOXr41stahQDtZhHVkhnnJI6H4wlGDhM2kIpbehy7v92duy9GnMa8zIhHigIV1TWtg==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antoniandre"
+      },
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
+    "node_modules/@nextcloud/vue/node_modules/vue-resize": {
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
+    },
+    "node_modules/@nextcloud/vue/node_modules/vue-router": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-5.0.3.tgz",
+      "integrity": "sha512-nG1c7aAFac7NYj8Hluo68WyWfc41xkEjaR0ViLHCa3oDvTQ/nIuLJlXJX1NUPw/DXzx/8+OKMng045HHQKQKWw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/generator": "^7.28.6",
+        "@vue-macros/common": "^3.1.1",
+        "@vue/devtools-api": "^8.0.6",
+        "ast-walker-scope": "^0.8.3",
+        "chokidar": "^5.0.0",
+        "json5": "^2.2.3",
+        "local-pkg": "^1.1.2",
+        "magic-string": "^0.30.21",
+        "mlly": "^1.8.0",
+        "muggle-string": "^0.4.1",
+        "pathe": "^2.0.3",
+        "picomatch": "^4.0.3",
+        "scule": "^1.3.0",
+        "tinyglobby": "^0.2.15",
+        "unplugin": "^3.0.0",
+        "unplugin-utils": "^0.3.1",
+        "yaml": "^2.8.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/posva"
+      },
+      "peerDependencies": {
+        "@pinia/colada": ">=0.21.2",
+        "@vue/compiler-sfc": "^3.5.17",
+        "pinia": "^3.0.4",
+        "vue": "^3.5.0"
+      },
+      "peerDependenciesMeta": {
+        "@pinia/colada": {
+          "optional": true
+        },
+        "@vue/compiler-sfc": {
+          "optional": true
+        },
+        "pinia": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nextcloud/vue/node_modules/vue-select": {
+      "version": "4.0.0-beta.6",
+      "resolved": "https://registry.npmjs.org/vue-select/-/vue-select-4.0.0-beta.6.tgz",
+      "integrity": "sha512-K+zrNBSpwMPhAxYLTCl56gaMrWZGgayoWCLqe5rWwkB8aUbAUh7u6sXjIR7v4ckp2WKC7zEEUY27g6h1MRsIHw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "vue": "3.x"
+      }
+    },
+    "node_modules/@nextcloud/webpack-vue-config": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-7.0.2.tgz",
+      "integrity": "sha512-7pzQptkQ4XEi9hyhLjdJLAyG4ZnnHuDNsOnMBc1RcRniMCTBp8xD5T1H3gCm4lKmB5/pEyuTK52/rj1w/xqmKw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "AGPL-3.0-or-later",
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.22.9",
+        "babel-loader": "^10.0.0",
+        "css-loader": "^7.1.1",
+        "node-polyfill-webpack-plugin": "4.0.0",
+        "sass": "^1.64.2",
+        "sass-loader": "^16.0.2",
+        "style-loader": "^4.0.0",
+        "ts-loader": "^9.4.4",
+        "vue": "^2.7.16 || ^3.5.13",
+        "vue-loader": "^15.11.1 || ^17.4.2",
+        "webpack": "^5.88.2",
+        "webpack-cli": "^6.0.1",
+        "webpack-dev-server": "^5.0.2"
+      }
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "eslint-scope": "5.1.1"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -3195,8 +3412,16 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
       "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "license": "MIT"
+    },
+    "node_modules/@types/estree-jsx": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.5.tgz",
+      "integrity": "sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==",
       "license": "MIT",
-      "peer": true
+      "dependencies": {
+        "@types/estree": "*"
+      }
     },
     "node_modules/@types/express": {
       "version": "4.17.23",
@@ -3373,16 +3598,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/@types/react": {
-      "version": "19.1.8",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.8.tgz",
-      "integrity": "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "csstype": "^3.0.2"
-      }
-    },
     "node_modules/@types/retry": {
       "version": "0.12.2",
       "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
@@ -3479,9 +3694,9 @@
       "license": "MIT"
     },
     "node_modules/@types/web-bluetooth": {
-      "version": "0.0.20",
-      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
-      "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==",
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
+      "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
       "license": "MIT"
     },
     "node_modules/@types/ws": {
@@ -3760,94 +3975,121 @@
       ],
       "peer": true
     },
-    "node_modules/@vue/compiler-sfc": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
-      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
+    "node_modules/@vue-macros/common": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@vue-macros/common/-/common-3.1.2.tgz",
+      "integrity": "sha512-h9t4ArDdniO9ekYHAD95t9AZcAbb19lEGK+26iAjUODOIJKmObDNBSe4+6ELQAA3vtYiFPPBtHh7+cQCKi3Dng==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.23.5",
-        "postcss": "^8.4.14",
-        "source-map": "^0.6.1"
+        "@vue/compiler-sfc": "^3.5.22",
+        "ast-kit": "^2.1.2",
+        "local-pkg": "^1.1.2",
+        "magic-string-ast": "^1.0.2",
+        "unplugin-utils": "^0.3.0"
       },
-      "optionalDependencies": {
-        "prettier": "^1.18.2 || ^2.0.0"
-      }
-    },
-    "node_modules/@vue/compiler-sfc/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/vue-macros"
+      },
+      "peerDependencies": {
+        "vue": "^2.7.0 || ^3.2.25"
+      },
+      "peerDependenciesMeta": {
+        "vue": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@vue/component-compiler-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
-      "integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
+    "node_modules/@vue/compiler-core": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.29.tgz",
+      "integrity": "sha512-cuzPhD8fwRHk8IGfmYaR4eEe4cAyJEL66Ove/WZL7yWNL134nqLddSLwNRIsFlnnW1kK+p8Ck3viFnC0chXCXw==",
       "license": "MIT",
       "dependencies": {
-        "consolidate": "^0.15.1",
-        "hash-sum": "^1.0.2",
-        "lru-cache": "^4.1.2",
-        "merge-source-map": "^1.1.0",
-        "postcss": "^7.0.36",
-        "postcss-selector-parser": "^6.0.2",
-        "source-map": "~0.6.1",
-        "vue-template-es2015-compiler": "^1.9.0"
+        "@babel/parser": "^7.29.0",
+        "@vue/shared": "3.5.29",
+        "entities": "^7.0.1",
+        "estree-walker": "^2.0.2",
+        "source-map-js": "^1.2.1"
+      }
+    },
+    "node_modules/@vue/compiler-core/node_modules/entities": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
       },
-      "optionalDependencies": {
-        "prettier": "^1.18.2 || ^2.0.0"
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/@vue/component-compiler-utils/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "license": "ISC",
+    "node_modules/@vue/compiler-dom": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.29.tgz",
+      "integrity": "sha512-n0G5o7R3uBVmVxjTIYcz7ovr8sy7QObFG8OQJ3xGCDNhbG60biP/P5KnyY8NLd81OuT1WJflG7N4KWYHaeeaIg==",
+      "license": "MIT",
       "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "@vue/compiler-core": "3.5.29",
+        "@vue/shared": "3.5.29"
       }
     },
-    "node_modules/@vue/component-compiler-utils/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "license": "ISC"
+    "node_modules/@vue/compiler-sfc": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.29.tgz",
+      "integrity": "sha512-oJZhN5XJs35Gzr50E82jg2cYdZQ78wEwvRO6Y63TvLVTc+6xICzJHP1UIecdSPPYIbkautNBanDiWYa64QSFIA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.29.0",
+        "@vue/compiler-core": "3.5.29",
+        "@vue/compiler-dom": "3.5.29",
+        "@vue/compiler-ssr": "3.5.29",
+        "@vue/shared": "3.5.29",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.21",
+        "postcss": "^8.5.6",
+        "source-map-js": "^1.2.1"
+      }
     },
-    "node_modules/@vue/component-compiler-utils/node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.29.tgz",
+      "integrity": "sha512-Y/ARJZE6fpjzL5GH/phJmsFwx3g6t2KmHKHx5q+MLl2kencADKIrhH5MLF6HHpRMmlRAYBRSvv347Mepf1zVNw==",
       "license": "MIT",
       "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
+        "@vue/compiler-dom": "3.5.29",
+        "@vue/shared": "3.5.29"
       }
     },
-    "node_modules/@vue/component-compiler-utils/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
+    "node_modules/@vue/devtools-api": {
+      "version": "8.0.7",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-8.0.7.tgz",
+      "integrity": "sha512-tc1TXAxclsn55JblLkFVcIRG7MeSJC4fWsPjfM7qu/IcmPUYnQ5Q8vzWwBpyDY24ZjmZTUCCwjRSNbx58IhlAA==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-kit": "^8.0.7"
       }
     },
-    "node_modules/@vue/component-compiler-utils/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-      "license": "ISC"
+    "node_modules/@vue/devtools-kit": {
+      "version": "8.0.7",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.0.7.tgz",
+      "integrity": "sha512-H6esJGHGl5q0E9iV3m2EoBQHJ+V83WMW83A0/+Fn95eZ2iIvdsq4+UCS6yT/Fdd4cGZSchx/MdWDreM3WqMsDw==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-shared": "^8.0.7",
+        "birpc": "^2.6.1",
+        "hookable": "^5.5.3",
+        "perfect-debounce": "^2.0.0"
+      }
+    },
+    "node_modules/@vue/devtools-shared": {
+      "version": "8.0.7",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.0.7.tgz",
+      "integrity": "sha512-CgAb9oJH5NUmbQRdYDj/1zMiaICYSLtm+B1kxcP72LBrifGAjUmt8bx52dDH1gWRPlQgxGPqpAMKavzVirAEhA==",
+      "license": "MIT"
     },
     "node_modules/@vue/eslint-config-typescript": {
       "version": "13.0.0",
@@ -3875,136 +4117,99 @@
         }
       }
     },
-    "node_modules/@vue/tsconfig": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@vue/tsconfig/-/tsconfig-0.5.1.tgz",
-      "integrity": "sha512-VcZK7MvpjuTPx2w6blwnwZAu5/LgBUtejFOi3pPGQFXQN5Ela03FUtd2Qtg4yWGGissVL0dr6Ro1LfOFh+PCuQ==",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@vue/reactivity": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.29.tgz",
+      "integrity": "sha512-zcrANcrRdcLtmGZETBxWqIkoQei8HaFpZWx/GHKxx79JZsiZ8j1du0VUJtu4eJjgFvU/iKL5lRXFXksVmI+5DA==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/shared": "3.5.29"
+      }
     },
-    "node_modules/@vueuse/components": {
-      "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/components/-/components-11.3.0.tgz",
-      "integrity": "sha512-sqaGtWPgobXvZmv3atcjW8YW0ypecFuB286OEKFXaPrLsA5b2Y+xAvHvq5V7d+VJRKt705gCK3BNBjxu3g1PdQ==",
+    "node_modules/@vue/runtime-core": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.29.tgz",
+      "integrity": "sha512-8DpW2QfdwIWOLqtsNcds4s+QgwSaHSJY/SUe04LptianUQ/0xi6KVsu/pYVh+HO3NTVvVJjIPL2t6GdeKbS4Lg==",
       "license": "MIT",
       "dependencies": {
-        "@vueuse/core": "11.3.0",
-        "@vueuse/shared": "11.3.0",
-        "vue-demi": ">=0.14.10"
+        "@vue/reactivity": "3.5.29",
+        "@vue/shared": "3.5.29"
       }
     },
-    "node_modules/@vueuse/components/node_modules/vue-demi": {
-      "version": "0.14.10",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-      "hasInstallScript": true,
+    "node_modules/@vue/runtime-dom": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.29.tgz",
+      "integrity": "sha512-AHvvJEtcY9tw/uk+s/YRLSlxxQnqnAkjqvK25ZiM4CllCZWzElRAoQnCM42m9AHRLNJ6oe2kC5DCgD4AUdlvXg==",
       "license": "MIT",
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
+      "dependencies": {
+        "@vue/reactivity": "3.5.29",
+        "@vue/runtime-core": "3.5.29",
+        "@vue/shared": "3.5.29",
+        "csstype": "^3.2.3"
       }
     },
-    "node_modules/@vueuse/core": {
-      "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-11.3.0.tgz",
-      "integrity": "sha512-7OC4Rl1f9G8IT6rUfi9JrKiXy4bfmHhZ5x2Ceojy0jnd3mHNEvV4JaRygH362ror6/NZ+Nl+n13LPzGiPN8cKA==",
+    "node_modules/@vue/server-renderer": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.29.tgz",
+      "integrity": "sha512-G/1k6WK5MusLlbxSE2YTcqAAezS+VuwHhOvLx2KnQU7G2zCH6KIb+5Wyt6UjMq7a3qPzNEjJXs1hvAxDclQH+g==",
       "license": "MIT",
       "dependencies": {
-        "@types/web-bluetooth": "^0.0.20",
-        "@vueuse/metadata": "11.3.0",
-        "@vueuse/shared": "11.3.0",
-        "vue-demi": ">=0.14.10"
+        "@vue/compiler-ssr": "3.5.29",
+        "@vue/shared": "3.5.29"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
+      "peerDependencies": {
+        "vue": "3.5.29"
       }
     },
-    "node_modules/@vueuse/core/node_modules/vue-demi": {
-      "version": "0.14.10",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-      "hasInstallScript": true,
+    "node_modules/@vue/shared": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.29.tgz",
+      "integrity": "sha512-w7SR0A5zyRByL9XUkCfdLs7t9XOHUyJ67qPGQjOou3p6GvBeBW+AVjUUmlxtZ4PIYaRvE+1LmK44O4uajlZwcg==",
+      "license": "MIT"
+    },
+    "node_modules/@vue/tsconfig": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@vue/tsconfig/-/tsconfig-0.5.1.tgz",
+      "integrity": "sha512-VcZK7MvpjuTPx2w6blwnwZAu5/LgBUtejFOi3pPGQFXQN5Ela03FUtd2Qtg4yWGGissVL0dr6Ro1LfOFh+PCuQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@vueuse/core": {
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.2.1.tgz",
+      "integrity": "sha512-3vwDzV+GDUNpdegRY6kzpLm4Igptq+GA0QkJ3W61Iv27YWwW/ufSlOfgQIpN6FZRMG0mkaz4gglJRtq5SeJyIQ==",
       "license": "MIT",
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.21",
+        "@vueuse/metadata": "14.2.1",
+        "@vueuse/shared": "14.2.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       },
       "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
+        "vue": "^3.5.0"
       }
     },
     "node_modules/@vueuse/metadata": {
-      "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-11.3.0.tgz",
-      "integrity": "sha512-pwDnDspTqtTo2HwfLw4Rp6yywuuBdYnPYDq+mO38ZYKGebCUQC/nVj/PXSiK9HX5otxLz8Fn7ECPbjiRz2CC3g==",
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-14.2.1.tgz",
+      "integrity": "sha512-1ButlVtj5Sb/HDtIy1HFr1VqCP4G6Ypqt5MAo0lCgjokrk2mvQKsK2uuy0vqu/Ks+sHfuHo0B9Y9jn9xKdjZsw==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
     "node_modules/@vueuse/shared": {
-      "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-11.3.0.tgz",
-      "integrity": "sha512-P8gSSWQeucH5821ek2mn/ciCk+MS/zoRKqdQIM3bHq6p7GXDAJLmnRRKmF5F65sAVJIfzQlwR3aDzwCn10s8hA==",
-      "license": "MIT",
-      "dependencies": {
-        "vue-demi": ">=0.14.10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
-    "node_modules/@vueuse/shared/node_modules/vue-demi": {
-      "version": "0.14.10",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-      "hasInstallScript": true,
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.2.1.tgz",
+      "integrity": "sha512-shTJncjV9JTI4oVNyF1FQonetYAiTBd+Qj7cY89SWbXSkx7gyhrgtEdF2ZAVWS1S3SHlaROO6F2IesJxQEkZBw==",
       "license": "MIT",
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
-      },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       },
       "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
+        "vue": "^3.5.0"
       }
     },
     "node_modules/@webassemblyjs/ast": {
@@ -4273,11 +4478,10 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4398,9 +4602,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -4628,6 +4830,38 @@
         "util": "^0.12.5"
       }
     },
+    "node_modules/ast-kit": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ast-kit/-/ast-kit-2.2.0.tgz",
+      "integrity": "sha512-m1Q/RaVOnTp9JxPX+F+Zn7IcLYMzM8kZofDImfsKZd8MbR+ikdOzTeztStWqfrqIxZnYWryyI9ePm3NGjnZgGw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.28.5",
+        "pathe": "^2.0.3"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sxzz"
+      }
+    },
+    "node_modules/ast-walker-scope": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/ast-walker-scope/-/ast-walker-scope-0.8.3.tgz",
+      "integrity": "sha512-cbdCP0PGOBq0ASG+sjnKIoYkWMKhhz+F/h9pRexUdX2Hd38+WOlBkRKlqkGOSm0YQpcFMQBJeK4WspUAkwsEdg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.28.4",
+        "ast-kit": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sxzz"
+      }
+    },
     "node_modules/astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -4795,18 +5029,9 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
       "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
+      "peer": true
     },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
@@ -4822,11 +5047,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "license": "MIT"
+    "node_modules/birpc": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.9.0.tgz",
+      "integrity": "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
     },
     "node_modules/blurhash": {
       "version": "2.0.5",
@@ -5343,7 +5571,8 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/cancelable-promise/-/cancelable-promise-4.3.1.tgz",
       "integrity": "sha512-A/8PwLk/T7IJDfUdQ68NR24QHa8rIlnN/stiJEBo6dmVUkD4K14LswG0w3VwdeK/o7qOwRUR1k2MhK5Rpy2m7A==",
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001727",
@@ -5365,13 +5594,21 @@
       ],
       "license": "CC-BY-4.0"
     },
+    "node_modules/ccount": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -5383,15 +5620,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/char-regex": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.2.tgz",
-      "integrity": "sha512-cbGOjAptfM2LVmWhwRFHEKTPkLwNddVmuqYZQt895yXwAsWsXObCG+YN4DGQ/JBtT4GP1a1lPPdio2z413LmTg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.20"
-      }
-    },
     "node_modules/character-entities": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
@@ -5402,6 +5630,36 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/character-entities-html4": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-legacy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-reference-invalid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz",
+      "integrity": "sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/charenc": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
@@ -5459,12 +5717,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/clamp": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
-      "integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA==",
-      "license": "MIT"
-    },
     "node_modules/clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
@@ -5508,9 +5760,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -5522,9 +5772,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/colord": {
       "version": "2.9.3",
@@ -5642,6 +5890,12 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/confbox": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.4.tgz",
+      "integrity": "sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==",
+      "license": "MIT"
+    },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
@@ -5660,18 +5914,6 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/consolidate": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-      "license": "MIT",
-      "dependencies": {
-        "bluebird": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
     "node_modules/constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -5919,6 +6161,7 @@
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
       "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
+      "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -5955,6 +6198,7 @@
       "version": "7.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
       "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
       "license": "ISC",
       "peer": true,
       "bin": {
@@ -5989,7 +6233,9 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -5998,15 +6244,16 @@
       }
     },
     "node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
       "license": "MIT"
     },
     "node_modules/d3": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.4.tgz",
       "integrity": "sha512-q2WHStdhiBtD8DMmhDPyJmXUxr6VWRngKyiJ5EfXMxPw+tqT6BhNjhJZ4w3BHsNm3QoVfZLY8Orq/qPFczwKRA==",
+      "license": "ISC",
       "peer": true,
       "dependencies": {
         "d3-array": "3",
@@ -6491,19 +6738,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/date-format-parse": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/date-format-parse/-/date-format-parse-0.2.7.tgz",
-      "integrity": "sha512-/+lyMUKoRogMuTeOVii6lUwjbVlesN9YRYLzZT/g3TEZ3uD9QnpjResujeEqUW+OSNbT7T1+SYdyEkTcRv+KDQ==",
-      "license": "MIT"
+    "node_modules/date-fns": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
+      }
     },
     "node_modules/debounce": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/debounce/-/debounce-2.2.0.tgz",
-      "integrity": "sha512-Xks6RUDLZFdz8LIdR6q0MTH44k7FikOmnh5xkSjMig6ch45afc8sjTjRQf3P6ax8dMgcQrYO/AR2RGWURrruqw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-3.0.0.tgz",
+      "integrity": "sha512-64byRbF0/AirwbuHqB3/ZpMG9/nckDa6ZA0yd6UnaQNwbbemCOwvz2sL5sjXLHhZHADyiwLm0M5qMhltUUx+TA==",
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -6874,10 +7125,13 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz",
-      "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.2.tgz",
+      "integrity": "sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==",
       "license": "(MPL-2.0 OR Apache-2.0)",
+      "engines": {
+        "node": ">=20"
+      },
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
       }
@@ -6958,9 +7212,9 @@
       "peer": true
     },
     "node_modules/emoji-mart-vue-fast": {
-      "version": "15.0.4",
-      "resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-15.0.4.tgz",
-      "integrity": "sha512-OjuxqoMJRTTG7Vevz0mR1ZnqY1DI8gGnmoskuuC8qL8VwwTjrGdwAO4WRWtAUN8P6Di7kxvY6cUgNETNFmbP4A==",
+      "version": "15.0.5",
+      "resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-15.0.5.tgz",
+      "integrity": "sha512-wnxLor8ggpqshoOPwIc33MdOC3A1XFeDLgUwYLPtNPL8VeAtXJAVrnFq1CN5PeCYAFoLo4IufHQZ9CfHD4IZiw==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
@@ -6978,15 +7232,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/encodeurl": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
@@ -7928,6 +8173,22 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/estree-util-is-identifier-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz",
+      "integrity": "sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "license": "MIT"
+    },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -8073,6 +8334,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/exsolve": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.8.tgz",
+      "integrity": "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==",
+      "license": "MIT"
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -8151,10 +8418,23 @@
       "license": "BSD-3-Clause",
       "peer": true
     },
+    "node_modules/fast-xml-builder": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.0.0.tgz",
+      "integrity": "sha512-fpZuDogrAgnyt9oDDz+5DBz0zgPdPZz6D4IR7iESxRXElrlGTRkHJ9eEt+SACRJwT0FNFrt71DFQIUFBJfX/uQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/fast-xml-parser": {
       "version": "4.5.3",
       "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz",
       "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -8162,6 +8442,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "strnum": "^1.1.1"
       },
@@ -8348,41 +8629,13 @@
       "license": "ISC",
       "peer": true
     },
-    "node_modules/floating-vue": {
-      "version": "1.0.0-beta.19",
-      "resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-1.0.0-beta.19.tgz",
-      "integrity": "sha512-OcM7z5Ua4XAykqolmvPj3l1s+KqUKj6Xz2t66eqjgaWfNBjtuifmxO5+4rRXakIch/Crt8IH+vKdKcR3jOUaoQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/dom": "^0.1.10",
-        "vue-resize": "^1.0.0"
-      },
-      "peerDependencies": {
-        "vue": "^2.6.10"
-      }
-    },
-    "node_modules/floating-vue/node_modules/@floating-ui/core": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.3.1.tgz",
-      "integrity": "sha512-ensKY7Ub59u16qsVIFEo2hwTCqZ/r9oZZFh51ivcLGHfUwTn8l1Xzng8RJUe91H/UP8PeqeBronAGx0qmzwk2g==",
-      "license": "MIT"
-    },
-    "node_modules/floating-vue/node_modules/@floating-ui/dom": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.1.10.tgz",
-      "integrity": "sha512-4kAVoogvQm2N0XE0G6APQJuCNuErjOfPW8Ux7DFxh8+AfugWflwVJ5LDlHOwrwut7z/30NUvdtHzQ3zSip4EzQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/core": "^0.3.0"
-      }
-    },
     "node_modules/focus-trap": {
-      "version": "7.6.5",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.5.tgz",
-      "integrity": "sha512-7Ke1jyybbbPZyZXFxEftUtxFGLMpE2n6A+z//m4CRDlj0hW+o3iYSmh8nFlYMurOiJVDmJRilUQtJr08KfIxlg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-8.0.0.tgz",
+      "integrity": "sha512-Aa84FOGHs99vVwufDMdq2qgOwXPC2e9U66GcqBhn1/jEHPDhJaP8PYhkIbqG9lhfL5Kddk/567lj46LLHYCRUw==",
       "license": "MIT",
       "dependencies": {
-        "tabbable": "^6.2.0"
+        "tabbable": "^6.4.0"
       }
     },
     "node_modules/follow-redirects": {
@@ -8676,8 +8929,7 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "license": "BSD-2-Clause",
-      "peer": true
+      "license": "BSD-2-Clause"
     },
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "1.1.12",
@@ -8838,8 +9090,7 @@
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
@@ -8882,7 +9133,6 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -8961,9 +9211,9 @@
       }
     },
     "node_modules/hash-sum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-      "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
       "license": "MIT"
     },
     "node_modules/hash.js": {
@@ -8990,37 +9240,40 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/hast-to-hyperscript": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-10.0.3.tgz",
-      "integrity": "sha512-NuBoUStp4fRwmvlfbidlEiRSTk0gSHm+97q4Xn9CJ10HO+Py7nlTuDi6RhM1qLOureukGrCXLG7AAxaGqqyslQ==",
+    "node_modules/hast-util-is-element": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
+      "integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
       "license": "MIT",
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "comma-separated-tokens": "^2.0.0",
-        "property-information": "^6.0.0",
-        "space-separated-tokens": "^2.0.0",
-        "style-to-object": "^0.4.1",
-        "web-namespaces": "^2.0.0"
+        "@types/hast": "^3.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hast-to-hyperscript/node_modules/@types/unist": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
-      "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
-      "license": "MIT"
-    },
-    "node_modules/hast-util-is-element": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
-      "integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
+    "node_modules/hast-util-to-jsx-runtime": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.6.tgz",
+      "integrity": "sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==",
       "license": "MIT",
       "dependencies": {
-        "@types/hast": "^3.0.0"
+        "@types/estree": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "devlop": "^1.0.0",
+        "estree-util-is-identifier-name": "^3.0.0",
+        "hast-util-whitespace": "^3.0.0",
+        "mdast-util-mdx-expression": "^2.0.0",
+        "mdast-util-mdx-jsx": "^3.0.0",
+        "mdast-util-mdxjs-esm": "^2.0.0",
+        "property-information": "^7.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "style-to-js": "^1.0.0",
+        "unist-util-position": "^5.0.0",
+        "vfile-message": "^4.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -9044,10 +9297,13 @@
       }
     },
     "node_modules/hast-util-whitespace": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz",
-      "integrity": "sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+      "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
       "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
@@ -9075,6 +9331,12 @@
         "minimalistic-crypto-utils": "^1.0.1"
       }
     },
+    "node_modules/hookable": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
+      "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
+      "license": "MIT"
+    },
     "node_modules/hookified": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.10.0.tgz",
@@ -9339,12 +9601,6 @@
         "@babel/runtime": "^7.23.2"
       }
     },
-    "node_modules/ical.js": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ical.js/-/ical.js-2.2.0.tgz",
-      "integrity": "sha512-P8gjWkTEd5M/SEEvBVPPO/KC+V+HRNRZh3xfCDTVWmUTEfVbL8JaK5GTWS2MJ55aLMhfXhbh7kYzd0nrBARjsA==",
-      "license": "MPL-2.0"
-    },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -9363,6 +9619,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
       "license": "ISC",
       "peer": true,
       "engines": {
@@ -9484,9 +9741,9 @@
       "peer": true
     },
     "node_modules/inline-style-parser": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz",
-      "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==",
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.7.tgz",
+      "integrity": "sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==",
       "license": "MIT"
     },
     "node_modules/internal-slot": {
@@ -9548,6 +9805,30 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-alphabetical": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-2.0.1.tgz",
+      "integrity": "sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/is-alphanumerical": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz",
+      "integrity": "sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==",
+      "license": "MIT",
+      "dependencies": {
+        "is-alphabetical": "^2.0.0",
+        "is-decimal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/is-arguments": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
@@ -9779,6 +10060,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-decimal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-2.0.1.tgz",
+      "integrity": "sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/is-docker": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
@@ -9869,6 +10160,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-hexadecimal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz",
+      "integrity": "sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/is-inside-container": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
@@ -10310,9 +10611,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
       "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
-      "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -10361,9 +10660,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -10529,21 +10826,11 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/linkify-string": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/linkify-string/-/linkify-string-4.3.1.tgz",
-      "integrity": "sha512-1AnH52wZwuJi+skG/9dUphhQEUblVGSf0ntkM8z21RS9bF7xR0qPpqnNTyCo2Obqs5MR5wi8y5wOLPoBbzxm2w==",
-      "license": "MIT",
-      "peerDependencies": {
-        "linkifyjs": "^4.0.0"
-      }
-    },
     "node_modules/linkifyjs": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.3.1.tgz",
-      "integrity": "sha512-DRSlB9DKVW04c4SUdGvKK5FR6be45lTU9M76JnngqPeeGDqPwYc0zdUErtsNVMtxPXgUWV4HbXbnC4sNyBxkYg==",
-      "license": "MIT",
-      "peer": true
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.3.2.tgz",
+      "integrity": "sha512-NT1CJtq3hHIreOianA8aSXn6Cw0JzYOuDQbOrSPe7gqFnCpKP++MQe3ODgO3oh2GJFORkAAdqredOa60z63GbA==",
+      "license": "MIT"
     },
     "node_modules/loader-runner": {
       "version": "4.3.0",
@@ -10555,30 +10842,21 @@
         "node": ">=6.11.5"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+    "node_modules/local-pkg": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.1.2.tgz",
+      "integrity": "sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==",
       "license": "MIT",
       "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
+        "mlly": "^1.7.4",
+        "pkg-types": "^2.3.0",
+        "quansync": "^0.2.11"
       },
       "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/loader-utils/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.0"
+        "node": ">=14"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
       }
     },
     "node_modules/locate-path": {
@@ -10622,12 +10900,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/lodash.throttle": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
-      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==",
-      "license": "MIT"
-    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -10636,6 +10908,16 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/longest-streak": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
+      "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/lowlight": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-3.3.0.tgz",
@@ -10668,7 +10950,31 @@
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "yallist": "^3.0.2"
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.5"
+      }
+    },
+    "node_modules/magic-string-ast": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/magic-string-ast/-/magic-string-ast-1.0.3.tgz",
+      "integrity": "sha512-CvkkH1i81zl7mmb94DsRiFeG9V2fR2JeuK8yDgS8oiZSFa++wWLEgZ5ufEOyLHbvSbD1gTRKv9NdX69Rnvr9JA==",
+      "license": "MIT",
+      "dependencies": {
+        "magic-string": "^0.30.19"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sxzz"
       }
     },
     "node_modules/mapbox-gl": {
@@ -10892,6 +11198,66 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/mdast-util-mdx-expression": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.1.tgz",
+      "integrity": "sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-mdx-jsx": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.2.0.tgz",
+      "integrity": "sha512-lj/z8v0r6ZtsN/cGNNtemmmfoLAFZnjMbNyLzBafjzikOM+glrjNHPlf6lQDOTccj9n5b0PPihEBbhneMyGs1Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "@types/unist": "^3.0.0",
+        "ccount": "^2.0.0",
+        "devlop": "^1.1.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0",
+        "parse-entities": "^4.0.0",
+        "stringify-entities": "^4.0.0",
+        "unist-util-stringify-position": "^4.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-mdxjs-esm": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-2.0.1.tgz",
+      "integrity": "sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/mdast-util-newline-to-break": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mdast-util-newline-to-break/-/mdast-util-newline-to-break-2.0.0.tgz",
@@ -10906,6 +11272,20 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/mdast-util-phrasing": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz",
+      "integrity": "sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/mdast-util-to-hast": {
       "version": "13.2.0",
       "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz",
@@ -10927,6 +11307,27 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/mdast-util-to-markdown": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.2.tgz",
+      "integrity": "sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "@types/unist": "^3.0.0",
+        "longest-streak": "^3.0.0",
+        "mdast-util-phrasing": "^4.0.0",
+        "mdast-util-to-string": "^4.0.0",
+        "micromark-util-classify-character": "^2.0.0",
+        "micromark-util-decode-string": "^2.0.0",
+        "unist-util-visit": "^5.0.0",
+        "zwitch": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/mdast-util-to-string": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz",
@@ -11005,24 +11406,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "license": "MIT",
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/merge-source-map/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -11607,6 +11990,35 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/mlly": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.1.tgz",
+      "integrity": "sha512-SnL6sNutTwRWWR/vcmCYHSADjiEesp5TGQQ0pXyLhW5IoeibRlF/CbSLailbB3CNqJUk9cVJ9dUDnbD7GrcHBQ==",
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.16.0",
+        "pathe": "^2.0.3",
+        "pkg-types": "^1.3.1",
+        "ufo": "^1.6.3"
+      }
+    },
+    "node_modules/mlly/node_modules/confbox": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
+      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
+      "license": "MIT"
+    },
+    "node_modules/mlly/node_modules/pkg-types": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
+      "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+      "license": "MIT",
+      "dependencies": {
+        "confbox": "^0.1.8",
+        "mlly": "^1.7.4",
+        "pathe": "^2.0.1"
+      }
+    },
     "node_modules/moment": {
       "version": "2.30.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
@@ -11622,6 +12034,12 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "license": "MIT"
     },
+    "node_modules/muggle-string": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
+      "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
+      "license": "MIT"
+    },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
       "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
@@ -12132,16 +12550,16 @@
       }
     },
     "node_modules/p-queue": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-8.1.0.tgz",
-      "integrity": "sha512-mxLDbbGIBEXTJL0zEx8JIylaj3xQ7Z/7eEVjcF9fJX4DBiH9oqe+oahYnlKKxm0Ci9TlWTyhSHgygxMxjIB2jw==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-9.1.0.tgz",
+      "integrity": "sha512-O/ZPaXuQV29uSLbxWBGGZO1mCQXV2BLIwUr59JUU9SoH76mnYvtms7aafH/isNSNGwuEfP6W/4xD0/TJXxrizw==",
       "license": "MIT",
       "dependencies": {
         "eventemitter3": "^5.0.1",
-        "p-timeout": "^6.1.2"
+        "p-timeout": "^7.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -12167,12 +12585,12 @@
       }
     },
     "node_modules/p-timeout": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
-      "integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-7.0.1.tgz",
+      "integrity": "sha512-AxTM2wDGORHGEkPCt8yqxOTMgpfbEHqF51f/5fJCmwFC3C/zNcGT63SymH2ttOAaiIws2zVg4+izQCjrakcwHg==",
       "license": "MIT",
       "engines": {
-        "node": ">=14.16"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -12230,6 +12648,31 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/parse-entities": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.2.tgz",
+      "integrity": "sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "character-entities-legacy": "^3.0.0",
+        "character-reference-invalid": "^2.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "is-alphanumerical": "^2.0.0",
+        "is-decimal": "^2.0.0",
+        "is-hexadecimal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/parse-entities/node_modules/@types/unist": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+      "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
+      "license": "MIT"
+    },
     "node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -12335,6 +12778,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/pathe": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "license": "MIT"
+    },
     "node_modules/pbf": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pbf/-/pbf-4.0.1.tgz",
@@ -12403,6 +12852,12 @@
         "inherits": "^2.0.1"
       }
     },
+    "node_modules/perfect-debounce": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-2.1.0.tgz",
+      "integrity": "sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==",
+      "license": "MIT"
+    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -12497,6 +12952,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/pkg-types": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
+      "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
+      "license": "MIT",
+      "dependencies": {
+        "confbox": "^0.2.2",
+        "exsolve": "^1.0.7",
+        "pathe": "^2.0.3"
+      }
+    },
     "node_modules/polyline": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/polyline/-/polyline-0.0.3.tgz",
@@ -12581,6 +13047,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
       "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+      "dev": true,
       "license": "ISC",
       "peer": true,
       "engines": {
@@ -12594,6 +13061,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
       "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
+      "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -12612,6 +13080,7 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -12626,6 +13095,7 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
       "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+      "dev": true,
       "license": "ISC",
       "peer": true,
       "dependencies": {
@@ -12642,6 +13112,7 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -12656,6 +13127,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
       "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
       "license": "ISC",
       "peer": true,
       "dependencies": {
@@ -12726,7 +13198,9 @@
       "version": "6.1.2",
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
       "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -12739,6 +13213,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true,
       "license": "MIT",
       "peer": true
     },
@@ -12759,22 +13234,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-      "license": "MIT",
-      "optional": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -12795,9 +13254,9 @@
       "peer": true
     },
     "node_modules/property-information": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
-      "integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
+      "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -12842,12 +13301,6 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "license": "MIT"
     },
-    "node_modules/pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-      "license": "ISC"
-    },
     "node_modules/public-encrypt": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
@@ -12900,6 +13353,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/quansync": {
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz",
+      "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/antfu"
+        },
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/sxzz"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/querystring-es3": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
@@ -13164,155 +13633,50 @@
         "node": ">=6"
       }
     },
-    "node_modules/rehype-external-links": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-external-links/-/rehype-external-links-3.0.0.tgz",
-      "integrity": "sha512-yp+e5N9V3C6bwBeAC4n796kc86M4gJCdlVhiMTxIrJG5UHDMh+PJANf9heqORJbt1nrCbDwIlAZKjANIaVBbvw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "@ungap/structured-clone": "^1.0.0",
-        "hast-util-is-element": "^3.0.0",
-        "is-absolute-url": "^4.0.0",
-        "space-separated-tokens": "^2.0.0",
-        "unist-util-visit": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/rehype-highlight": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/rehype-highlight/-/rehype-highlight-7.0.2.tgz",
-      "integrity": "sha512-k158pK7wdC2qL3M5NcZROZ2tR/l7zOzjxXd5VGdcfIyoijjQqpHd3JKtYSBDpDZ38UI2WJWuFAtkMDxmx5kstA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "hast-util-to-text": "^4.0.0",
-        "lowlight": "^3.0.0",
-        "unist-util-visit": "^5.0.0",
-        "vfile": "^6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/rehype-react": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/rehype-react/-/rehype-react-7.2.0.tgz",
-      "integrity": "sha512-MHYyCHka+3TtzBMKtcuvVOBAbI1HrfoYA+XH9m7/rlrQQATCPwtJnPdkxKKcIGF8vc9mxqQja9r9f+FHItQeWg==",
-      "license": "MIT",
-      "dependencies": {
-        "@mapbox/hast-util-table-cell-style": "^0.2.0",
-        "@types/hast": "^2.0.0",
-        "hast-to-hyperscript": "^10.0.0",
-        "hast-util-whitespace": "^2.0.0",
-        "unified": "^10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      },
-      "peerDependencies": {
-        "@types/react": ">=17"
-      }
-    },
-    "node_modules/rehype-react/node_modules/@types/hast": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
-      "integrity": "sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/unist": "^2"
-      }
-    },
-    "node_modules/rehype-react/node_modules/@types/unist": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
-      "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
-      "license": "MIT"
-    },
-    "node_modules/rehype-react/node_modules/is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/rehype-react/node_modules/unified": {
-      "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
-      "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "bail": "^2.0.0",
-        "extend": "^3.0.0",
-        "is-buffer": "^2.0.0",
-        "is-plain-obj": "^4.0.0",
-        "trough": "^2.0.0",
-        "vfile": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/rehype-react/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+    "node_modules/rehype-external-links": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/rehype-external-links/-/rehype-external-links-3.0.0.tgz",
+      "integrity": "sha512-yp+e5N9V3C6bwBeAC4n796kc86M4gJCdlVhiMTxIrJG5UHDMh+PJANf9heqORJbt1nrCbDwIlAZKjANIaVBbvw==",
       "license": "MIT",
       "dependencies": {
-        "@types/unist": "^2.0.0"
+        "@types/hast": "^3.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "hast-util-is-element": "^3.0.0",
+        "is-absolute-url": "^4.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "unist-util-visit": "^5.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/rehype-react/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+    "node_modules/rehype-highlight": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/rehype-highlight/-/rehype-highlight-7.0.2.tgz",
+      "integrity": "sha512-k158pK7wdC2qL3M5NcZROZ2tR/l7zOzjxXd5VGdcfIyoijjQqpHd3JKtYSBDpDZ38UI2WJWuFAtkMDxmx5kstA==",
       "license": "MIT",
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
+        "@types/hast": "^3.0.0",
+        "hast-util-to-text": "^4.0.0",
+        "lowlight": "^3.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/rehype-react/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+    "node_modules/rehype-react": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/rehype-react/-/rehype-react-8.0.0.tgz",
+      "integrity": "sha512-vzo0YxYbB2HE+36+9HWXVdxNoNDubx63r5LBzpxBGVWM8s9mdnMdbmuJBAX6TTyuGdZjZix6qU3GcSuKCIWivw==",
       "license": "MIT",
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
+        "@types/hast": "^3.0.0",
+        "hast-util-to-jsx-runtime": "^2.0.0",
+        "unified": "^11.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -13810,6 +14174,12 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/scule": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz",
+      "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
+      "license": "MIT"
+    },
     "node_modules/select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@@ -14435,12 +14805,6 @@
       "integrity": "sha512-D50hKrjZgBzqD3FT2Ek53f2dcDLAQT8SSGrzj3vidNH5ISRgceeGVJ2dQIthKOuayqFXfFjXheHNo4bbt9LhRQ==",
       "license": "MIT"
     },
-    "node_modules/splitpanes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/splitpanes/-/splitpanes-2.4.1.tgz",
-      "integrity": "sha512-kpEo1WuMXuc6QfdQdO2V/fl/trONlkUKp+pputsLTiW9RMtwEvjb4/aYGm2m3+KAzjmb+zLwr4A4SYZu74+pgQ==",
-      "license": "MIT"
-    },
     "node_modules/stable-hash": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.5.tgz",
@@ -14544,49 +14908,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string-length": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
-      "license": "MIT",
-      "dependencies": {
-        "char-regex": "^2.0.0",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/string-length/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/string-length/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -14665,6 +14986,20 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/stringify-entities": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+      "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
+      "license": "MIT",
+      "dependencies": {
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -14714,13 +15049,15 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz",
       "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/NaturalIntelligence"
         }
       ],
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/strtok3": {
       "version": "10.3.1",
@@ -14756,13 +15093,22 @@
         "webpack": "^5.27.0"
       }
     },
+    "node_modules/style-to-js": {
+      "version": "1.1.21",
+      "resolved": "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.21.tgz",
+      "integrity": "sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ==",
+      "license": "MIT",
+      "dependencies": {
+        "style-to-object": "1.0.14"
+      }
+    },
     "node_modules/style-to-object": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.4.tgz",
-      "integrity": "sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==",
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.14.tgz",
+      "integrity": "sha512-LIN7rULI0jBscWQYaSswptyderlarFkjQ+t79nzty8tcIAceVomEVlLzH5VP4Cmsv6MtKhs7qaAiwlcp+Mgaxw==",
       "license": "MIT",
       "dependencies": {
-        "inline-style-parser": "0.1.1"
+        "inline-style-parser": "0.2.7"
       }
     },
     "node_modules/stylelint": {
@@ -15140,9 +15486,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -15190,9 +15534,9 @@
       "peer": true
     },
     "node_modules/tabbable": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
-      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz",
+      "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==",
       "license": "MIT"
     },
     "node_modules/table": {
@@ -15347,22 +15691,14 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/tinycolor2": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
-      "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==",
-      "license": "MIT"
-    },
     "node_modules/tinyglobby": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
-      "dev": true,
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "fdir": "^6.4.4",
-        "picomatch": "^4.0.2"
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -15372,12 +15708,13 @@
       }
     },
     "node_modules/tinyglobby/node_modules/fdir": {
-      "version": "6.4.6",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
-      "dev": true,
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "license": "MIT",
-      "peer": true,
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -15388,12 +15725,10 @@
       }
     },
     "node_modules/tinyglobby/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-      "dev": true,
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -15548,6 +15883,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/ts-md5": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-2.0.1.tgz",
+      "integrity": "sha512-yF35FCoEOFBzOclSkMNEUbFQZuv89KEQ+5Xz03HrMSGUGB1+r+El+JiGOFwsP4p9RFNzwlrydYoTLvPOuICl9w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -15732,9 +16076,9 @@
       }
     },
     "node_modules/typescript-event-target": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/typescript-event-target/-/typescript-event-target-1.1.1.tgz",
-      "integrity": "sha512-dFSOFBKV6uwaloBCCUhxlD3Pr/P1a/tJdcmPrTXCHlEFD3faj0mztjcGn6VBAhQ0/Bdy8K3VWrrqwbt/ffsYsg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/typescript-event-target/-/typescript-event-target-1.1.2.tgz",
+      "integrity": "sha512-TvkrTUpv7gCPlcnSoEwUVUBwsdheKm+HF5u2tPAKubkIGMfovdSizCTaZRY/NhR8+Ijy8iZZUapbVQAsNrkFrw==",
       "license": "MIT"
     },
     "node_modules/ua-is-frozen": {
@@ -15788,6 +16132,12 @@
         "node": "*"
       }
     },
+    "node_modules/ufo": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.3.tgz",
+      "integrity": "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==",
+      "license": "MIT"
+    },
     "node_modules/unbox-primitive": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
@@ -15957,9 +16307,9 @@
       }
     },
     "node_modules/unist-util-visit": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
-      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.1.0.tgz",
+      "integrity": "sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -15996,6 +16346,60 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/unplugin": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-3.0.0.tgz",
+      "integrity": "sha512-0Mqk3AT2TZCXWKdcoaufeXNukv2mTrEZExeXlHIOZXdqYoHHr4n51pymnwV8x2BOVxwXbK2HLlI7usrqMpycdg==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/remapping": "^2.3.5",
+        "picomatch": "^4.0.3",
+        "webpack-virtual-modules": "^0.6.2"
+      },
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/unplugin-utils": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/unplugin-utils/-/unplugin-utils-0.3.1.tgz",
+      "integrity": "sha512-5lWVjgi6vuHhJ526bI4nlCOmkCIF3nnfXkCMDeMJrtdvxTs6ZFCM8oNufGTsDbKv/tJ/xj8RpvXjRuPBZJuJog==",
+      "license": "MIT",
+      "dependencies": {
+        "pathe": "^2.0.3",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sxzz"
+      }
+    },
+    "node_modules/unplugin-utils/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/unplugin/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/unrs-resolver": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
@@ -16134,7 +16538,9 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "license": "MIT"
+      "dev": true,
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
@@ -16206,31 +16612,24 @@
       "peer": true
     },
     "node_modules/vue": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
-      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/compiler-sfc": "2.7.16",
-        "csstype": "^3.1.0"
-      }
-    },
-    "node_modules/vue-click-outside": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vue-click-outside/-/vue-click-outside-1.1.0.tgz",
-      "integrity": "sha512-pNyvAA9mRXJwPHlHJyjMb4IONSc7khS5lxGcMyE2EIKgNMAO279PWM9Hyq0d5J4FkiSRdmFLwnbjDd5UtPizHQ==",
-      "license": "MIT"
-    },
-    "node_modules/vue-color": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/vue-color/-/vue-color-2.8.2.tgz",
-      "integrity": "sha512-1qmsxl5GiIjx/jApBbTGr2r4bN/7WRKUTl3tc53vkXb9Ua0rZmiqsdq6VdG1e7dVNTLJahdsRGWcjeU2+98+NA==",
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.29.tgz",
+      "integrity": "sha512-BZqN4Ze6mDQVNAni0IHeMJ5mwr8VAJ3MQC9FmprRhcBYENw+wOAAjRj8jfmN6FLl0j96OXbR+CjWhmAmM+QGnA==",
       "license": "MIT",
       "dependencies": {
-        "clamp": "^1.0.1",
-        "lodash.throttle": "^4.0.0",
-        "material-colors": "^1.0.0",
-        "tinycolor2": "^1.1.2"
+        "@vue/compiler-dom": "3.5.29",
+        "@vue/compiler-sfc": "3.5.29",
+        "@vue/runtime-dom": "3.5.29",
+        "@vue/server-renderer": "3.5.29",
+        "@vue/shared": "3.5.29"
+      },
+      "peerDependencies": {
+        "typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
     "node_modules/vue-eslint-parser": {
@@ -16316,48 +16715,24 @@
         "node": ">=10"
       }
     },
-    "node_modules/vue-frag": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/vue-frag/-/vue-frag-1.4.3.tgz",
-      "integrity": "sha512-pQZj03f/j9LRhzz9vKaXTCXUHVYHuAXicshFv76VFqwz4MG3bcb+sPZMAbd0wmw7THjkrTPuoM0EG9TbG8CgMQ==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/privatenumber/vue-frag?sponsor=1"
-      },
-      "peerDependencies": {
-        "vue": "^2.6.0"
-      }
-    },
-    "node_modules/vue-hot-reload-api": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
-      "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
-      "license": "MIT"
-    },
     "node_modules/vue-loader": {
-      "version": "15.11.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
-      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
+      "version": "17.4.2",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.4.2.tgz",
+      "integrity": "sha512-yTKOA4R/VN4jqjw4y5HrynFL8AK0Z3/Jt7eOJXEitsm0GMRHDBjCfCiuTiLP7OESvsZYo2pATCWhDqxC5ZrM6w==",
       "license": "MIT",
       "dependencies": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "watchpack": "^2.4.0"
       },
       "peerDependencies": {
-        "css-loader": "*",
-        "webpack": "^3.0.0 || ^4.1.0 || ^5.0.0-0"
+        "webpack": "^4.1.0 || ^5.0.0-0"
       },
       "peerDependenciesMeta": {
-        "cache-loader": {
-          "optional": true
-        },
-        "prettier": {
+        "@vue/compiler-sfc": {
           "optional": true
         },
-        "vue-template-compiler": {
+        "vue": {
           "optional": true
         }
       }
@@ -16368,40 +16743,6 @@
       "integrity": "sha512-6UNEyhlTzlCeT8ZeX5WbpUGFTTPSbOoTQeoASTv7X4Ylh0pe8vltj+36VMK56KM0gG8EQVoMK/Qw/6evalg8lA==",
       "license": "MIT"
     },
-    "node_modules/vue-resize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-1.0.1.tgz",
-      "integrity": "sha512-z5M7lJs0QluJnaoMFTIeGx6dIkYxOwHThlZDeQnWZBizKblb99GSejPnK37ZbNE/rVwDcYcHY+Io+AxdpY952w==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.13.10"
-      },
-      "peerDependencies": {
-        "vue": "^2.6.0"
-      }
-    },
-    "node_modules/vue-router": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
-      "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==",
-      "license": "MIT"
-    },
-    "node_modules/vue-style-loader": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
-      "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
-      "license": "MIT",
-      "dependencies": {
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.0.2"
-      }
-    },
-    "node_modules/vue-template-es2015-compiler": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
-      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
-      "license": "MIT"
-    },
     "node_modules/vue-types": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/vue-types/-/vue-types-5.1.3.tgz",
@@ -16422,56 +16763,29 @@
         }
       }
     },
-    "node_modules/vue2-datepicker": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.11.1.tgz",
-      "integrity": "sha512-6PU/+pnp2mgZAfnSXmbdwj9516XsEvTiw61Q5SNrvvdy8W/FCxk1GAe9UZn/m9YfS5A47yK6XkcjMHbp7aFApA==",
-      "license": "MIT",
-      "dependencies": {
-        "date-format-parse": "^0.2.7"
-      },
-      "peerDependencies": {
-        "vue": "^2.5.0"
-      }
-    },
-    "node_modules/vue2-leaflet": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz",
-      "integrity": "sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@types/leaflet": "^1.5.7",
-        "leaflet": "^1.3.4",
-        "vue": "^2.5.17"
-      }
-    },
-    "node_modules/vue2-leaflet-markercluster": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/vue2-leaflet-markercluster/-/vue2-leaflet-markercluster-3.1.0.tgz",
-      "integrity": "sha512-v94tns6/PmBlFaPY2XvCUL69yUwRO43qYAP7T9hLmPDdu3Vgl15SDcC1qara8M56aNzWMPAcfP/uy4toUE5wcA==",
+    "node_modules/vuex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
+      "integrity": "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==",
       "license": "MIT",
       "dependencies": {
-        "leaflet.markercluster": "^1.4.1"
+        "@vue/devtools-api": "^6.0.0-beta.11"
       },
       "peerDependencies": {
-        "leaflet": "^1.3.4"
+        "vue": "^3.2.0"
       }
     },
-    "node_modules/vuex": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
-      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "vue": "^2.0.0"
-      }
+    "node_modules/vuex/node_modules/@vue/devtools-api": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
+      "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
+      "license": "MIT"
     },
     "node_modules/watchpack": {
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
       "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -16491,16 +16805,6 @@
         "minimalistic-assert": "^1.0.0"
       }
     },
-    "node_modules/web-namespaces": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
-      "integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/web-streams-polyfill": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
@@ -16511,16 +16815,16 @@
       }
     },
     "node_modules/webdav": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.8.0.tgz",
-      "integrity": "sha512-iuFG7NamJ41Oshg4930iQgfIpRrUiatPWIekeznYgEf2EOraTRcDPTjy7gIOMtkdpKTaqPk1E68NO5PAGtJahA==",
+      "version": "5.9.0",
+      "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.9.0.tgz",
+      "integrity": "sha512-OMJ6wtK1WvCO++aOLoQgE96S8KT4e5aaClWHmHXfFU369r4eyELN569B7EqT4OOUb99mmO58GkyuiCv/Ag6J0Q==",
       "license": "MIT",
       "dependencies": {
         "@buttercup/fetch": "^0.2.1",
         "base-64": "^1.0.0",
         "byte-length": "^1.0.2",
-        "entities": "^6.0.0",
-        "fast-xml-parser": "^4.5.1",
+        "entities": "^6.0.1",
+        "fast-xml-parser": "^5.3.4",
         "hot-patcher": "^2.0.1",
         "layerr": "^3.0.0",
         "md5": "^2.3.0",
@@ -16547,6 +16851,25 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/webdav/node_modules/fast-xml-parser": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.4.1.tgz",
+      "integrity": "sha512-BQ30U1mKkvXQXXkAGcuyUA/GA26oEB7NzOtsxCDtyu62sjGw5QraKFhx2Em3WQNjPw9PG6MQ9yuIIgkSDfGu5A==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "fast-xml-builder": "^1.0.0",
+        "strnum": "^2.1.2"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
     "node_modules/webdav/node_modules/node-fetch": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
@@ -16565,6 +16888,18 @@
         "url": "https://opencollective.com/node-fetch"
       }
     },
+    "node_modules/webdav/node_modules/strnum": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz",
+      "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/webpack": {
       "version": "5.100.1",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.100.1.tgz",
@@ -16839,6 +17174,12 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/webpack-virtual-modules": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
+      "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
+      "license": "MIT"
+    },
     "node_modules/websocket-driver": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
@@ -17087,6 +17428,21 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/yaml": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
+      "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/eemeli"
+      }
+    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -17100,6 +17456,16 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zwitch": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index a7498039d..098732463 100644
--- a/package.json
+++ b/package.json
@@ -41,15 +41,15 @@
     "@mdi/svg": "^7.4.47",
     "@nextcloud/auth": "^2.5.1",
     "@nextcloud/axios": "^2.5.1",
-    "@nextcloud/dialogs": "^6.3.2",
+    "@nextcloud/dialogs": "^7.3.0",
     "@nextcloud/event-bus": "^3.3.3",
-    "@nextcloud/files": "^3.12.0",
+    "@nextcloud/files": "^4.0.0",
     "@nextcloud/l10n": "^3.1.0",
     "@nextcloud/moment": "^1.3.4",
     "@nextcloud/paths": "^2.1.0",
     "@nextcloud/router": "^3.0.1",
     "@nextcloud/sharing": "^0.2.5",
-    "@nextcloud/vue": "^8.27.0",
+    "@nextcloud/vue": "^9.5.0",
     "@raruto/leaflet-elevation": "^2.5.2",
     "axios": "^1.13.5",
     "geojson": "^0.5.0",
@@ -70,14 +70,11 @@
     "nouislider": "^15.8.1",
     "opening_hours": "^3.9.0",
     "ua-parser-js": "^2.0.5",
-    "vue": "^2.7.16",
-    "vue-click-outside": "^1.1.0",
-    "vue-loader": "^15.11.1",
+    "vue": "^3.4.21",
+    "vue-loader": "^17.4.2",
     "vue-material-design-icons": "^5.3.1",
     "vue-types": "^5.1.3",
-    "vue2-leaflet": "^2.6.0",
-    "vue2-leaflet-markercluster": "^3.1.0",
-    "vuex": "^3.6.2"
+    "vuex": "^4.1.0"
   },
   "devDependencies": {
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
@@ -85,8 +82,9 @@
     "@nextcloud/browserslist-config": "^3.0.1",
     "@nextcloud/eslint-config": "^8.4.1",
     "@nextcloud/stylelint-config": "^3.1.0",
-    "@nextcloud/webpack-vue-config": "^6.3.0",
+    "@nextcloud/webpack-vue-config": "^7.0.0",
     "@types/leaflet": "^1.9.21",
+    "@vue/compiler-sfc": "^3.4.21",
     "@vue/tsconfig": "^0.5.1",
     "typescript": "^5.9.2"
   }
diff --git a/src/bootstrap.js b/src/bootstrap.js
index 9b0490e9d..2da772559 100644
--- a/src/bootstrap.js
+++ b/src/bootstrap.js
@@ -20,23 +20,13 @@
  *
  */
 
-import Vue from 'vue'
 import { Icon } from 'leaflet'
 
-Vue.prototype.t = window.t
-Vue.prototype.n = window.n
-Vue.prototype.OC = window.OC
-Vue.prototype.OCA = window.OCA
-
-/* if (process && process.env.NODE_ENV === 'development') {
-	Vue.config.devtools = true
-} */
-
 // this is needed to get default marker icons
 delete Icon.Default.prototype._getIconUrl
 
 Icon.Default.mergeOptions({
-	iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png').default,
-	iconUrl: require('leaflet/dist/images/marker-icon.png').default,
-	shadowUrl: require('leaflet/dist/images/marker-shadow.png').default,
-})
+    iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+    iconUrl: require('leaflet/dist/images/marker-icon.png'),
+    shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
+})
\ No newline at end of file
diff --git a/src/components/AppNavigationContactsItem.vue b/src/components/AppNavigationContactsItem.vue
index 1ef059a3f..4abe85031 100644
--- a/src/components/AppNavigationContactsItem.vue
+++ b/src/components/AppNavigationContactsItem.vue
@@ -8,68 +8,64 @@
 		:force-menu="false"
 		@click="onContactsClick"
 		@update:open="onUpdateOpen">
-		<NcCounterBubble v-show="enabled && contacts.length"
-			slot="counter">
-			{{ contacts.length > 99 ? '99+' : contacts.length }}
-		</NcCounterBubble>
-		<template v-if="enabled" slot="actions">
-			<NcActionButton
-				icon="icon-checkmark"
-				@click="onToggleAllClick">
-				{{ t('maps', 'Toggle all') }}
-			</NcActionButton>
-			<NcActionButton
-				icon="icon-search"
-				:close-after-click="true"
-				@click="onZoomAllClick">
-				{{ t('maps', 'Zoom') }}
-			</NcActionButton>
-			<NcActionButton v-if="!isPublic()"
-				icon="icon-share"
-				:close-after-click="true"
-				@click="$emit('add-to-map-all-contacts')">
-				{{ t('maps', 'Copy to map') }}
-			</NcActionButton>
-		</template>
-		<template slot="default">
-			<b v-show="false">dummy</b>
-			<NcAppNavigationItem
-				v-for="(g, gid) in groups"
-				:key="gid"
-				icon="icon-group"
-				:name="g.name"
-				:class="{ 'subitem-disabled': !g.enabled }"
-				:allow-collapse="false"
-				:force-menu="false"
-				@click="onGroupClick(gid)">
-				<NcCounterBubble v-show="enabled && g.enabled"
-					slot="counter">
-					{{ g.counter > 99 ? '99+' : g.counter }}
-				</NcCounterBubble>
-				<template slot="actions">
-					<NcActionButton v-if="enabled && g.enabled"
-						icon="icon-search"
-						:disabled="!g.enabled || g.counter === 0"
-						:close-after-click="true"
-						@click="onZoomGroupClick(gid)">
-						{{ t('maps', 'Zoom') }}
-					</NcActionButton>
-					<NcActionButton v-if="!isPublic()"
-						icon="icon-share"
-						:close-after-click="true"
-						@click="$emit('add-to-map-contact-group', gid)">
-						{{ t('maps', 'Copy to map') }}
-					</NcActionButton>
-				</template>
-			</NcAppNavigationItem>
-		</template>
+			<template #counter>
+				<NcCounterBubble v-show="enabled && contacts.length" :count="contacts.length" />
+			</template>
+			<template v-if="enabled" v-slot:actions>
+				<NcActionButton
+					icon="icon-checkmark"
+					@click="onToggleAllClick">
+					{{ t('maps', 'Toggle all') }}
+				</NcActionButton>
+				<NcActionButton
+					icon="icon-search"
+					:close-after-click="true"
+					@click="onZoomAllClick">
+					{{ t('maps', 'Zoom') }}
+				</NcActionButton>
+				<NcActionButton v-if="!isPublic()"
+					icon="icon-share"
+					:close-after-click="true"
+					@click="$emit('add-to-map-all-contacts')">
+					{{ t('maps', 'Copy to map') }}
+				</NcActionButton>
+			</template>
+			<template v-slot:default>
+				<b v-show="false">dummy</b>
+				<NcAppNavigationItem
+					v-for="(g, gid) in groups"
+					:key="gid"
+					icon="icon-group"
+					:name="g.name"
+					:class="{ 'subitem-disabled': !g.enabled }"
+					:allow-collapse="false"
+					:force-menu="false"
+					@click="onGroupClick(gid)">
+					<template #counter>
+						<NcCounterBubble v-show="enabled && g.enabled" :count="g.counter" />
+					</template>
+					<template v-slot:actions>
+						<NcActionButton v-if="enabled && g.enabled"
+							icon="icon-search"
+							:disabled="!g.enabled || g.counter === 0"
+							:close-after-click="true"
+							@click="onZoomGroupClick(gid)">
+							{{ t('maps', 'Zoom') }}
+						</NcActionButton>
+						<NcActionButton v-if="!isPublic()"
+							icon="icon-share"
+							:close-after-click="true"
+							@click="$emit('add-to-map-contact-group', gid)">
+							{{ t('maps', 'Copy to map') }}
+						</NcActionButton>
+					</template>
+				</NcAppNavigationItem>
+			</template>
 	</NcAppNavigationItem>
 </template>
 
 <script>
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
+import { NcAppNavigationItem, NcActionButton, NcCounterBubble} from '@nextcloud/vue'
 import optionsController from '../optionsController.js'
 import { isPublic } from '../utils/common.js'
 
diff --git a/src/components/AppNavigationDeviceItem.vue b/src/components/AppNavigationDeviceItem.vue
index 7f328286b..77cde914b 100644
--- a/src/components/AppNavigationDeviceItem.vue
+++ b/src/components/AppNavigationDeviceItem.vue
@@ -5,7 +5,7 @@
 		:allow-collapse="false"
 		:force-menu="false"
 		@click="$emit('click', device)">
-		<template slot="icon">
+		<template v-slot:icon>
 			<div v-if="device.loading"
 				class="app-navigation-entry-icon icon-loading-small " />
 			<div v-else
@@ -20,10 +20,10 @@
 				@change="updateDeviceColor"
 				@click.stop="">
 		</template>
-		<template slot="counter">
+		<template #counter>
 			&nbsp;
 		</template>
-		<template slot="actions">
+		<template v-slot:actions>
 			<NcActionButton v-if="parentEnabled && device.enabled"
 				icon="icon-category-monitoring"
 				:close-after-click="true"
@@ -67,8 +67,7 @@
 </template>
 
 <script>
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import { NcAppNavigationItem, NcActionButton } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
 import { isComputer } from '../utils.js'
 import { isPublic } from '../utils/common.js'
diff --git a/src/components/AppNavigationDevicesItem.vue b/src/components/AppNavigationDevicesItem.vue
index 5c7382b2c..78cccb634 100644
--- a/src/components/AppNavigationDevicesItem.vue
+++ b/src/components/AppNavigationDevicesItem.vue
@@ -8,11 +8,10 @@
 		:force-menu="false"
 		@click="onClick"
 		@update:open="onUpdateOpen">
-		<NcCounterBubble v-show="enabled && devices.length"
-			slot="counter">
-			{{ devices.length > 99 ? '99+' : devices.length }}
-		</NcCounterBubble>
-		<template v-if="enabled" slot="actions">
+		<template #counter>
+			<NcCounterBubble v-show="enabled && devices.length" :count="devices.length" />
+		</template>
+		<template v-if="enabled" #actions>
 			<NcActionButton
 				icon="icon-download"
 				:close-after-click="true"
@@ -41,7 +40,7 @@
 				{{ t('maps', 'Delete all') }}
 			</NcActionButton>
 		</template>
-		<template slot="default">
+		<template #default>
 			<b v-show="false">dummy</b>
 			<AppNavigationDeviceItem
 				v-for="device in sortedDevices"
@@ -62,9 +61,7 @@
 </template>
 
 <script>
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
+import { NcAppNavigationItem, NcActionButton, NcCounterBubble } from '@nextcloud/vue'
 
 import AppNavigationDeviceItem from './AppNavigationDeviceItem.vue'
 import optionsController from '../optionsController.js'
diff --git a/src/components/AppNavigationFavoritesItem.vue b/src/components/AppNavigationFavoritesItem.vue
index ad090066d..a3e919d6b 100644
--- a/src/components/AppNavigationFavoritesItem.vue
+++ b/src/components/AppNavigationFavoritesItem.vue
@@ -8,11 +8,10 @@
 		:force-menu="false"
 		@click="onFavoritesClick"
 		@update:open="onUpdateOpen">
-		<NcCounterBubble v-show="enabled && nbFavorites"
-			slot="counter">
-			{{ nbFavorites > 99 ? '99+' : nbFavorites }}
-		</NcCounterBubble>
-		<template v-if="enabled" slot="actions">
+		<template #counter>
+			<NcCounterBubble v-show="enabled && nbFavorites" :count="nbFavorites" />
+		</template>
+		<template v-if="enabled" #actions>
 			<NcActionButton v-if="!readOnly"
 				:icon="draggable ? 'icon-hand' : 'icon-hand-slash'"
 				:close-after-click="false"
@@ -43,7 +42,7 @@
 				{{ t('maps', 'Import') }}
 			</NcActionButton>
 		</template>
-		<template slot="default">
+		<template #default>
 			<NcAppNavigationNew
 				v-if="enabled && !readOnly"
 				:text="addFavoriteText"
@@ -65,11 +64,10 @@
 					<div :class="{ favoriteMarker: true, navigationFavoriteMarkerDark: isDarkTheme, navigationFavoriteMarker: !isDarkTheme }"
 						:style="'background-color: #' + c.color" />
 				</template>
-				<NcCounterBubble v-show="enabled && nbFavorites && c.enabled"
-					slot="counter">
-					{{ c.counter > 99 ? '99+' : c.counter }}
-				</NcCounterBubble>
-				<template slot="actions">
+				<template #counter>
+					<NcCounterBubble v-show="enabled && nbFavorites && c.enabled" :count="c.counter" />
+				</template>
+				<template #actions>
 					<NcActionButton v-if="enabled && nbFavorites && c.enabled && c.isUpdateable"
 						icon="icon-add"
 						:close-after-click="true"
@@ -125,11 +123,7 @@
 </template>
 
 <script>
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
+import { NcAppNavigationItem, NcAppNavigationNew, NcActionButton, NcActionCheckbox, NcCounterBubble } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { generateUrl } from '@nextcloud/router'
 import { isPublic } from '../utils/common.js'
@@ -237,9 +231,9 @@ export default {
 					console.debug(error)
 					showError(t('maps', 'Link {url} could not be copied to clipboard.', { url }))
 				}
-				this.$set(this.isLinkCopied, category.name, true)
+				this.isLinkCopied[category.name] = true
 				setTimeout(() => {
-					this.$delete(this.isLinkCopied, category.name)
+					delete this.isLinkCopied[category.name]
 				}, 5000)
 			} catch (error) {
 				console.debug(error)
diff --git a/src/components/AppNavigationMyMapItem.vue b/src/components/AppNavigationMyMapItem.vue
index b42893e1c..6476e109e 100644
--- a/src/components/AppNavigationMyMapItem.vue
+++ b/src/components/AppNavigationMyMapItem.vue
@@ -8,7 +8,7 @@
 		:edit-label="t('maps', 'Rename')"
 		@click="$emit('click', myMap)"
 		@update:name="onRename">
-		<template slot="icon">
+		<template #icon>
 			<div class="icon icon-location" />
 			<input v-show="false"
 				ref="col"
@@ -18,10 +18,10 @@
 				@change="updateMyMapColor"
 				@click.stop="">
 		</template>
-		<template slot="counter">
+		<template #counter>
 			&nbsp;
 		</template>
-		<template slot="actions">
+		<template #actions>
 			<NcActionLink v-if="myMap.id"
 				target="_blank"
 				:href="folderUrl"
@@ -56,9 +56,7 @@
 </template>
 
 <script>
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
+import { NcAppNavigationItem, NcActionButton, NcActionLink } from '@nextcloud/vue'
 import Folder from 'vue-material-design-icons/Folder.vue'
 import { generateUrl } from '@nextcloud/router'
 
diff --git a/src/components/AppNavigationMyMapsItem.vue b/src/components/AppNavigationMyMapsItem.vue
index 57448f9ca..0d65a162c 100644
--- a/src/components/AppNavigationMyMapsItem.vue
+++ b/src/components/AppNavigationMyMapsItem.vue
@@ -8,11 +8,10 @@
 		:force-menu="false"
 		@click="onClick"
 		@update:open="onUpdateOpen">
-		<NcCounterBubble v-show="enabled && myMaps.length"
-			slot="counter">
-			{{ myMaps.length > 99 ? '99+' : myMaps.length }}
-		</NcCounterBubble>
-		<template v-if="enabled" slot="actions">
+		<template #counter>
+			<NcCounterBubble v-if="enabled && myMaps.length" :count="myMaps.length ? myMaps.length : 0" />
+		</template>
+		<template v-if="enabled" #actions>
 			<NcActionButton
 				icon="icon-add"
 				:close-after-click="true"
@@ -20,7 +19,7 @@
 				{{ t('maps', 'Add Map') }}
 			</NcActionButton>
 		</template>
-		<template slot="default">
+		<template #default>
 			<b v-show="false">dummy</b>
 			<AppNavigationMyMapItem
 				v-for="myMap in myMaps"
@@ -38,11 +37,9 @@
 </template>
 
 <script>
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import { NcAppNavigationItem, NcActionButton, NcCounterBubble } from '@nextcloud/vue'
 import AppNavigationMyMapItem from './AppNavigationMyMapItem.vue'
 import optionsController from '../optionsController.js'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
 
 export default {
 	name: 'AppNavigationMyMapsItem',
diff --git a/src/components/AppNavigationPhotosItem.vue b/src/components/AppNavigationPhotosItem.vue
index 3640f0e12..79a6cdc46 100644
--- a/src/components/AppNavigationPhotosItem.vue
+++ b/src/components/AppNavigationPhotosItem.vue
@@ -6,18 +6,11 @@
 		:allow-collapse="false"
 		:force-menu="enabled"
 		@click="$emit('photos-clicked')">
-		<NcCounterBubble v-if="enabled && loading"
-			slot="counter">
-			{{
-				(loadedPhotos > 1000 ? Math.floor(loadedPhotos/1000).toString() + 'k' : loadedPhotos > 99 ? '99+' : loadedPhotos) + '/' +
-					(totalPhotos > 1000 ? Math.floor(totalPhotos/1000).toString() + 'k' : totalPhotos > 99 ? '99+' : totalPhotos)
-			}}
-		</NcCounterBubble>
-		<NcCounterBubble v-else-if="enabled"
-			slot="counter">
-			{{ totalPhotos > 1000 ? Math.floor(totalPhotos/1000).toString() + 'k' : totalPhotos > 99 ? '99+' : totalPhotos }}
-		</NcCounterBubble>
-		<template v-if="enabled" slot="actions">
+		<template #counter>
+			<NcCounterBubble v-if="enabled && loading" :count="loadedPhotos" />
+			<NcCounterBubble v-else-if="enabled" :count="totalPhotos" />
+		</template>
+		<template v-if="enabled" #actions>
 			<NcActionButton v-if="!readOnly"
 				:icon="draggable ? 'icon-hand' : 'icon-hand-slash'"
 				:close-after-click="false"
@@ -48,9 +41,7 @@
 </template>
 
 <script>
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
+import { NcAppNavigationItem, NcActionButton, NcCounterBubble } from '@nextcloud/vue'
 
 import optionsController from '../optionsController.js'
 import { showInfo } from '@nextcloud/dialogs'
diff --git a/src/components/AppNavigationTrackItem.vue b/src/components/AppNavigationTrackItem.vue
index 3223e5c85..19e44f275 100644
--- a/src/components/AppNavigationTrackItem.vue
+++ b/src/components/AppNavigationTrackItem.vue
@@ -5,7 +5,7 @@
 		:allow-collapse="false"
 		:force-menu="false"
 		@click="$emit('click', track)">
-		<template slot="icon">
+		<template #icon>
 			<div v-if="track.loading"
 				class="app-navigation-entry-icon icon-loading-small " />
 			<div v-else-if="track.color"
@@ -30,10 +30,10 @@
 				@change="updateTrackColor"
 				@click.stop="">
 		</template>
-		<template slot="counter">
+		<template #counter>
 			&nbsp;
 		</template>
-		<template slot="actions">
+		<template #actions>
 			<NcActionButton v-if="parentEnabled && track.enabled"
 				icon="icon-search"
 				:close-after-click="true"
@@ -79,9 +79,7 @@
 </template>
 
 <script>
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
+import { NcAppNavigationItem, NcActionButton, NcActionLink } from '@nextcloud/vue'
 import { isPublic, getToken } from '../utils/common'
 import { generateUrl } from '@nextcloud/router'
 
@@ -112,7 +110,9 @@ export default {
 
 	computed: {
 		downloadTrackUrl() {
-			return OCA.Files.App.fileList.filesClient.getBaseUrl() + this.track.file_path
+			return OCA?.Files?.App?.fileList?.filesClient?.getBaseUrl
+				? OCA.Files.App.fileList.filesClient.getBaseUrl() + this.track.file_path
+				: '#'
 		},
 		downloadTrackShareUrl() {
 			return generateUrl('s/' + getToken() + '/download' + '?path=/&files=' + this.track.file_name)
diff --git a/src/components/AppNavigationTracksItem.vue b/src/components/AppNavigationTracksItem.vue
index 70db55e53..9020270c4 100644
--- a/src/components/AppNavigationTracksItem.vue
+++ b/src/components/AppNavigationTracksItem.vue
@@ -8,11 +8,10 @@
 		:force-menu="false"
 		@click="onTracksClick"
 		@update:open="onUpdateOpen">
-		<NcCounterBubble v-show="enabled && tracks.length"
-			slot="counter">
-			{{ tracks.length > 99 ? '99+' : tracks.length }}
-		</NcCounterBubble>
-		<template v-if="enabled" slot="actions">
+		<template #counter>
+			<NcCounterBubble v-show="enabled && tracks.length" :count="tracks.length" />
+		</template>
+		<template v-if="enabled" #actions>
 			<NcActionButton
 				icon="icon-tag"
 				:close-after-click="true"
@@ -26,7 +25,7 @@
 				{{ t('maps', 'Sort by date') }}
 			</NcActionButton>
 		</template>
-		<template slot="default">
+		<template #default>
 			<b v-show="false">dummy</b>
 			<AppNavigationTrackItem
 				v-for="track in sortedTracks"
@@ -44,10 +43,8 @@
 </template>
 
 <script>
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import { NcAppNavigationItem, NcActionButton, NcCounterBubble } from '@nextcloud/vue'
 import AppNavigationTrackItem from './AppNavigationTrackItem.vue'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
 
 import optionsController from '../optionsController.js'
 
diff --git a/src/components/FavoriteEditionForm.vue b/src/components/FavoriteEditionForm.vue
index 76bafc8c7..f93479342 100644
--- a/src/components/FavoriteEditionForm.vue
+++ b/src/components/FavoriteEditionForm.vue
@@ -21,6 +21,7 @@
 				:clear-on-select="false"
 				:preserve-search="false"
 				:placeholder="categoryPH"
+				inputLabel="label"
 				:options="formattedCategories"
 				:user-select="false"
 				@input="onCategorySelected"
@@ -54,24 +55,20 @@
 				:disabled="!favorite.isUpdateable"
 				native-type="submit"
 				type="primary"
-				@click="onOkClick">
-				<template>
-					{{ t('maps', 'Save') }}
-				</template>
-			</NcButton>
-			<NcButton :disabled="!favorite.isUpdateable"
-				@click="onDeleteClick">
-				<template>
-					{{ t('maps', 'Delete') }}
-				</template>
-			</NcButton>
+				@click="onOkClick"
+				:text="t('maps', 'Save')"
+			/>
+			<NcButton 
+				:disabled="!favorite.isUpdateable"
+				@click="onDeleteClick"
+				:text="t('maps', 'Delete')"
+			/>
 		</div>
 	</div>
 </template>
 
 <script>
-import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import { NcSelect, NcButton } from '@nextcloud/vue'
 
 export default {
 	name: 'FavoriteEditionForm',
diff --git a/src/components/Map.vue b/src/components/Map.vue
index 4c461ff8a..f8e8a8e5f 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -1,159 +1,134 @@
 <template>
 	<div id="map-wrapper">
-		<LMap
-			ref="map"
-			:center="mapOptions.center"
-			:bounds="mapOptions.bounds"
-			:max-bounds="mapOptions.maxBounds"
-			:min-zoom="mapOptions.minZoom"
-			:max-zoom="mapOptions.maxZoom"
-			:zoom="mapOptions.zoom"
-			:options="mapOptions.native"
-			@ready="onMapReady"
-			@update:bounds="onUpdateBounds"
-			@baselayerchange="onBaselayerchange"
-			@click="onMapClick"
-			@contextmenu="onMapContextmenu">
-			<RoutingControl v-if="map"
-				v-show="showRouting"
-				ref="routingControl"
-				:visible="showRouting"
-				:map="map"
-				:search-data="routingSearchData"
-				@close="showRouting = false"
-				@track-added="$emit('track-added', $event)" />
-			<SearchControl v-if="map"
-				v-show="!showRouting"
-				:map="map"
-				:search-data="searchData"
-				:loading="searching"
-				:result-poi-number="searchPois.length"
-				@validate="onSearchValidate"
-				@routing-clicked="showRouting = true"
-				@clear-pois="searchPois = []" />
-			<HistoryControl v-if="map"
-				position="topright"
-				:last-actions="lastActions"
-				:last-canceled-actions="lastCanceledActions"
-				@cancel="$emit('cancel')"
-				@redo="$emit('redo')" />
-			<LControlZoom position="bottomright" />
-			<LControlScale
-				position="bottomleft"
-				:imperial="mapOptions.scaleControlShouldUseImperial"
-				:metric="!mapOptions.scaleControlShouldUseImperial" />
-			<LControlLayers
-				position="bottomright"
-				:collapsed="false" />
-			<LTileLayer
-				v-for="(l, lid) in allBaseLayers"
-				:key="lid"
-				:visible="activeLayerId === lid"
-				:url="l.url"
-				:attribution="l.attribution"
-				:name="l.name"
-				:layer-type="l.type"
-				:tile-layer-class="l.tileLayerClass"
-				:options="l.options"
-				:opacity="1" />
-			<LTileLayer
-				v-for="(l, lid) in allOverlayLayers"
-				:key="lid"
-				:visible="['Watercolor', 'ESRI'].includes(activeLayerId) && lid === 'Roads Overlay'"
-				:url="l.url"
-				:attribution="l.attribution"
-				:name="l.name"
-				:layer-type="l.type"
-				:tile-layer-class="l.tileLayerClass"
-				:options="l.options"
-				:opacity="l.opacity" />
-			<FavoritesLayer
-				v-if="map && favoritesEnabled"
-				ref="favoritesLayer"
-				:map="map"
-				:favorites="favorites"
-				:categories="favoriteCategories"
-				:draggable="favoritesDraggable"
-				@click="$emit('click-favorite', $event)"
-				@add-to-map-favorite="$emit('add-to-map-favorite', $event)"
-				@edit="$emit('edit-favorite', $event)"
-				@delete="$emit('delete-favorite', $event)"
-				@delete-multiple="$emit('delete-favorites', $event)" />
-			<PhotosLayer
-				v-if="map && photosEnabled && !photoSuggestionsHidePhotos"
-				ref="photosLayer"
-				:map="map"
-				:photos="photos"
-				:date-filter-enabled="sliderEnabled"
-				:date-filter-start="sliderStartTimestamp"
-				:date-filter-end="sliderEndTimestamp"
-				:draggable="photosDraggable"
-				@add-to-map-photo="$emit('add-to-map-photo', $event)"
-				@coords-reset="$emit('coords-reset', $event)"
-				@photo-moved="onPhotoMoved"
-				@open-sidebar="$emit('open-sidebar',$event)"
-				@cluster-loading="$emit('photo-clusters-loading',$event)"
-				@cluster-loaded="$emit('photo-clusters-loaded')" />
-			<PhotoSuggestionsLayer
-				v-if="map && photosEnabled && showPhotoSuggestions"
-				ref="photoSuggestionsLayer"
-				:map="map"
-				:photo-suggestions="photoSuggestions"
-				:photo-suggestions-tracks-and-devices="photoSuggestionsTracksAndDevices"
-				:photo-suggestions-selected-indices="photoSuggestionsSelectedIndices"
-				:date-filter-enabled="sliderEnabled"
-				:date-filter-start="sliderStartTimestamp"
-				:date-filter-end="sliderEndTimestamp"
-				:draggable="photosDraggable"
-				@photo-suggestion-moved="onPhotoSuggestionMoved"
-				@photo-suggestion-selected="$emit('photo-suggestion-selected', $event)" />
-			<ContactsLayer
-				v-if="map && contactsEnabled"
-				ref="contactsLayer"
-				:contacts="contacts"
-				:groups="contactGroups"
-				@address-deleted="$emit('address-deleted', $event)"
-				@add-to-map-contact="$emit('add-to-map-contact', $event)" />
-			<PlaceContactPopup v-if="placingContact"
-				:lat-lng="placingContactLatLng"
-				@contact-placed="onContactPlaced" />
-			<TracksLayer
-				v-if="map && tracksEnabled"
-				ref="tracksLayer"
-				:map="map"
-				:tracks="tracks"
-				:start="sliderStartTimestamp"
-				:end="sliderEndTimestamp"
-				@add-to-map-track="$emit('add-to-map-track', $event)"
-				@click="$emit('click-track', $event)"
-				@change-color="$emit('change-track-color', $event)"
-				@display-elevation="displayElevation" />
-			<DevicesLayer
-				v-if="map && devicesEnabled"
-				ref="devicesLayer"
-				:map="map"
-				:devices="devices"
-				:start="sliderStartTimestamp"
-				:end="sliderEndTimestamp"
-				@click="$emit('click-device', $event)"
-				@export="$emit('export-device', $event)"
-				@toggle-history="$emit('toggle-device-history', $event)"
-				@change-color="$emit('change-device-color', $event)"
-				@add-to-map-device="$emit('add-to-map-device', $event)" />
-			<ClickSearchPopup v-if="leftClickSearching"
-				:lat-lng="leftClickSearchLatLng"
-				:favorite-is-creatable="isFavoriteCreatable"
-				:contact-is-creatable="isContactCreatable"
-				@place-contact="onAddContactAddress"
-				@add-favorite="$emit('add-address-favorite', $event); leftClickSearching = false" />
-			<LFeatureGroup>
-				<PoiMarker v-for="poi in searchPois"
-					:key="poi.place_id"
-					:poi="poi"
+		<div ref="mapContainer" class="leaflet-map-container">
+			
+			<template v-if="isMapReady">
+				<RoutingControl
+					v-show="showRouting"
+					ref="routingControl"
+					:visible="showRouting"
+					:map="map"
+					:search-data="routingSearchData"
+					@close="showRouting = false"
+					@track-added="$emit('track-added', $event)" />
+					
+				<SearchControl
+					v-show="!showRouting"
+					:map="map"
+					:search-data="searchData"
+					:loading="searching"
+					:result-poi-number="searchPois.length"
+					@validate="onSearchValidate"
+					@routing-clicked="showRouting = true"
+					@clear-pois="searchPois = []" />
+					
+				<HistoryControl
+					:map="map"
+					position="topright"
+					:last-actions="lastActions"
+					:last-canceled-actions="lastCanceledActions"
+					@cancel="$emit('cancel')"
+					@redo="$emit('redo')" />
+					
+				<FavoritesLayer
+					v-if="favoritesEnabled"
+					ref="favoritesLayer"
+					:map="map"
+					:favorites="favorites"
+					:categories="favoriteCategories"
+					:draggable="favoritesDraggable"
+					@click="$emit('click-favorite', $event)"
+					@add-to-map-favorite="$emit('add-to-map-favorite', $event)"
+					@edit="$emit('edit-favorite', $event)"
+					@delete="$emit('delete-favorite', $event)"
+					@delete-multiple="$emit('delete-favorites', $event)" />
+					
+				<PhotosLayer
+					v-if="photosEnabled && !photoSuggestionsHidePhotos"
+					ref="photosLayer"
+					:map="map"
+					:photos="photos"
+					:date-filter-enabled="sliderEnabled"
+					:date-filter-start="sliderStartTimestamp"
+					:date-filter-end="sliderEndTimestamp"
+					:draggable="photosDraggable"
+					@add-to-map-photo="$emit('add-to-map-photo', $event)"
+					@coords-reset="$emit('coords-reset', $event)"
+					@photo-moved="onPhotoMoved"
+					@open-sidebar="$emit('open-sidebar',$event)"
+					@cluster-loading="$emit('photo-clusters-loading',$event)"
+					@cluster-loaded="$emit('photo-clusters-loaded')" />
+					
+				<PhotoSuggestionsLayer
+					v-if="photosEnabled && showPhotoSuggestions"
+					ref="photoSuggestionsLayer"
+					:map="map"
+					:photo-suggestions="photoSuggestions"
+					:photo-suggestions-tracks-and-devices="photoSuggestionsTracksAndDevices"
+					:photo-suggestions-selected-indices="photoSuggestionsSelectedIndices"
+					:date-filter-enabled="sliderEnabled"
+					:date-filter-start="sliderStartTimestamp"
+					:date-filter-end="sliderEndTimestamp"
+					:draggable="photosDraggable"
+					@photo-suggestion-moved="onPhotoSuggestionMoved"
+					@photo-suggestion-selected="$emit('photo-suggestion-selected', $event)" />
+					
+				<ContactsLayer
+					v-if="contactsEnabled"
+					:map="map"
+					ref="contactsLayer"
+					:contacts="contacts"
+					:groups="contactGroups"
+					@address-deleted="$emit('address-deleted', $event)"
+					@add-to-map-contact="$emit('add-to-map-contact', $event)" />
+					
+				<PlaceContactPopup v-if="placingContact"
+					:map="map"
+					:lat-lng="placingContactLatLng"
+					@contact-placed="onContactPlaced" />
+					
+				<TracksLayer
+					v-if="tracksEnabled"
+					ref="tracksLayer"
+					:map="map"
+					:tracks="tracks"
+					:start="sliderStartTimestamp"
+					:end="sliderEndTimestamp"
+					@add-to-map-track="$emit('add-to-map-track', $event)"
+					@click="$emit('click-track', $event)"
+					@change-color="$emit('change-track-color', $event)"
+					@display-elevation="displayElevation" />
+					
+				<DevicesLayer
+					v-if="devicesEnabled"
+					ref="devicesLayer"
+					:map="map"
+					:devices="devices"
+					:start="sliderStartTimestamp"
+					:end="sliderEndTimestamp"
+					@click="$emit('click-device', $event)"
+					@export="$emit('export-device', $event)"
+					@toggle-history="$emit('toggle-device-history', $event)"
+					@change-color="$emit('change-device-color', $event)"
+					@add-to-map-device="$emit('add-to-map-device', $event)" />
+					
+				<ClickSearchPopup v-if="leftClickSearching"
+					:map="map"
+					:lat-lng="leftClickSearchLatLng"
+					:favorite-is-creatable="isFavoriteCreatable"
+					:contact-is-creatable="isContactCreatable"
 					@place-contact="onAddContactAddress"
 					@add-favorite="$emit('add-address-favorite', $event); leftClickSearching = false" />
-			</LFeatureGroup>
-		</LMap>
+					
+				<template :key="poi.place_id" v-for="poi in searchPois">
+					<PoiMarker 
+						:poi="poi"
+						:map="map"
+						@place-contact="onAddContactAddress"
+						@add-favorite="$emit('add-address-favorite', $event); leftClickSearching = false" />
+				</template>
+			</template>
+		</div>
 		<Slider v-show="sliderEnabled"
 			:start="sliderStartTimestamp"
 			:end="sliderEndTimestamp"
@@ -178,11 +153,7 @@ import 'mapbox-gl/dist/mapbox-gl.css'
 import 'mapbox-gl-leaflet/leaflet-mapbox-gl'
 import '@maplibre/maplibre-gl-leaflet'
 import ResourceType from 'maplibre-gl'
-import {
-	baseLayersByName,
-	overlayLayersByName,
-} from '../data/mapLayers.js'
-import { LControlScale, LControlZoom, LMap, LTileLayer, LControlLayers, LFeatureGroup } from 'vue2-leaflet'
+import { baseLayersByName, overlayLayersByName } from '../data/mapLayers.js'
 
 import 'leaflet-easybutton/src/easy-button'
 import 'leaflet-easybutton/src/easy-button.css'
@@ -208,230 +179,129 @@ import ClickSearchPopup from '../components/map/ClickSearchPopup.vue'
 import optionsController from '../optionsController.js'
 import PhotoSuggestionsLayer from './map/PhotoSuggestionsLayer.vue'
 
-// exclude dynamic imports from webpack-processing
-L.Control.Elevation.include({
-	import: function(src, condition) {
-		if (Array.isArray(src)) {
-			return Promise.all(src.map(m => this.import(m)));
-		}
-		switch(src) {
-			case this.__D3:          condition = typeof d3 !== 'object'; break;
-			case this.__TOGEOJSON:   condition = typeof toGeoJSON !== 'object'; break;
-			case this.__LGEOMUTIL:   condition = typeof L.GeometryUtil !== 'object'; break;
-			case this.__LALMOSTOVER: condition = typeof L.Handler.AlmostOver  !== 'function'; break;
-			case this.__LDISTANCEM:  condition = typeof L.DistanceMarkers  !== 'function'; break;
-			case this.__LEDGESCALE:  condition = typeof L.Control.EdgeScale !== 'function'; break;
-			case this.__LHOTLINE:    condition = typeof L.Hotline  !== 'function'; break;
-		}
-		let url = (new URL(src, (src.startsWith('../') || src.startsWith('./')) ? this.options.srcFolder : undefined)).toString();
-		return condition !== false ? import(/* webpackIgnore: true */ url) : Promise.resolve();
-	}
-})
-
 export default {
 	name: 'Map',
-
 	components: {
-		LMap,
-		LControlScale,
-		LControlZoom,
-		LControlLayers,
-		LTileLayer,
-		LFeatureGroup,
-		Slider,
-		HistoryControl,
-		SearchControl,
-		RoutingControl,
-		FavoritesLayer,
-		PhotosLayer,
-		PhotoSuggestionsLayer,
-		TracksLayer,
-		DevicesLayer,
-		ContactsLayer,
-		PlaceContactPopup,
-		ClickSearchPopup,
-		PoiMarker,
+		Slider, HistoryControl, SearchControl, RoutingControl, FavoritesLayer,
+		PhotosLayer, PhotoSuggestionsLayer, TracksLayer, DevicesLayer, ContactsLayer,
+		PlaceContactPopup, ClickSearchPopup, PoiMarker,
 	},
-
 	props: {
-		activeLayerIdProp: {
-	        type: String,
-			required: true,
-		},
-		mapBoundsProp: {
-			type: Array,
-			required: true,
-		},
-		searchData: {
-			type: Array,
-			required: true,
-		},
-		routingSearchData: {
-			type: Array,
-			required: true,
-		},
-		favorites: {
-			type: Object,
-			required: true,
-		},
-		favoriteCategories: {
-			type: Object,
-			required: true,
-		},
-		favoritesEnabled: {
-			type: Boolean,
-			required: true,
-		},
-		favoritesDraggable: {
-			type: Boolean,
-			required: true,
-		},
-		photos: {
-			type: Array,
-			required: true,
-		},
-		photosEnabled: {
-			type: Boolean,
-			required: true,
-		},
-		photosDraggable: {
-			type: Boolean,
-			required: true,
-		},
-		showPhotoSuggestions: {
-			type: Boolean,
-			required: true,
-		},
-		photoSuggestions: {
-			type: Array,
-			required: true,
-		},
-		photoSuggestionsTracksAndDevices: {
-			type: Object,
-			required: true,
-		},
-		photoSuggestionsSelectedIndices: {
-			type: Array,
-			required: true,
-		},
-		photoSuggestionsHidePhotos: {
-			type: Boolean,
-			default: false,
-		},
-		contacts: {
-			type: Array,
-			required: true,
-		},
-		contactGroups: {
-			type: Object,
-			required: true,
-		},
-		contactsEnabled: {
-			type: Boolean,
-			required: true,
-		},
-		tracks: {
-			type: Array,
-			required: true,
-		},
-		tracksEnabled: {
-			type: Boolean,
-			required: true,
-		},
-		devices: {
-			type: Array,
-			required: true,
-		},
-		devicesEnabled: {
-			type: Boolean,
-			required: true,
-		},
-		sliderEnabled: {
-			type: Boolean,
-			required: true,
-		},
-		sliderStartTimestamp: {
-			type: Number,
-			required: true,
-		},
-		sliderEndTimestamp: {
-			type: Number,
-			required: true,
-		},
-		minDataTimestamp: {
-			type: Number,
-			required: true,
-		},
-		maxDataTimestamp: {
-			type: Number,
-			required: true,
-		},
-		state: {
-			type: String,
-			default: '',
-		},
-		lastActions: {
-			type: Array,
-			required: true,
-		},
-		lastCanceledActions: {
-			type: Array,
-			required: true,
-		},
+		activeLayerIdProp: { type: String, required: true },
+		mapBoundsProp: { type: Array, required: true },
+		searchData: { type: Array, required: true },
+		routingSearchData: { type: Array, required: true },
+		favorites: { type: Object, required: true },
+		favoriteCategories: { type: Object, required: true },
+		favoritesEnabled: { type: Boolean, required: true },
+		favoritesDraggable: { type: Boolean, required: true },
+		photos: { type: Array, required: true },
+		photosEnabled: { type: Boolean, required: true },
+		photosDraggable: { type: Boolean, required: true },
+		showPhotoSuggestions: { type: Boolean, required: true },
+		photoSuggestions: { type: Array, required: true },
+		photoSuggestionsTracksAndDevices: { type: Object, required: true },
+		photoSuggestionsSelectedIndices: { type: Array, required: true },
+		photoSuggestionsHidePhotos: { type: Boolean, default: false },
+		contacts: { type: Array, required: true },
+		contactGroups: { type: Object, required: true },
+		contactsEnabled: { type: Boolean, required: true },
+		tracks: { type: Array, required: true },
+		tracksEnabled: { type: Boolean, required: true },
+		devices: { type: Array, required: true },
+		devicesEnabled: { type: Boolean, required: true },
+		sliderEnabled: { type: Boolean, required: true },
+		sliderStartTimestamp: { type: Number, required: true },
+		sliderEndTimestamp: { type: Number, required: true },
+		minDataTimestamp: { type: Number, required: true },
+		maxDataTimestamp: { type: Number, required: true },
+		state: { type: String, default: '' },
+		lastActions: { type: Array, required: true },
+		lastCanceledActions: { type: Array, required: true },
 	},
-
 	data() {
 		return {
+			isMapReady: false,
 			locale: getLocale(),
 			isDarkTheme: OCA.Accessibility?.theme === 'dark',
 			optionValues: optionsController.optionValues,
-			// map
-			map: null,
 			mapOptions: {
 				center: [0, 0],
 				zoom: 2,
 				minZoom: 2,
 				maxZoom: 19,
 				bounds: L.latLngBounds(this.mapBoundsProp),
-				maxBounds: L.latLngBounds([
-					[-90, 720],
-					[90, -720],
-				]),
-				native: {
-					zoomControl: false,
-					contextmenu: false,
-					contextmenuWidth: 160,
-					contextmenuItems: this.getContextmenuItems(),
-				},
+				maxBounds: L.latLngBounds([[-90, 720], [90, -720]]),
 				scaleControlShouldUseImperial: false,
-				closePopupOnClick: false,
 			},
-			// layers
-			allBaseLayers: {},
-			allOverlayLayers: {},
 			defaultStreetLayer: 'Open Street Map',
 			defaultSatelliteLayer: 'ESRI',
 			activeLayerId: this.activeLayerIdProp,
-			layersButton: null,
-			streetButton: null,
-			satelliteButton: null,
 			showExtraLayers: false,
-			// routing
 			showRouting: false,
-			// contacts
 			placingContact: false,
 			placingContactLatLng: null,
-			// tracks
-			elevationControl: null,
-			// poi
 			searchPois: [],
 			searching: false,
-			// left click search
 			leftClickSearching: false,
 			leftClickSearchLatLng: null,
 		}
 	},
+	created() {
+		// Non-reactive Leaflet properties to prevent Vue 3 Proxy breakdown
+		this.map = null
+		this.layersControl = null
+		this.elevationControl = null
+		this.layersButton = null
+		this.streetButton = null
+		this.satelliteButton = null
+		this.leafletBaseLayers = {}
+		this.leafletOverlays = {}
+	},
+	mounted() {
+		this.map = L.map(this.$refs.mapContainer, {
+			center: this.mapOptions.center,
+			zoom: this.mapOptions.zoom,
+			minZoom: this.mapOptions.minZoom,
+			maxZoom: this.mapOptions.maxZoom,
+			maxBounds: this.mapOptions.maxBounds,
+			zoomControl: false,
+			closePopupOnClick: false,
+			contextmenu: true,
+			contextmenuWidth: 160,
+			contextmenuItems: this.getContextmenuItems(),
+		});
+
+		if (this.mapOptions.bounds) {
+			this.map.fitBounds(this.mapOptions.bounds);
+		}
+
+		L.control.zoom({ position: 'bottomright' }).addTo(this.map);
+		L.control.scale({
+			position: 'bottomleft',
+			imperial: this.mapOptions.scaleControlShouldUseImperial,
+			metric: !this.mapOptions.scaleControlShouldUseImperial
+		}).addTo(this.map);
+
+		this.map.on('moveend zoomend', () => this.onUpdateBounds(this.map.getBounds()));
+		this.map.on('baselayerchange', this.onBaselayerchange);
+		this.map.on('click', this.onMapClick);
+		this.map.on('contextmenu', this.onMapContextmenu);
+
+		this.initLocControl(this.map);
+		this.initLayers(this.map);
 
+		this.$nextTick(() => {
+			this.map.invalidateSize();
+		});
+
+		this.isMapReady = true;
+	},
+	beforeUnmount() {
+		if (this.map) {
+			this.map.remove();
+		}
+	},
 	computed: {
 		isFavoriteCreatable() {
 			const favArray = Object.values(this.favorites)
@@ -441,134 +311,49 @@ export default {
 			return this.optionValues.isCreatable
 		},
 	},
-
 	watch: {
 		state() {
-			this.$refs.map.$el.classList.remove('loading')
-			this.$refs.map.$el.classList.remove('adding')
+			if(!this.map) return;
+			const mapEl = this.$refs.mapContainer;
+			mapEl.classList.remove('loading');
+			mapEl.classList.remove('adding');
+			
 			if (this.state === 'loading') {
-				this.$refs.map.$el.classList.add('loading')
+				mapEl.classList.add('loading');
 			} else if (this.state === 'adding') {
-				this.$refs.map.$el.classList.add('adding')
+				mapEl.classList.add('adding');
 			}
 		},
-
 		activeLayerIdProp(newValue) {
-		    this.activeLayerId = newValue
+			if (this.activeLayerId !== newValue) {
+				this.activeLayerId = newValue;
+				this.updateBaseLayer();
+			}
 		},
-
 		mapBoundsProp(newValue) {
 			this.mapOptions.bounds = L.latLngBounds(newValue)
+			if (this.map) this.map.fitBounds(this.mapOptions.bounds)
 		},
 	},
-
 	methods: {
-		onMapReady(map) {
-			this.initLocControl(map)
-			this.initLayers(map)
-			this.map = map
-		},
 		fitBounds(latLng) {
-			this.map.fitBounds(latLng)
+			if(this.map) this.map.fitBounds(latLng)
 		},
 		getContextmenuItems() {
-			const iconColor = OCA.Accessibility?.theme === 'dark' ? 'ffffff' : '000000'
 			const cmi = [
-				{
-					text: t('maps', 'Add a favorite'),
-					iconCls: 'icon-favorite',
-					callback: this.contextAddFavorite,
-				},
-				{
-					text: t('maps', 'Place photos'),
-					iconCls: 'icon-category-multimedia',
-					callback: this.contextPlacePhotos,
-				},
-				{
-					text: t('maps', 'Place contact'),
-					iconCls: 'icon-group',
-					callback: this.placeContactClicked,
-				},
-				{
-					text: t('maps', 'Share this location'),
-					iconCls: 'icon-address',
-					callback: this.contextShareLocation,
-				},
+				{ text: window.t('maps', 'Add a favorite'), iconCls: 'icon-favorite', callback: this.contextAddFavorite },
+				{ text: window.t('maps', 'Place photos'), iconCls: 'icon-category-multimedia', callback: this.contextPlacePhotos },
+				{ text: window.t('maps', 'Place contact'), iconCls: 'icon-group', callback: this.placeContactClicked },
+				{ text: window.t('maps', 'Share this location'), iconCls: 'icon-address', callback: this.contextShareLocation },
 			]
-			/* Making this interactive does currently not work
-			const favArray = Object.values(this.favorites)
-			if (favArray.some((f) => (f.isUpdateable))
-				|| (favArray.length === 0 && optionsController.optionValues?.isCreatable)) {
-				cmi.push({
-					text: t('maps', 'Add a favorite'),
-					icon: generateUrl('/svg/core/actions/starred?color=' + iconColor),
-					callback: this.contextAddFavorite,
-				})
-			}
-			if (optionsController.optionValues?.isCreatable) {
-				cmi.push({
-					text: t('maps', 'Place photos'),
-					icon: generateUrl('/svg/core/places/picture?color=' + iconColor),
-					callback: this.contextPlacePhotos,
-				},
-				{
-					text: t('maps', 'Place contact'),
-					icon: generateUrl('/svg/core/actions/user?color=' + iconColor),
-					callback: this.placeContactClicked,
-				})
-			}
-			cmi.push({
-				text: t('maps', 'Share this location'),
-				icon: generateUrl('/svg/core/actions/share?color=' + iconColor),
-				callback: this.contextShareLocation,
-			}) */
-			window.OCA.Maps.mapActions.forEach((action) => {
-				cmi.push({
-					text: action.label,
-					iconCls: action.icon,
-					callback: (e) => {
-						action.callback({
-							id: 'geo:' + e.latlng.lat + ',' + e.latlng.lng,
-							name: t('maps', 'Shared location'),
-							latitude: e.latlng.lat.toString(),
-							longitude: e.latlng.lng.toString(),
-						})
-					},
+			if (window.OCA && window.OCA.Maps && window.OCA.Maps.mapActions) {
+				window.OCA.Maps.mapActions.forEach((action) => {
+					cmi.push({
+						text: action.label, iconCls: action.icon, callback: (e) => {
+							action.callback({ id: 'geo:' + e.latlng.lat + ',' + e.latlng.lng, name: window.t('maps', 'Shared location'), latitude: e.latlng.lat.toString(), longitude: e.latlng.lng.toString() })
+						}
+					})
 				})
-			})
-			if (optionsController.nbRouters > 0 || getCurrentUser()?.isAdmin) {
-				const routingItems = [
-					'-',
-					{
-						text: t('maps', 'Route from here'),
-						iconCls: 'icon-address',
-						callback: (e) => {
-							if (!this.showRouting) {
-								this.showRouting = true
-							}
-							this.$refs.routingControl.setRouteFrom(e.latlng)
-						},
-					}, {
-						text: t('maps', 'Add route point'),
-						iconCls: 'icon-add',
-						callback: (e) => {
-							if (!this.showRouting) {
-								this.showRouting = true
-							}
-							this.$refs.routingControl.addRoutePoint(e.latlng)
-						},
-					}, {
-						text: t('maps', 'Route to here'),
-						iconCls: 'icon-address',
-						callback: (e) => {
-							if (!this.showRouting) {
-								this.showRouting = true
-							}
-							this.$refs.routingControl.setRouteTo(e.latlng)
-						},
-					},
-				]
-				cmi.push(...routingItems)
 			}
 			return cmi
 		},
@@ -580,15 +365,8 @@ export default {
 			}
 		},
 		onMapNormalLeftClick(e) {
-			// layers management stuff
-			const layerSelector = document.querySelector('.leaflet-control-layers')
-			const layerSelectorWasVisible = layerSelector.style.display !== 'none'
-			layerSelector.style.display = 'none'
-			this.layersButton.button.parentElement.classList.remove('hidden')
-			this.streetButton.button.parentElement.classList.remove('hidden')
-			this.satelliteButton.button.parentElement.classList.remove('hidden')
-
-			// check if there was a popup or a spiderfied cluster
+			this.hideLayersControl();
+			
 			const thereWasAPopup = this.map.contextmenu._visible
 				|| this.placingContact
 				|| (this.map._popup !== undefined && this.map._popup !== null)
@@ -597,26 +375,37 @@ export default {
 			const hadSpider = this.$refs.favoritesLayer?.spiderfied
 				|| this.$refs.contactsLayer?.spiderfied
 				|| this.$refs.photosLayer?.spiderfied
-			if (this.$refs.favoritesLayer) {
-				this.$refs.favoritesLayer.spiderfied = false
-			}
-			if (this.$refs.contactsLayer) {
-				this.$refs.contactsLayer.spiderfied = false
-			}
-			if (this.$refs.photosLayer) {
-				this.$refs.photosLayer.spiderfied = false
-			}
+				
+			if (this.$refs.favoritesLayer) this.$refs.favoritesLayer.spiderfied = false
+			if (this.$refs.contactsLayer) this.$refs.contactsLayer.spiderfied = false
+			if (this.$refs.photosLayer) this.$refs.photosLayer.spiderfied = false
 
 			this.map.closePopup()
 			this.map.contextmenu.hide()
 			this.placingContact = false
 			this.leftClickSearching = false
-			if (!thereWasAPopup && !hadSpider && !layerSelectorWasVisible) {
+			if (!thereWasAPopup && !hadSpider) {
 				this.leftClickSearch(e.latlng.lat, e.latlng.lng)
 			}
 		},
+		hideLayersControl() {
+			if (this.layersControl) {
+				this.layersControl.getContainer().style.display = 'none';
+			}
+			if (this.layersButton) this.layersButton.button.parentElement.classList.remove('hidden')
+			if (this.streetButton) this.streetButton.button.parentElement.classList.remove('hidden')
+			if (this.satelliteButton) this.satelliteButton.button.parentElement.classList.remove('hidden')
+		},
+		showLayersControl() {
+			if (this.layersControl) {
+				this.layersControl.getContainer().style.display = 'block';
+			}
+			if (this.layersButton) this.layersButton.button.parentElement.classList.add('hidden')
+			if (this.streetButton) this.streetButton.button.parentElement.classList.add('hidden')
+			if (this.satelliteButton) this.satelliteButton.button.parentElement.classList.add('hidden')
+		},
 		onMapContextmenu(e) {
-			if (e.originalEvent.target.classList.contains('vue2leaflet-map') || e.originalEvent.target.classList.contains('mapboxgl-map')) {
+			if (e.originalEvent.target.classList.contains('leaflet-container') || e.originalEvent.target.classList.contains('mapboxgl-map')) {
 				this.map.contextmenu.showAt(L.latLng(e.latlng.lat, e.latlng.lng))
 				this.leftClickSearching = false
 			}
@@ -631,7 +420,6 @@ export default {
 			this.placingContact = true
 		},
 		initLocControl(map) {
-			// location control
 			const locControl = new LocateControl({
 				position: 'bottomright',
 				drawCircle: true,
@@ -640,7 +428,7 @@ export default {
 				icon: 'icon icon-address',
 				iconLoading: 'icon icon-loading-small',
 				strings: {
-					title: t('maps', 'Current location'),
+					title: window.t('maps', 'Current location'),
 				},
 				flyTo: true,
 				returnToPrevBounds: true,
@@ -660,205 +448,60 @@ export default {
 			}
 		},
 		initLayers(map) {
-			// tile layers
-			this.allBaseLayers = baseLayersByName
-			this.allOverlayLayers = overlayLayersByName
-
-			// detect Webgl
-			const canvas = document.createElement('canvas')
-			// let experimental = false
-			let gl
-
-			try {
-				gl = canvas.getContext('webgl')
-			} catch (x) {
-				gl = null
-			}
-
-			if (gl == null) {
-				try {
-					gl = canvas.getContext('experimental-webgl')
-					// experimental = true
-				} catch (x) { gl = null }
-			}
-
-			if ('mapboxAPIKEY' in this.optionValues && this.optionValues.mapboxAPIKEY !== '' && gl !== null) {
-				// wrapper to make tile layer component correctly pass arguments
-				L.myMapboxGL = (url, options) => {
-					return new L.MapboxGL(options)
+			const allBaseLayers = baseLayersByName;
+			const allOverlayLayers = overlayLayersByName;
+			this.leafletBaseLayers = {};
+			this.leafletOverlays = {};
+
+			const baseLayersForControl = {};
+			const overlaysForControl = {};
+
+			// Build Base Layers
+			Object.keys(allBaseLayers).forEach(key => {
+				const l = allBaseLayers[key];
+				const layer = l.tileLayerClass
+					? l.tileLayerClass(l.url, l.options)
+					: L.tileLayer(l.url, l.options);
+				
+				this.leafletBaseLayers[key] = layer;
+				baseLayersForControl[l.name] = layer;
+			});
+
+			// Safe Fallback logic for activeLayerId
+			if (!this.activeLayerId || !this.leafletBaseLayers[this.activeLayerId]) {
+				if (this.leafletBaseLayers[this.defaultStreetLayer]) {
+					this.activeLayerId = this.defaultStreetLayer;
+				} else {
+					this.activeLayerId = Object.keys(this.leafletBaseLayers)[0]; // Force fallback to the very first available option
 				}
+			}
 
-				this.defaultStreetLayer = 'Mapbox vector streets'
-				this.defaultSatelliteLayer = 'Mapbox satellite'
-
-				// add mapbox-gl tile servers
-				const attrib = '<a href="https://www.mapbox.com/about/maps/">© Mapbox</a> '
-					+ '<a href="https://www.openstreetmap.org/copyright">© OpenStreetMap</a> '
-					+ '<a href="https://www.mapbox.com/map-feedback/">' + t('maps', 'Improve this map') + '</a>'
-				const attribSat = attrib + '<a href="https://www.digitalglobe.com/">© DigitalGlobe</a>'
-
-				this.allOverlayLayers = {
-					'Mapbox traffic overlay': {
-						name: 'Traffic',
-						type: 'overlay',
-						attribution: attrib,
-						tileLayerClass: L.myMapboxGL,
-						options: {
-							id: 'Mapbox Traffic overlay',
-							accessToken: this.optionValues.mapboxAPIKEY,
-							style: generateUrl('/apps/maps/style/traffic'),
-							minZoom: 1,
-							maxZoom: 22,
-							attribution: attrib,
-							pane: 'overlayPane',
-						},
-					},
-				}
-				this.allBaseLayers = {
-					'Mapbox vector streets': {
-						name: 'Street map',
-						type: 'base',
-						attribution: attrib,
-						tileLayerClass: L.myMapboxGL,
-						options: {
-							id: 'Mapbox vector streets',
-							accessToken: this.optionValues.mapboxAPIKEY,
-							style: 'mapbox://styles/mapbox/streets-v8',
-							minZoom: 1,
-							maxZoom: 22,
-							attribution: attrib,
-						},
-					},
-					'Mapbox satellite': {
-						name: 'Satellite map',
-						type: 'base',
-						attribution: attrib,
-						tileLayerClass: L.myMapboxGL,
-						options: {
-							id: 'Mapbox satellite',
-							accessToken: this.optionValues.mapboxAPIKEY,
-							style: 'mapbox://styles/mapbox/satellite-streets-v9',
-							minZoom: 1,
-							maxZoom: 22,
-							attribution: attribSat,
-						},
-					},
-					Topographic: {
-						name: 'Topographic',
-						type: 'base',
-						attribution: attrib,
-						tileLayerClass: L.myMapboxGL,
-						options: {
-							id: 'Topographic',
-							accessToken: this.optionValues.mapboxAPIKEY,
-							style: 'mapbox://styles/mapbox/outdoors-v11',
-							minZoom: 1,
-							maxZoom: 22,
-							attribution: attrib,
-						},
-					},
-					'Mapbox dark': {
-						name: 'Dark',
-						type: 'base',
-						attribution: attrib,
-						tileLayerClass: L.myMapboxGL,
-						options: {
-							id: 'Mapbox dark',
-							accessToken: this.optionValues.mapboxAPIKEY,
-							style: 'mapbox://styles/mapbox/dark-v8',
-							minZoom: 1,
-							maxZoom: 22,
-							attribution: attrib,
-						},
-					},
-					'Mapbox traffic': {
-						name: 'Traffic',
-						type: 'base',
-						attribution: attrib,
-						tileLayerClass: L.myMapboxGL,
-						options: {
-							id: 'Mapbox traffic',
-							accessToken: this.optionValues.mapboxAPIKEY,
-							style: 'mapbox://styles/mapbox/traffic-day-v2',
-							minZoom: 1,
-							maxZoom: 22,
-							attribution: attrib,
-						},
-					},
-					'Mapbox traffic night': {
-						name: 'Traffic night',
-						type: 'base',
-						attribution: attrib,
-						tileLayerClass: L.myMapboxGL,
-						options: {
-							id: 'Mapbox traffic night',
-							accessToken: this.optionValues.mapboxAPIKEY,
-							style: 'mapbox://styles/mapbox/traffic-night-v2',
-							minZoom: 1,
-							maxZoom: 22,
-							attribution: attrib,
-						},
-					},
-					'Mapbox 3d Preview (Beta)': {
-						name: 'Mapbox 3d Preview (Beta)',
-						type: 'base',
-						attribution: attrib,
-						tileLayerClass: L.myMapboxGL,
-						options: {
-							id: '3d',
-							accessToken: this.optionValues.mapboxAPIKEY,
-							minZoom: 1,
-							maxZoom: 22,
-							pitch: 60,
-							attribution: attrib,
-						},
-					},
-					Watercolor: baseLayersByName.Watercolor,
-				}
+			// Apply the safely determined layer to the map
+			if (this.activeLayerId && this.leafletBaseLayers[this.activeLayerId]) {
+				this.leafletBaseLayers[this.activeLayerId].addTo(map);
 			}
 
-			if ((gl !== null)
-				&& ('maplibreStreetStyleURL' in this.optionValues && this.optionValues.maplibreStreetStyleURL !== '')) {
-				let token = null
-				if ('maplibreStreetStyleAuth' in this.optionValues && this.optionValues.maplibreStreetStyleAuth !== '') {
-					token = this.optionValues.maplibreStreetStyleAuth
+			// Build Overlay Layers
+			Object.keys(allOverlayLayers).forEach(key => {
+				const l = allOverlayLayers[key];
+				const layer = l.tileLayerClass
+					? l.tileLayerClass(l.url, l.options)
+					: L.tileLayer(l.url, l.options);
+				
+				layer.setOpacity(l.opacity || 1);
+				this.leafletOverlays[key] = layer;
+				overlaysForControl[l.name] = layer;
+
+				if (['Watercolor', 'ESRI'].includes(this.activeLayerId) && key === 'Roads Overlay') {
+					layer.addTo(map);
 				}
+			});
 
-				// wrapper to make tile layer component correctly pass arguments
-				L.myMaplibreGL = (url, options) => {
-					if (token !== null) {
-						token = 'Basic ' + btoa(token)
-						const oldTransform = options.transformRequest
-						options.transformRequest = (url, resourceType) => {
-							const param = oldTransform?.() || {}
-							param.url = param.url || url
-							if (resourceType === ResourceType.Tile) {
-								param.type = 'arrayBuffer'
-							}
-							param.headers = param.headers || {}
-							param.headers.Authorization = token
-							return param
-						}
-					}
-					return new L.maplibreGL(options)
-				}
-
-				this.allBaseLayers = {}
-				Object.keys(baseLayersByName).forEach(id => {
-					if (id === 'Open Street Map') {
-						const layer = Object.assign({}, baseLayersByName[id])
-						delete layer.url
-						layer.tileLayerClass = L.myMaplibreGL
-						layer.options = Object.assign({}, layer.options)
-						layer.options.style = this.optionValues.maplibreStreetStyleURL
-						layer.options.minZoom = 0
-						layer.options.maxZoom = 22
-						this.allBaseLayers[id] = layer
-					} else {
-						this.allBaseLayers[id] = baseLayersByName[id]
-					}
-				})
-			}
+			// Add the native layers control
+			this.layersControl = L.control.layers(baseLayersForControl, overlaysForControl, {
+				position: 'bottomright',
+				collapsed: false
+			}).addTo(map);
 
 			// LAYER BUTTONS
 			this.layersButton = L.easyButton({
@@ -866,101 +509,125 @@ export default {
 				states: [{
 					stateName: 'no-importa',
 					icon: '<a class="icon icon-menu" style="height: 100%"> </a>',
-					title: t('maps', 'Other maps'),
-					onClick: (btn, map) => {
-						document.querySelector('.leaflet-control-layers').style.display = 'block'
-						btn.button.parentElement.classList.add('hidden')
-						this.streetButton.button.parentElement.classList.add('hidden')
-						this.satelliteButton.button.parentElement.classList.add('hidden')
-					},
+					title: window.t('maps', 'Other maps'),
+					onClick: () => this.showLayersControl(),
 				}],
-			})
-			this.layersButton.addTo(map)
+			}).addTo(map);
 
 			this.streetButton = L.easyButton({
 				position: 'bottomright',
 				states: [{
 					stateName: 'no-importa',
 					icon: '<a class="icon icon-osm" style="height: 100%"> </a>',
-					title: t('maps', 'Street map'),
-					onClick: (btn, map) => {
-						this.activeLayerId = this.defaultStreetLayer
-						btn.button.parentElement.classList.add('behind')
-						this.satelliteButton.button.parentElement.classList.remove('behind')
+					title: window.t('maps', 'Street map'),
+					onClick: () => {
+						this.changeBaseLayer(this.defaultStreetLayer);
 					},
 				}],
-			})
-			this.streetButton.addTo(map)
+			}).addTo(map);
 
 			this.satelliteButton = L.easyButton({
 				position: 'bottomright',
 				states: [{
 					stateName: 'no-importa',
 					icon: '<a class="icon icon-esri" style="height: 100%"> </a>',
-					title: t('maps', 'Satellite map'),
-					onClick: (btn, map) => {
-						this.activeLayerId = this.defaultSatelliteLayer
-						btn.button.parentElement.classList.add('behind')
-						this.streetButton.button.parentElement.classList.remove('behind')
+					title: window.t('maps', 'Satellite map'),
+					onClick: () => {
+						this.changeBaseLayer(this.defaultSatelliteLayer);
 					},
 				}],
-			})
-			this.satelliteButton.addTo(map)
+			}).addTo(map);
 
-			this.streetButton.button.parentElement.classList.add('behind')
+			this.updateLayerButtons();
 
-			// initial selected layer, restore or fallback to default street
-			/* if (this.optionValues.tileLayer in this.allBaseLayers) {
-				this.activeLayerId = this.optionValues.tileLayer
-			} else {
+			this.$nextTick(() => {
+				this.hideLayersControl();
+			});
+		},
+		updateBaseLayer() {
+			if (!this.map) return;
+			this.changeBaseLayer(this.activeLayerId);
+		},
+		changeBaseLayer(newLayerId) {
+			// Bulletproof fallback logic for layer swaps
+			if (!newLayerId || !this.leafletBaseLayers[newLayerId]) {
+				if (this.leafletBaseLayers[this.defaultStreetLayer]) {
+					newLayerId = this.defaultStreetLayer;
+				} else {
+					newLayerId = Object.keys(this.leafletBaseLayers)[0]; // Ultimate fallback
+				}
+			}
 
-			 */
-			if (!this.activeLayerId) {
-				this.activeLayerId = this.defaultStreetLayer
+			if (!newLayerId) return; // Prevent failure if no layers exist at all
+
+			Object.keys(this.leafletBaseLayers).forEach(key => {
+				const layer = this.leafletBaseLayers[key];
+				if (this.map.hasLayer(layer)) {
+					this.map.removeLayer(layer);
+				}
+			});
+
+			this.leafletBaseLayers[newLayerId].addTo(this.map);
+			this.activeLayerId = newLayerId;
+
+			if (['Watercolor', 'ESRI'].includes(this.activeLayerId)) {
+				if (this.leafletOverlays['Roads Overlay'] && !this.map.hasLayer(this.leafletOverlays['Roads Overlay'])) {
+					this.leafletOverlays['Roads Overlay'].addTo(this.map);
+				}
+			} else {
+				if (this.leafletOverlays['Roads Overlay'] && this.map.hasLayer(this.leafletOverlays['Roads Overlay'])) {
+					this.map.removeLayer(this.leafletOverlays['Roads Overlay']);
+				}
 			}
 
-			document.querySelector('.leaflet-control-layers').style.display = 'none'
+			this.updateLayerButtons();
+			optionsController.saveOptionValues({ tileLayer: this.activeLayerId });
 		},
-		onBaselayerchange(e) {
-			this.activeLayerId = e.layer.options.id
+		updateLayerButtons() {
+			if (!this.streetButton || !this.satelliteButton) return;
 			if (this.activeLayerId === this.defaultStreetLayer) {
-				this.streetButton.button.parentElement.classList.add('behind')
-				this.satelliteButton.button.parentElement.classList.remove('behind')
+				this.streetButton.button.parentElement.classList.add('behind');
+				this.satelliteButton.button.parentElement.classList.remove('behind');
 			} else {
-				this.streetButton.button.parentElement.classList.remove('behind')
-				this.satelliteButton.button.parentElement.classList.add('behind')
+				this.streetButton.button.parentElement.classList.remove('behind');
+				this.satelliteButton.button.parentElement.classList.add('behind');
 			}
-			optionsController.saveOptionValues({ tileLayer: this.activeLayerId })
+		},
+		onBaselayerchange(e) {
+			let newLayerId = null;
+			Object.keys(this.leafletBaseLayers).forEach(key => {
+				if (this.leafletBaseLayers[key] === e.layer) {
+					newLayerId = key;
+				}
+			});
+
+			if (newLayerId) {
+				this.activeLayerId = newLayerId;
+				this.updateLayerButtons();
+				optionsController.saveOptionValues({ tileLayer: this.activeLayerId });
 
-			// take care of max zoom issue
-			if (e.layer.options.maxZoom) {
-				e.layer._map.setMaxZoom(e.layer.options.maxZoom)
+				if (e.layer && e.layer.options && e.layer.options.maxZoom) {
+					e.layer._map.setMaxZoom(e.layer.options.maxZoom);
+				}
 			}
-			// buttons/control visibility
-			document.querySelector('.leaflet-control-layers').style.display = 'none'
-			this.layersButton.button.parentElement.classList.remove('hidden')
-			this.streetButton.button.parentElement.classList.remove('hidden')
-			this.satelliteButton.button.parentElement.classList.remove('hidden')
+			this.hideLayersControl();
 		},
-		onUpdateBounds(b) {
-			const boundsStr = b.getNorth() + ';' + b.getSouth() + ';' + b.getEast() + ';' + b.getWest()
+		onUpdateBounds(bounds) {
+			const boundsStr = bounds.getNorth() + ';' + bounds.getSouth() + ';' + bounds.getEast() + ';' + bounds.getWest()
 			optionsController.saveOptionValues({ mapBounds: boundsStr })
 		},
-		// favorites
-		contextAddFavorite(e) {
-			this.$emit('add-favorite', e.latlng)
-		},
+		// context handlers
+		contextAddFavorite(e) { this.$emit('add-favorite', e.latlng) },
 		async contextShareLocation(e) {
 			const geoLink = 'geo:' + e.latlng.lat.toFixed(6) + ',' + e.latlng.lng.toFixed(6)
 			try {
 				await navigator.clipboard.writeText(geoLink)
-				showSuccess(t('maps', 'Geo link ({geoLink}) copied to clipboard', { geoLink }))
+				showSuccess(window.t('maps', 'Geo link ({geoLink}) copied to clipboard', { geoLink }))
 			} catch (error) {
 				console.debug(error)
-				showError(t('maps', 'Geo link could not be copied to clipboard'))
+				showError(window.t('maps', 'Geo link could not be copied to clipboard'))
 			}
 		},
-		// contacts
 		placeContactClicked(e) {
 			this.placingContactLatLng = L.latLng(e.latlng.lat, e.latlng.lng)
 			this.placingContact = true
@@ -969,17 +636,9 @@ export default {
 			this.placingContact = false
 			this.$emit('contact-placed', e)
 		},
-		// photos
-		contextPlacePhotos(e) {
-			this.$emit('place-photos', e.latlng)
-		},
-		onPhotoMoved(photo, latLng) {
-			this.$emit('photo-moved', photo, latLng)
-		},
-		// photo suggestions
-		onPhotoSuggestionMoved(index, latLng) {
-			this.$emit('photo-suggestion-moved', index, latLng)
-		},
+		contextPlacePhotos(e) { this.$emit('place-photos', e.latlng) },
+		onPhotoMoved(photo, latLng) { this.$emit('photo-moved', photo, latLng) },
+		onPhotoSuggestionMoved(index, latLng) { this.$emit('photo-suggestion-moved', index, latLng) },
 		zoomOnPhotoSuggestion(photo) {
 			if (photo.lat && photo.lng) {
 				const md = {
@@ -991,7 +650,6 @@ export default {
 				this.map.fitBounds(L.latLngBounds([md.s, md.w], [md.n, md.e]), { padding: [30, 30] })
 			}
 		},
-		// tracks
 		zoomOnTrack(track) {
 			if (track.metadata) {
 				const md = track.metadata
@@ -1001,8 +659,6 @@ export default {
 		clearElevationControl() {
 			if (this.elevationControl !== null) {
 				this.elevationControl.clear()
-				// this.elevationControl.remove()
-				// this.elevationControl = null
 			}
 		},
 		displayElevation(track) {
@@ -1027,9 +683,6 @@ export default {
 				autohide: false,
 				followMarker: false,
 				theme: 'steelblue-theme',
-				// slope: false,
-				// speed: true,
-				// time: true,
 				summary: 'line',
 				ruler: false,
 				srcFolder: window.location.origin.concat(window.location.pathname, 'src/components/leaflet-elevation//'),
@@ -1039,10 +692,9 @@ export default {
 			this.elevationControl = el
 			el.on('elechart_init', (e) => {
 				el._expand()
-				el._button.setAttribute('title', t('maps', 'Close'))
+				el._button.setAttribute('title', window.t('maps', 'Close'))
 			})
 		},
-		// devices
 		zoomOnDevice(device) {
 			if (device.points) {
 				const lats = device.points.map(p => p.lat)
@@ -1054,20 +706,17 @@ export default {
 				this.map.fitBounds(L.latLngBounds([latMin, lngMin], [latMax, lngMax]), { padding: [30, 30] })
 			}
 		},
-		// search
 		onSearchValidate(element) {
 			if (['contact', 'favorite'].includes(element.type)) {
 				this.map.setView(element.latLng, 15)
 			} else if (element.type === 'device') {
 				if (!element.device.enabled) {
-					// zooming is done by parent component
 					this.$emit('search-enable-device', element.device)
 				} else {
 					this.zoomOnDevice(element.device)
 				}
 			} else if (element.type === 'track') {
 				if (!element.track.enabled) {
-					// zooming is done by parent component
 					this.$emit('search-enable-track', element.track)
 				} else {
 					this.zoomOnTrack(element.track)
@@ -1117,10 +766,11 @@ export default {
 	width: 100%;
 }
 
-.leaflet-container {
+.leaflet-map-container {
 	position: relative;
 	height: 100%;
 	width: 100%;
+	z-index: 1; /* Essential for placing Vue popups correctly over map */
 }
 
 ::v-deep .leaflet-control-locate {
@@ -1368,4 +1018,4 @@ export default {
 ::v-deep .leaflet-control-layers-separator {
 	border-color: var(--color-border) !important;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/MapContainer.vue b/src/components/MapContainer.vue
index 64eae1833..951c12bd5 100644
--- a/src/components/MapContainer.vue
+++ b/src/components/MapContainer.vue
@@ -21,79 +21,36 @@
 
 <template>
 	<div class="map-container">
-		<LMap
-			ref="map"
-			:center="mapOptions.center"
-			:max-bounds="mapOptions.maxBounds"
-			:min-zoom="mapOptions.minZoom"
-			:max-zoom="mapOptions.maxZoom"
-			:zoom="mapOptions.zoom"
-			:options="mapOptions.native"
-			@ready="onMapReady">
-			<LControlZoom position="bottomright" />
-			<LControlScale
-				position="bottomleft"
-				:imperial="mapOptions.scaleControlShouldUseImperial"
-				:metric="!mapOptions.scaleControlShouldUseImperial" />
-
-			<LTileLayer
-				:key="activeLayer.id"
-				:url="activeLayer.url"
-				:attribution="activeLayer.attribution"
-				:name="activeLayer.name"
-				:layer-type="activeLayer.type"
-				:options="activeLayer.options"
-				:opacity="activeLayer.type === 'overlay' ? activeLayer.opacity : 1" />
-
-			<LMarkerCluster
-				v-for="categoryKey in Object.keys(favoriteCategories)"
-				:key="categoryKey"
-				:options="{
-					...clusterOptions,
-					iconCreateFunction: getClusterIconCreateFunction(categoryKey)
-				}">
-				<LMarker
-					v-for="favorite in favoriteCategories[categoryKey]"
-					:key="favorite.id"
-					:lat-lng="{lat:favorite.lat, lng: favorite.lng}"
-					:icon="createNewDivIcon(categoryKey)"
-					@popupopen="storeCurrentlyOpenPopup(favorite.id)"
-					@popupclose="forgetCurrentlyOpenPopup(favorite.id)"
-					@ready="marker => storeMarkerReference(favorite.id, marker, favoriteCategories[categoryKey].length)">
-					<LPopup>
-						<FavoritePopup
-							:favorite="favorite"
-							:is-visible="openMarkerPopupId === favorite.id"
-							:allow-category-customization="!isPublicShare"
-							:allow-edits="allowFavoriteEdits"
-							@delete-favorite="emitDeleteFavoriteEvent"
-							@update-favorite="emitUpdateFavoriteEvent" />
-					</LPopup>
-				</LMarker>
-			</LMarkerCluster>
-
-			<LFeatureGroup @ready="onFeatureGroupReady">
-				<LPopup :lat-lng="placePopup.latLng">
-					<ClickPopup
-						:is-visible="placePopup.visible"
-						:lat-lng="placePopup.latLng"
-						:allow-category-customization="!isPublicShare"
-						:allow-edits="allowFavoriteEdits"
-						@close="closePopup"
-						@add-favorite="emitAddFavoriteEvent" />
-				</LPopup>
-			</LFeatureGroup>
-		</LMap>
+		<div ref="mapContainer" style="width: 100%; height: 100%;"></div>
+
+		<div style="display: none;">
+			<div ref="favPopupWrapper">
+				<FavoritePopup v-if="popupFavorite"
+					:favorite="popupFavorite"
+					:is-visible="!!openMarkerPopupId"
+					:allow-category-customization="!isPublicShare"
+					:allow-edits="allowFavoriteEdits"
+					@delete-favorite="emitDeleteFavoriteEvent"
+					@update-favorite="emitUpdateFavoriteEvent" />
+			</div>
+			
+			<div ref="clickPopupWrapper">
+				<ClickPopup
+					:is-visible="placePopup.visible"
+					:lat-lng="placePopup.latLng"
+					:allow-category-customization="!isPublicShare"
+					:allow-edits="allowFavoriteEdits"
+					@close="closePopup"
+					@add-favorite="emitAddFavoriteEvent" />
+			</div>
+		</div>
 	</div>
 </template>
 
 <script>
-import { DivIcon, latLngBounds } from 'leaflet'
+import L from 'leaflet'
+import 'leaflet.markercluster'
 import VueTypes from 'vue-types'
-
-import { LControlScale, LControlZoom, LFeatureGroup, LMap, LMarker, LPopup, LTileLayer } from 'vue2-leaflet'
-import LMarkerCluster from 'vue2-leaflet-markercluster'
-
 import { mapActions, mapState } from 'vuex'
 import ClickPopup from './map/ClickPopup.vue'
 import FavoritePopup from './map/FavoritePopup.vue'
@@ -111,15 +68,7 @@ export default {
 
 	components: {
 		ClickPopup,
-		LMap,
-		LFeatureGroup,
-		LMarker,
-		LMarkerCluster,
-		LTileLayer,
-		LPopup,
 		FavoritePopup,
-		LControlZoom,
-		LControlScale,
 	},
 
 	props: {
@@ -132,6 +81,7 @@ export default {
 		return {
 			activeLayerId: LayerIds.OSM,
 			openMarkerPopupId: null,
+			popupFavorite: null, // Holds data for the active popup
 			placePopup: {
 				visible: false,
 				latLng: { lat: 0, lng: 0 },
@@ -141,25 +91,8 @@ export default {
 				zoom: 2,
 				minZoom: 2,
 				maxZoom: 19,
-				initialBounds: latLngBounds([
-					[40.70081290280357, -74.26963806152345],
-					[40.82991732677597, -74.08716201782228],
-				]),
-				maxBounds: latLngBounds([
-					[-90, 720],
-					[90, -720],
-				]),
-				native: {
-					zoomControl: false,
-				},
 				scaleControlShouldUseImperial: getShouldMapUseImperial(),
 			},
-			clusterOptions: {
-				showCoverageOnHover: false,
-				zoomToBoundsOnClick: true,
-				spiderfyOnMaxZoom: false,
-				disableClusteringAtZoom: CLUSTER_MAX_ZOOM_LEVEL,
-			},
 		}
 	},
 
@@ -169,52 +102,78 @@ export default {
 				isPublicShare()
 					? state[PUBLIC_FAVORITES_NAMESPACE].selectedFavoriteId
 					: null,
-			selectedFavorite: state =>
-				isPublicShare()
-					? state[PUBLIC_FAVORITES_NAMESPACE].favorites.find(
-						favorite =>
-							favorite.id
-							=== state[PUBLIC_FAVORITES_NAMESPACE].selectedFavoriteId,
-					)
-					: null,
 		}),
-		layers() {
-			return Layers
-		},
-		activeLayer() {
-			return this.layers.find(layer => layer.id === this.activeLayerId)
-		},
+		layers() { return Layers },
+		activeLayer() { return this.layers.find(layer => layer.id === this.activeLayerId) },
 	},
 
 	watch: {
 		selectedFavoriteId(val) {
-			if (val !== null) {
-				const marker = this.markerMap[val]
-
-				if (marker) {
-					this.setMapView(marker.getLatLng(), CLUSTER_MAX_ZOOM_LEVEL)
-					marker.openPopup()
-				} else {
-					console.warn(
-						'[MapContainer] Cannot find marker for favorite id: ',
-						val,
-					)
-				}
+			if (val !== null && this.markerMap.has(val)) {
+				const marker = this.markerMap.get(val);
+				this.map.setView(marker.getLatLng(), CLUSTER_MAX_ZOOM_LEVEL);
+				
+				// Set dynamic popup data before opening
+				this.popupFavorite = marker.data;
+				this.openMarkerPopupId = val;
+				
+				// Bind the Vue rendered HTML and open
+				marker.bindPopup(this.$refs.favPopupWrapper).openPopup();
 			}
 		},
+		favoriteCategories: {
+			handler: 'renderMarkers',
+			deep: true
+		}
 	},
 
 	created() {
-		this.featureGroup = null
-		this.mapClickPopupLocked = false
-		this.markerMap = []
-		this.markerCounter = 0
-		// dummy values to replace with min and max values taking from favorites
-		// see storeMarkerReference below
-		this.minLat = 90
-		this.maxLat = -90
-		this.minLng = 720
-		this.maxLng = -720
+		// Non-reactive Leaflet instances
+		this.map = null;
+		this.clusterGroup = null;
+		this.markerMap = new Map();
+		this.mapClickPopupLocked = false;
+	},
+
+	mounted() {
+		this.map = L.map(this.$refs.mapContainer, {
+			center: this.mapOptions.center,
+			zoom: this.mapOptions.zoom,
+			minZoom: this.mapOptions.minZoom,
+			maxZoom: this.mapOptions.maxZoom,
+			zoomControl: false,
+		});
+
+		L.control.zoom({ position: 'bottomright' }).addTo(this.map);
+		L.control.scale({
+			position: 'bottomleft',
+			imperial: this.mapOptions.scaleControlShouldUseImperial,
+			metric: !this.mapOptions.scaleControlShouldUseImperial
+		}).addTo(this.map);
+
+		L.tileLayer(this.activeLayer.url, {
+			attribution: this.activeLayer.attribution,
+			...this.activeLayer.options
+		}).addTo(this.map);
+
+		this.clusterGroup = L.markerClusterGroup({
+			showCoverageOnHover: false,
+			zoomToBoundsOnClick: true,
+			spiderfyOnMaxZoom: false,
+			disableClusteringAtZoom: CLUSTER_MAX_ZOOM_LEVEL,
+		});
+		this.map.addLayer(this.clusterGroup);
+
+		this.map.on('click', this.handleMapClick);
+		this.map.on('popupclose', this.handlePopupCloseEvent);
+
+		this.renderMarkers();
+	},
+
+	beforeUnmount() {
+		if (this.map) {
+			this.map.remove();
+		}
 	},
 
 	methods: {
@@ -222,88 +181,95 @@ export default {
 			selectFavorite: `${PUBLIC_FAVORITES_NAMESPACE}/selectFavorite`,
 		}),
 
-		setMapView(latLng, zoom) {
-			this.$refs.map.mapObject.setView(latLng, zoom)
-		},
-
-		storeMarkerReference(favoriteId, marker, favcount) {
-			this.markerCounter++
-			if (marker.getLatLng().lat < this.minLat) {
-				this.minLat = marker.getLatLng().lat
-			}
-			if (marker.getLatLng().lat > this.maxLat) {
-				this.maxLat = marker.getLatLng().lat
-			}
-			if (marker.getLatLng().lng < this.minLng) {
-				this.minLng = marker.getLatLng().lng
-			}
-			if (marker.getLatLng().lng > this.maxLng) {
-				this.maxLng = marker.getLatLng().lng
-			}
-			this.markerMap[favoriteId] = marker
-			// after getting latlng values from last favorite we can now fit map to max bounds taken from favorites:
-			if (this.markerCounter >= favcount) {
-				this.$refs.map.fitBounds([[this.minLat, this.minLng], [this.maxLat, this.maxLng]], { padding: [30, 30] })
+		renderMarkers() {
+			this.clusterGroup.clearLayers();
+			this.markerMap.clear();
+
+			const markers = [];
+
+			Object.keys(this.favoriteCategories).forEach(categoryKey => {
+				const favorites = this.favoriteCategories[categoryKey];
+				
+				// Apply custom icon creation function for this category
+				this.clusterGroup.options.iconCreateFunction = this.getClusterIconCreateFunction(categoryKey);
+
+				favorites.forEach(favorite => {
+					const marker = L.marker([favorite.lat, favorite.lng], {
+						icon: this.createNewDivIcon(categoryKey)
+					});
+
+					marker.data = favorite;
+					
+					// Setup popup binding on click
+					marker.on('click', () => {
+						this.popupFavorite = favorite;
+						this.openMarkerPopupId = favorite.id;
+						marker.bindPopup(this.$refs.favPopupWrapper).openPopup();
+					});
+
+					this.markerMap.set(favorite.id, marker);
+					markers.push(marker);
+				});
+			});
+
+			this.clusterGroup.addLayers(markers);
+
+			// Automatically fit bounds to markers if we have any
+			if (markers.length > 0) {
+				this.map.fitBounds(this.clusterGroup.getBounds(), { padding: [30, 30] });
 			}
 		},
 
-		emitAddFavoriteEvent(data) {
-			this.$emit('add-favorite', data)
-		},
-
-		emitUpdateFavoriteEvent(data) {
-			this.$emit('update-favorite', data)
-		},
-
-		emitDeleteFavoriteEvent(data) {
-			this.$emit('delete-favorite', data)
-		},
-
-		storeCurrentlyOpenPopup(id) {
-			this.openMarkerPopupId = id
-		},
-
-		forgetCurrentlyOpenPopup() {
-			this.mapClickPopupLocked = true
-
-			this.openMarkerPopupId = null
-
-			this.$nextTick(() => {
-				this.mapClickPopupLocked = false
-			})
-
-			this.selectFavorite(null)
+		emitAddFavoriteEvent(data) { this.$emit('add-favorite', data) },
+		emitUpdateFavoriteEvent(data) { this.$emit('update-favorite', data) },
+		emitDeleteFavoriteEvent(data) { 
+			this.$emit('delete-favorite', data);
+			this.map.closePopup();
 		},
 
 		openPopup(lat, lng) {
-			this.placePopup.visible = true
-			this.placePopup.latLng = { lat, lng }
-			this.featureGroup.openPopup([lat, lng])
+			this.placePopup.visible = true;
+			this.placePopup.latLng = { lat, lng };
+			
+			L.popup()
+				.setLatLng([lat, lng])
+				.setContent(this.$refs.clickPopupWrapper)
+				.openOn(this.map);
 		},
 
 		closePopup() {
-			this.resetPopupState()
-			this.featureGroup.closePopup()
+			this.resetPopupState();
+			this.map.closePopup();
 		},
 
 		resetPopupState() {
-			this.placePopup.visible = false
-			this.placePopup.latLng = { lat: 0, lng: 0 }
+			this.placePopup.visible = false;
+			this.placePopup.latLng = { lat: 0, lng: 0 };
 		},
 
 		handleMapClick(e) {
 			if (!this.placePopup.visible && !this.mapClickPopupLocked) {
-				this.openPopup(e.latlng.lat, e.latlng.lng)
+				this.openPopup(e.latlng.lat, e.latlng.lng);
 			}
 		},
 
+		handlePopupCloseEvent() {
+			this.mapClickPopupLocked = true;
+			this.resetPopupState();
+			this.openMarkerPopupId = null;
+			this.selectFavorite(null);
+
+			this.$nextTick(() => {
+				this.mapClickPopupLocked = false;
+			});
+		},
+
 		createNewDivIcon(categoryKey) {
-			return new DivIcon({
+			return new L.DivIcon({
 				iconAnchor: [MARKER_TOUCH_TARGET_SIZE * 0.5, MARKER_TOUCH_TARGET_SIZE * 0.5],
 				iconSize: [MARKER_TOUCH_TARGET_SIZE, MARKER_TOUCH_TARGET_SIZE],
 				className: 'leaflet-marker-favorite',
-				html: `<div class="favorite-marker ${categoryKey}"`
-					+ ` style="background-color: ${this.getMarkerBackgroundColor(categoryKey)};"></div>`,
+				html: `<div class="favorite-marker ${categoryKey}" style="background-color: ${this.getMarkerBackgroundColor(categoryKey)};"></div>`,
 			})
 		},
 
@@ -314,40 +280,14 @@ export default {
 		getClusterIconCreateFunction(categoryKey) {
 			return cluster => {
 				const label = cluster.getChildCount()
-
-				return new DivIcon({
+				return new L.DivIcon({
 					iconAnchor: [MARKER_TOUCH_TARGET_SIZE * 0.5, MARKER_TOUCH_TARGET_SIZE * 0.5],
 					iconSize: [MARKER_TOUCH_TARGET_SIZE, MARKER_TOUCH_TARGET_SIZE],
 					className: 'leaflet-marker-favorite-cluster cluster-marker',
-					html: '<div '
-						+ `class="favorite-cluster-marker ${categoryKey}" `
-						+ `style="background-color: ${this.getMarkerBackgroundColor(categoryKey)};">`
-						+ `</div><span class="label">${label}</span>`,
+					html: `<div class="favorite-cluster-marker ${categoryKey}" style="background-color: ${this.getMarkerBackgroundColor(categoryKey)};"></div><span class="label">${label}</span>`,
 				})
 			}
 		},
-
-		handlePopupOpenEvent() {},
-
-		handlePopupCloseEvent() {
-			this.mapClickPopupLocked = true
-			this.resetPopupState()
-
-			this.$nextTick(() => {
-				this.mapClickPopupLocked = false
-			})
-		},
-
-		onMapReady(map) {
-			map.on('click', this.handleMapClick)
-		},
-
-		onFeatureGroupReady(featureGroup) {
-			featureGroup.on('popupopen', this.handlePopupOpenEvent)
-			featureGroup.on('popupclose', this.handlePopupCloseEvent)
-
-			this.featureGroup = featureGroup
-		},
 	},
 }
 </script>
@@ -357,110 +297,44 @@ export default {
 @import '~leaflet.markercluster/dist/MarkerCluster.css';
 @import '~leaflet.markercluster/dist/MarkerCluster.Default.css';
 
-.leaflet-tooltip {
-	white-space: normal !important;
-}
-
-.leaflet-container {
-	background: var(--color-main-background);
-}
-
-.leaflet-control-layers-base {
-	line-height: 30px;
-}
-
-.leaflet-control-layers-selector {
-	min-height: 0;
-}
-
-.leaflet-control-layers-toggle {
-	background-size: 75% !important;
-}
-
-.leaflet-control-layers:not(.leaflet-control-layers-expanded) {
-	width: 33px;
-	height: 37px;
-}
-
-.leaflet-control-layers:not(.leaflet-control-layers-expanded) > a {
-	width: 100%;
-	height: 100%;
-}
-
+.leaflet-tooltip { white-space: normal !important; }
+.leaflet-container { background: var(--color-main-background); }
 .leaflet-marker-favorite, .leaflet-marker-favorite-cluster {
 	display: flex;
 	align-items: center;
 	justify-content: center;
 	border-radius: 50%;
-
-	.favorite-marker,
-	.favorite-cluster-marker {
-		cursor: pointer;
-		background: var(--maps-icon-favorite-star) no-repeat 50% 50%;
-		border-radius: 50%;
-		box-shadow: 0 0 4px #888;
-	}
-
-	.favorite-marker {
-		height: 18px;
-		width: 18px;
-		background-size: 12px 12px;
-	}
-
-	.favorite-cluster-marker {
-		height: 26px;
-		width: 26px;
-		background-size: 16px 16px;
-	}
 }
-
-.leaflet-marker-favorite-cluster {
-	.label {
-		position: absolute;
-		top: 0;
-		right: 0;
-		color: #fff;
-		background-color: #333;
-		border-radius: 9px;
-		height: 18px;
-		min-width: 18px;
-		line-height: 12px;
-		text-align: center;
-		padding: 3px;
-	}
+.leaflet-marker-favorite .favorite-marker,
+.leaflet-marker-favorite-cluster .favorite-cluster-marker {
+	cursor: pointer;
+	background: var(--maps-icon-favorite-star) no-repeat 50% 50%;
+	border-radius: 50%;
+	box-shadow: 0 0 4px #888;
 }
-
-.leaflet-touch {
-	.leaflet-control-layers,
-	.leaflet-bar {
-		border: none;
-		border-radius: var(--border-radius);
-	}
+.leaflet-marker-favorite .favorite-marker {
+	height: 18px;
+	width: 18px;
+	background-size: 12px 12px;
 }
-
-.leaflet-control-attribution.leaflet-control {
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	max-width: 50vw;
+.leaflet-marker-favorite-cluster .favorite-cluster-marker {
+	height: 26px;
+	width: 26px;
+	background-size: 16px 16px;
 }
-
-.leaflet-popup {
-	.leaflet-popup-content-wrapper {
-		border-radius: 4px;
-	}
-
-	.leaflet-popup-close-button {
-		top: 9px;
-		right: 9px;
-	}
-}
-</style>
-
-<style lang="scss" scoped>
-.map-container {
-	position: relative;
-	height: 100%;
-	width: 100%;
+.leaflet-marker-favorite-cluster .label {
+	position: absolute;
+	top: 0;
+	right: 0;
+	color: #fff;
+	background-color: #333;
+	border-radius: 9px;
+	height: 18px;
+	min-width: 18px;
+	line-height: 12px;
+	text-align: center;
+	padding: 3px;
 }
-</style>
+.leaflet-popup .leaflet-popup-content-wrapper { border-radius: 4px; }
+.leaflet-popup .leaflet-popup-close-button { top: 9px; right: 9px; }
+</style>
\ No newline at end of file
diff --git a/src/components/MapsNavigation.vue b/src/components/MapsNavigation.vue
index f753fea21..39558e364 100644
--- a/src/components/MapsNavigation.vue
+++ b/src/components/MapsNavigation.vue
@@ -1,101 +1,154 @@
 <template>
-	<NcAppNavigation>
-		<template slot="list">
+	<NcAppNavigation aria-label="maps-app-navigation">
+		<template #list>
 			<h2 v-if="loading"
 				class="icon-loading-small loading-icon" />
 			<slot name="items" />
 		</template>
-		<template slot="footer">
+		<template #footer>
 			<NcAppNavigationSettings>
-				<NcActionCheckbox
-					:checked="optionValues.trackMe === 'true'"
-					@change="onTrackMeClick">
-					{{ t('maps', 'Track my position') }}
-				</NcActionCheckbox>
-				<NcActionCheckbox
-					:checked="false"
-					@change="onGeoLinkClick">
-					{{ t('maps', 'Open geo links') }}
-				</NcActionCheckbox>
-				<NcActionCheckbox
-					:checked="optionValues.displaySlider === 'true'"
-					@change="onDisplaySliderClick">
-					{{ t('maps', 'Display time filter slider') }}
-				</NcActionCheckbox>
-				<NcActionText>
-					{{ trueSizeText }}
-				</NcActionText>
-				<NcActionLink href="http://kai.sub.blue/en/africa.html"
-					target="_blank"
-					icon="icon-external">
-					{{ t('maps', 'The True Size of Africa') }}
-				</NcActionLink>
+				<div class="maps-settings">
+					<NcCheckboxRadioSwitch
+						:checked="optionValues.trackMe === 'true'"
+						@update:checked="onTrackMeChange">
+						{{ window.t('maps', 'Track my position') }}
+					</NcCheckboxRadioSwitch>
+					
+					<NcCheckboxRadioSwitch
+						:checked="false"
+						@update:checked="onGeoLinkChange">
+						{{ window.t('maps', 'Open geo links') }}
+					</NcCheckboxRadioSwitch>
+					
+					<NcCheckboxRadioSwitch
+						:checked="optionValues.displaySlider === 'true'"
+						@update:checked="onDisplaySliderChange">
+						{{ window.t('maps', 'Display time filter slider') }}
+					</NcCheckboxRadioSwitch>
+					
+					<p class="maps-settings-text">
+						{{ trueSizeText }}
+					</p>
+					
+					<a href="http://kai.sub.blue/en/africa.html"
+						target="_blank"
+						rel="noreferrer noopener"
+						class="maps-settings-link">
+						<span class="icon-external"></span>
+						{{ window.t('maps', 'The True Size of Africa') }}
+					</a>
+				</div>
 			</NcAppNavigationSettings>
 		</template>
 	</NcAppNavigation>
 </template>
 
 <script>
-import ClickOutside from 'vue-click-outside'
-
-import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
-import NcAppNavigationSettings from '@nextcloud/vue/dist/Components/NcAppNavigationSettings.js'
-import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js'
-import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
-
+import { NcAppNavigation, NcAppNavigationSettings, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import optionsController from '../optionsController.js'
 
+// Native Vue 3 Click-Outside directive
+const clickOutside = {
+	beforeMount(el, binding) {
+		el.clickOutsideEvent = (event) => {
+			if (!(el === event.target || el.contains(event.target))) {
+				binding.value(event);
+			}
+		};
+		document.body.addEventListener('click', el.clickOutsideEvent);
+	},
+	unmounted(el) {
+		document.body.removeEventListener('click', el.clickOutsideEvent);
+	},
+};
+
 export default {
 	name: 'MapsNavigation',
+	
 	components: {
 		NcAppNavigation,
 		NcAppNavigationSettings,
-		NcActionCheckbox,
-		NcActionText,
-		NcActionLink,
+		NcCheckboxRadioSwitch,
 	},
+	
 	directives: {
-		ClickOutside,
+		clickOutside,
 	},
+	
 	props: {
 		loading: {
 			type: Boolean,
 			default: false,
 		},
 	},
+	
 	data() {
 		return {
 			optionValues: optionsController.optionValues,
-			trueSizeText: t('maps', 'Keep in mind that map projections always distort sizes of countries. The standard Mercator projection is particularly biased. Read more at:'),
+			// Make window available to template
+			window: window,
 		}
 	},
+	
 	computed: {
+		trueSizeText() {
+			return window.t('maps', 'Keep in mind that map projections always distort sizes of countries. The standard Mercator projection is particularly biased. Read more at:')
+		}
 	},
-	beforeMount() {
-	},
+	
 	methods: {
-		onTrackMeClick(e) {
-			this.optionValues.trackMe = e.target.checked
-			optionsController.saveOptionValues({ trackMe: e.target.checked ? 'true' : 'false' })
-			this.$emit('toggle-trackme', e.target.checked)
+		onTrackMeChange(checked) {
+			this.optionValues.trackMe = checked ? 'true' : 'false'
+			optionsController.saveOptionValues({ trackMe: checked ? 'true' : 'false' })
+			this.$emit('toggle-trackme', checked)
 		},
-		onGeoLinkClick(e) {
-			this.$emit('toggle-geo-link', e.target.checked)
+		onGeoLinkChange(checked) {
+			this.$emit('toggle-geo-link', checked)
 		},
-		onDisplaySliderClick(e) {
-			this.optionValues.displaySlider = e.target.checked
-			optionsController.saveOptionValues({ displaySlider: e.target.checked ? 'true' : 'false' })
-			this.$emit('toggle-slider', e.target.checked)
+		onDisplaySliderChange(checked) {
+			this.optionValues.displaySlider = checked ? 'true' : 'false'
+			optionsController.saveOptionValues({ displaySlider: checked ? 'true' : 'false' })
+			this.$emit('toggle-slider', checked)
 		},
 	},
 }
 </script>
+
 <style scoped lang="scss">
 .loading-icon {
 	margin-top: 16px;
 }
 
+.maps-settings {
+	padding: 12px;
+	display: flex;
+	flex-direction: column;
+	gap: 12px;
+}
+
+.maps-settings-text {
+	color: var(--color-text-maxcontrast);
+	line-height: 1.4;
+	margin-top: 8px;
+}
+
+.maps-settings-link {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	color: var(--color-text-maxcontrast);
+	text-decoration: none;
+
+	&:hover, &:focus {
+		color: var(--color-primary-element);
+		text-decoration: underline;
+	}
+
+	.icon-external {
+		opacity: 0.7;
+	}
+}
+
 ::v-deep #app-settings-content {
 	list-style: none;
 }
@@ -105,4 +158,4 @@ export default {
 	z-index: 100000;
 	border-radius: var(--border-radius-pill);
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/PublicFavoriteShareSideBar.vue b/src/components/PublicFavoriteShareSideBar.vue
index 1ef26be62..3791c9595 100644
--- a/src/components/PublicFavoriteShareSideBar.vue
+++ b/src/components/PublicFavoriteShareSideBar.vue
@@ -20,7 +20,7 @@
 -->
 
 <template>
-	<NcAppNavigation>
+	<NcAppNavigation aria-label="public-favorite-sidebar">
 		<ul v-if="favorites.length">
 			<NcAppNavigationNew
 				v-if="allowFavoriteEdits"
@@ -42,10 +42,7 @@
 </template>
 
 <script>
-import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew.js'
-import NcAppNavigationSpacer from '@nextcloud/vue/dist/Components/NcAppNavigationSpacer.js'
+import { NcAppNavigation, NcAppNavigationItem, NcAppNavigationNew, NcAppNavigationSpacer } from '@nextcloud/vue'
 import { mapMutations, mapState, mapActions } from 'vuex'
 import { PUBLIC_FAVORITES_NAMESPACE } from '../store/modules/publicFavorites.js'
 import MapMode from '../data/enum/MapMode.js'
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 6d0a8f373..67e7b003f 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -83,9 +83,7 @@
 </template>
 
 <script>
-import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+import { NcAppSidebar, NcActionButton, NcEmptyContent } from '@nextcloud/vue'
 import { emit } from '@nextcloud/event-bus'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
@@ -123,6 +121,10 @@ export default {
 			type: Boolean,
 			required: true,
 		},
+		activeTab: {
+			type: String,
+			default: null
+		},
 		favorite: {
 			validator: prop => typeof prop === 'object' || prop === null,
 			required: true,
@@ -217,15 +219,6 @@ export default {
 			return OC.linkToRemote(`dav/files/${user}${encodePath(this.file)}`)
 		},
 
-		/**
-		 * Current active tab handler
-		 *
-		 * @return {string} the current active tab
-		 */
-		activeTab() {
-			return this.Sidebar.activeTab
-		},
-
 		/**
 		 * Sidebar subname
 		 *
@@ -335,18 +328,24 @@ export default {
 		},
 
 		/**
-		 * Default action object for the current file
+		 * Default action for the current file
 		 *
-		 * @return {object}
+		 * @return {Function|null}
 		 */
 		defaultAction() {
-			return this.fileInfo
-				&& OCA.Files && OCA.Files.App && OCA.Files.App.fileList
-				&& OCA.Files.App.fileList.fileActions
-				&& OCA.Files.App.fileList.fileActions.getDefaultFileAction
-				&& OCA.Files.App.fileList
-					.fileActions.getDefaultFileAction(this.fileInfo.mimetype, this.fileInfo.type, OC.PERMISSION_READ)
+			if (!this.fileInfo) {
+				return null
+			}
+
+			const fileList = window.OCA?.Files?.App?.fileList
+
+			if (!fileList) {
+				return null
+			}
 
+			return () => {
+				fileList.openFile?.(this.fileInfo.name)
+			}
 		},
 
 		/**
@@ -437,49 +436,54 @@ export default {
 
 		/**
 		 * Toggle favourite state
-		 * TODO: better implementation
+		 * TODO: better implementation 
 		 *
 		 * @param {boolean} state favourited or not
 		 */
 		async toggleStarred(state) {
 			try {
 				this.starLoading = true
+
 				await axios({
 					method: 'PROPPATCH',
 					url: this.davPath,
+					headers: {
+						'Content-Type': 'application/xml; charset=utf-8',
+					},
 					data: `<?xml version="1.0"?>
 						<d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">
-						${state ? '<d:set>' : '<d:remove>'}
-							<d:prop>
-								<oc:favorite>1</oc:favorite>
-							</d:prop>
-						${state ? '</d:set>' : '</d:remove>'}
+							${state ? '<d:set>' : '<d:remove>'}
+								<d:prop>
+									<oc:favorite>${state ? '1' : ''}</oc:favorite>
+								</d:prop>
+							${state ? '</d:set>' : '</d:remove>'}
 						</d:propertyupdate>`,
 				})
 
-				// TODO: Obliterate as soon as possible and use events with new files app
-				// Terrible fallback for legacy files: toggle filelist as well
-				if (OCA.Files && OCA.Files.App && OCA.Files.App.fileList && OCA.Files.App.fileList.fileActions) {
-					OCA.Files.App.fileList.fileActions.triggerAction('Favorite', OCA.Files.App.fileList.getModelForFile(this.fileInfo.name), OCA.Files.App.fileList)
-				}
+				window.OCA?.Files?.App?.fileList?.reload?.()
 
 			} catch (error) {
 				showError(t('files', 'Unable to change the favourite state of the file'))
 				console.error('Unable to change favourite state', error)
+			} finally {
+				this.starLoading = false
 			}
-			this.starLoading = false
 		},
 
 		onDefaultAction() {
-			if (this.defaultAction) {
-				// generate fake context
-				this.defaultAction.action(this.fileInfo.name, {
-					fileInfo: this.fileInfo,
-					dir: this.fileInfo.dir,
-					fileList: OCA.Files.App.fileList,
-					// Fixme if defaultAction is needed
-					$file: '',
-				})
+			if (!this.defaultAction) {
+				return
+			}
+
+			const fileList = window.OCA?.Files?.App?.fileList
+			if (!fileList || !this.fileInfo) {
+				return
+			}
+
+			if (this.fileInfo.type === 'dir') {
+				fileList.changeDirectory?.(this.fileInfo.path)
+			} else {
+				fileList.openFile?.(this.fileInfo.name)
 			}
 		},
 
@@ -501,7 +505,7 @@ export default {
 		 * @return {Promise}
 		 * @throws {Error} loading failure
 		 */
-		async open(path = null, type = null, name = null) {
+		 async open(path = null, type = null, name = null) {
 			// update current opened file
 			this.Sidebar.file = path
 			if (path) {
@@ -521,9 +525,13 @@ export default {
 
 					// DEPRECATED legacy views
 					// TODO: remove
-					this.views.forEach(view => {
-						view.setFileInfo(this.fileInfo)
-					})
+					if (Array.isArray(this.views)) {
+						this.views.forEach(view => {
+							if (typeof view.setFileInfo === 'function') {
+								view.setFileInfo(this.fileInfo)
+							}
+						})
+					}
 
 					this.$nextTick(() => {
 						if (this.$refs.tabs) {
@@ -533,7 +541,6 @@ export default {
 				} catch (error) {
 					this.error = t('files', 'Error while loading the file data')
 					console.error('Error while loading the file data', error)
-
 					throw new Error(error)
 				} finally {
 					this.loading = false
diff --git a/src/components/Sidebar/PhotoSideBarTabDeviceItem.vue b/src/components/Sidebar/PhotoSideBarTabDeviceItem.vue
index 2468628bd..6843b73ed 100644
--- a/src/components/Sidebar/PhotoSideBarTabDeviceItem.vue
+++ b/src/components/Sidebar/PhotoSideBarTabDeviceItem.vue
@@ -6,16 +6,15 @@
 		:open="false"
 		:force-menu="false"
 		@click="$emit('device-click')">
-		<NcCounterBubble slot="counter">
-			{{ device.suggestionCount > 99 ? '99+' : device.suggestionCount }}
-		</NcCounterBubble>
+		<template #counter>
+			<NcCounterBubble :count="device.suggestionCount" />
+		</template>
 	</NcAppNavigationItem>
 </template>
 
 <script>
 
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
+import { NcAppNavigationItem, NcCounterBubble } from '@nextcloud/vue'
 
 export default {
 	name: 'PhotoSideBarTabDeviceItem',
diff --git a/src/components/Sidebar/PhotoSideBarTabTrackItem.vue b/src/components/Sidebar/PhotoSideBarTabTrackItem.vue
index ece855f84..a439e06ad 100644
--- a/src/components/Sidebar/PhotoSideBarTabTrackItem.vue
+++ b/src/components/Sidebar/PhotoSideBarTabTrackItem.vue
@@ -7,10 +7,10 @@
 		:open="open"
 		:force-menu="false"
 		@click="onTrackClick">
-		<NcCounterBubble slot="counter">
-			{{ track.suggestionCount > 99 ? '99+' : track.suggestionCount }}
-		</NcCounterBubble>
-		<template v-if="subTracks.length && subTracks.length > 1" slot="default">
+		<template #counter>
+			<NcCounterBubble :count="track.suggestionCount" />
+		</template>
+		<template v-if="subTracks.length && subTracks.length > 1" #default>
 			<b v-show="false">dummy</b>
 			<NcAppNavigationItem
 				v-for="st in subTracks"
@@ -19,9 +19,9 @@
 				:name="track.name.concat(' ', st.key.split(':')[2])"
 				:force-menu="false"
 				@click="$emit('subtrack-click', st)">
-				<NcCounterBubble slot="counter">
-					{{ st.suggestionCount > 99 ? '99+' : st.suggestionCount }}
-				</NcCounterBubble>
+				<template #counter>
+					<NcCounterBubble :count="st.suggestionCount" />
+				</template>
 			</NcAppNavigationItem>
 		</template>
 	</NcAppNavigationItem>
@@ -29,8 +29,7 @@
 
 <script>
 
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
+import { NcAppNavigationItem, NcCounterBubble } from '@nextcloud/vue'
 
 export default {
 	name: 'PhotoSideBarTabTrackItem',
diff --git a/src/components/Sidebar/PhotoSuggestionsSidebarTab.vue b/src/components/Sidebar/PhotoSuggestionsSidebarTab.vue
index bb1336e72..d35d42d6c 100644
--- a/src/components/Sidebar/PhotoSuggestionsSidebarTab.vue
+++ b/src/components/Sidebar/PhotoSuggestionsSidebarTab.vue
@@ -4,14 +4,14 @@
 		<div v-else-if="photoSuggestions.length > 0">
 			<div class="oc-dialog-buttonrow">
 				<NcButton
-					@click="$emit('clear-selection')">
-					{{ t('maps', 'Clear selection') }}
-				</NcButton>
+					@click="$emit('clear-selection')"
+					:text="t('maps', 'Clear selection')"
+				/>
 				<NcButton
 					type="primary"
-					@click="$emit('select-all')">
-					{{ t('maps', 'Select all') }}
-				</NcButton>
+					@click="$emit('select-all')"
+					:text="t('maps', 'Select all')"
+				/>
 				<NcActions>
 					<NcActionButton
 						:icon="selectionLayout==='list'?'icon-toggle-pictures':'icon-toggle-filelist'"
@@ -91,16 +91,16 @@
 				{{ !photoSuggestions.includes(null) ? t('maps', 'Cancel') : t('maps', 'Quit') }}
 			</NcButton>
 			<NcButton
-				@click="$emit('load-more')">
-				{{ t('maps', 'Load more') }}
-			</NcButton>
+				@click="$emit('load-more')"
+				:text="t('maps', 'Load more')"
+			/>
 			<NcButton
 				v-show="photoSuggestions.length > 0"
 				type="primary"
 				:disabled="photoSuggestionsSelectedIndices.length===0 || readOnly"
-				@click="$emit('save')">
-				{{ t('maps', 'Save') }}
-			</NcButton>
+				@click="$emit('save')"
+				:text="t('maps', 'Save')"
+			/>
 		</div>
 		<NcAppNavigationSettings class="footer">
 			{{ t('maps', 'Photos default timezone:') }}
@@ -116,11 +116,10 @@
 				:force-menu="false"
 				@click="onTracksClick"
 				@update:open="onUpdateTracksOpen">
-				<NcCounterBubble v-show="tracks.length"
-					slot="counter">
-					{{ tracks.length > 99 ? '99+' : tracks.length }}
-				</NcCounterBubble>
-				<template slot="default">
+				<template #counter>
+					<NcCounterBubble v-show="tracks.length" :count="tracks.length" />
+				</template>
+				<template #default>
 					<b v-show="false">dummy</b>
 					<PhotoSideBarTabTrackItem
 						v-for="tr in tracks"
@@ -138,11 +137,10 @@
 				:force-menu="false"
 				@click="onDevicesClick"
 				@update:open="onUpdateDevicesOpen">
-				<NcCounterBubble v-show="devices.length"
-					slot="counter">
-					{{ devices.length > 99 ? '99+' : devices.length }}
-				</NcCounterBubble>
-				<template slot="default">
+				<template #counter>
+					<NcCounterBubble v-show="devices.length" :count="devices.length" />
+				</template>
+				<template #default>
 					<b v-show="false">dummy</b>
 					<PhotoSideBarTabDeviceItem
 						v-for="d in devices"
@@ -152,9 +150,9 @@
 				</template>
 			</NcAppNavigationItem>
 			<NcButton
-				@click="$emit('toggle-hide-photos')">
-				{{ photoSuggestionsHidePhotos ? t('maps', 'Show localized photos'): t('maps', 'Hide localized photos') }}
-			</NcButton>
+				@click="$emit('toggle-hide-photos')"
+				:text="photoSuggestionsHidePhotos ? t('maps', 'Show localized photos'): t('maps', 'Hide localized photos')"
+			/>
 		</NcAppNavigationSettings>
 	</div>
 </template>
@@ -163,16 +161,9 @@
 
 import { generateUrl } from '@nextcloud/router'
 import moment from '@nextcloud/moment'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcAppNavigationSettings from '@nextcloud/vue/dist/Components/NcAppNavigationSettings.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import { NcButton, NcActions, NcListItem, NcCounterBubble, NcAppNavigationItem, NcAppNavigationSettings, NcActionButton, NcTimezonePicker } from '@nextcloud/vue'
 
 import { getToken } from '../../utils/common.js'
-import NcTimezonePicker from '@nextcloud/vue/dist/Components/NcTimezonePicker.js'
 import PhotoSideBarTabTrackItem from './PhotoSideBarTabTrackItem.vue'
 import PhotoSideBarTabDeviceItem from './PhotoSideBarTabDeviceItem.vue'
 
diff --git a/src/components/Sidebar/SidebarTab.vue b/src/components/Sidebar/SidebarTab.vue
index 78c050048..16f053c76 100644
--- a/src/components/Sidebar/SidebarTab.vue
+++ b/src/components/Sidebar/SidebarTab.vue
@@ -38,8 +38,7 @@
 </template>
 
 <script>
-import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+import { NcAppSidebarTab, NcEmptyContent } from '@nextcloud/vue'
 
 export default {
 	name: 'SidebarTab',
@@ -122,7 +121,7 @@ export default {
 		this.loading = false
 	},
 
-	async beforeDestroy() {
+	async beforeUnmount() {
 		// unmount the tab
 		await this.onDestroy()
 	},
diff --git a/src/components/leaflet-elevation/src/registerHandlers.js b/src/components/leaflet-elevation/src/registerHandlers.js
new file mode 100644
index 000000000..0ed2d2070
--- /dev/null
+++ b/src/components/leaflet-elevation/src/registerHandlers.js
@@ -0,0 +1,47 @@
+import { Acceleration } from "./handlers/acceleration";
+import { Altitude } from "./handlers/altitude";
+import { Cadence } from "./handlers/cadence";
+import { Distance } from "./handlers/distance";
+import { Heart } from "./handlers/heart";
+import { Labels } from "./handlers/labels";
+import { LinearGradient } from "./handlers/lineargradient";
+import { Pace } from "./handlers/pace";
+import { Runner } from "./handlers/runner";
+import { Slope } from "./handlers/slope";
+import { Speed } from "./handlers/speed";
+import { Temperature } from "./handlers/temperature";
+import { Time } from "./handlers/time";
+
+
+let registered = false
+
+export function registerElevationHandlers() {
+
+	if (registered) return
+	registered = true
+
+	const handlers = [
+		Acceleration,
+		Altitude,
+		Cadence,
+		Distance,
+		Heart,
+		Pace,
+		Slope,
+		Speed,
+		Temperature,
+		Time,
+	]
+
+	handlers.forEach((handler) => {
+		const h = handler.call(L.Control.Elevation.prototype)
+		L.Control.Elevation.include({
+			[h.name]: h
+		})
+	})
+
+	// utilities patch the control directly
+	Labels.call(L.Control.Elevation.prototype)
+	LinearGradient.call(L.Control.Elevation.prototype)
+	Runner.call(L.Control.Elevation.prototype)
+}
\ No newline at end of file
diff --git a/src/components/map/ClickSearchPopup.vue b/src/components/map/ClickSearchPopup.vue
index 185ffbd56..8674e783e 100644
--- a/src/components/map/ClickSearchPopup.vue
+++ b/src/components/map/ClickSearchPopup.vue
@@ -1,51 +1,44 @@
 <template>
-	<LMarker :lat-lng="latLng"
-		:icon="icon"
-		@ready="onMarkerReady">
-		<LPopup :options="popupOptions"
-			@ready="onPopupReady">
-			<h3 id="click-search-popup-title">
-				{{ t('maps', 'This place') }}
-			</h3>
-			<span v-if="addressLoading"
-				class="icon icon-loading-small" />
-			<textarea v-else
-				id="clickSearchAddress"
-				v-model="formattedAddress" />
-			<button v-if="favoriteIsCreatable" class="search-add-favorite" @click="$emit('add-favorite', { latLng, address, formattedAddress })">
-				<span class="icon-favorite" />
-				{{ t('maps', 'Add to favorites') }}
-			</button>
-			<button v-if="contactIsCreatable" class="search-place-contact" @click="$emit('place-contact', { latLng, address })">
-				<span class="icon-user" />
-				{{ t('maps', 'Add contact address') }}
-			</button>
-			<button v-for="action in mapActions"
-				:key="action.label"
-				:icon="action.icon"
-				@click="actionCallback(action)">
-				<span :class="{ [action.icon]: true }" />
-				<span>{{ action.label }}</span>
-			</button>
-		</LPopup>
-	</LMarker>
+	<div class="click-search-popup-content">
+		<h3 id="click-search-popup-title">
+			{{ t('maps', 'This place') }}
+		</h3>
+		<span v-if="addressLoading"
+			class="icon icon-loading-small" />
+		<textarea v-else
+			id="clickSearchAddress"
+			v-model="formattedAddress" />
+		<button v-if="favoriteIsCreatable" class="search-add-favorite" @click="onAddFavorite">
+			<span class="icon-favorite" />
+			{{ t('maps', 'Add to favorites') }}
+		</button>
+		<button v-if="contactIsCreatable" class="search-place-contact" @click="onPlaceContact">
+			<span class="icon-user" />
+			{{ t('maps', 'Add contact address') }}
+		</button>
+		<button v-for="action in mapActions"
+			:key="action.label"
+			:icon="action.icon"
+			@click="actionCallback(action)">
+			<span :class="{ [action.icon]: true }" />
+			<span>{{ action.label }}</span>
+		</button>
+	</div>
 </template>
 
 <script>
 import L from 'leaflet'
-import { LMarker, LPopup } from 'vue2-leaflet'
-
 import { formatAddress } from '../../utils.js'
 import { geocode } from '../../network.js'
 
 export default {
 	name: 'ClickSearchPopup',
-	components: {
-		LMarker,
-		LPopup,
-	},
 
 	props: {
+		map: {
+			type: Object,
+			required: true,
+		},
 		latLng: {
 			type: Object,
 			required: true,
@@ -64,43 +57,55 @@ export default {
 
 	data() {
 		return {
-			popupOptions: {
-				closeButton: false,
-				offset: L.point(-1, 42),
-			},
 			addressLoading: false,
 			address: null,
 			formattedAddress: '',
-			mapActions: window.OCA.Maps.mapActions,
+			mapActions: window.OCA && window.OCA.Maps ? window.OCA.Maps.mapActions : [],
 			icon: L.icon({
 				iconUrl: 'noIcon',
 			}),
 		}
 	},
 
-	computed: {
-	},
-
 	watch: {
 		latLng() {
 			this.address = null
 			this.formattedAddress = ''
 			this.getAddress()
+			if (this.marker) {
+				this.marker.setLatLng(this.latLng)
+				this.marker.openPopup()
+			}
 		},
 	},
 
+	created() {
+		// Store leaflet objects non-reactively for performance 
+		this.marker = null
+	},
+
 	beforeMount() {
 		this.getAddress()
 	},
 
+	mounted() {
+		this.marker = L.marker(this.latLng, { icon: this.icon }).addTo(this.map)
+		
+		this.marker.bindPopup(this.$el, { 
+			closeButton: false, 
+			offset: L.point(-1, 42) 
+		})
+		
+		this.marker.openPopup()
+	},
+
+	beforeUnmount() {
+		if (this.marker && this.map) {
+			this.map.removeLayer(this.marker)
+		}
+	},
+
 	methods: {
-		onMarkerReady(m) {
-			m.openPopup()
-		},
-		onPopupReady(p) {
-			// i don't know why but it is placed too high when it's created
-			p.setLatLng(this.latLng)
-		},
 		getAddress() {
 			this.addressLoading = true
 			geocode(this.latLng.lat, this.latLng.lng).then((response) => {
@@ -120,7 +125,23 @@ export default {
 				longitude: this.latLng.lng.toString(),
 			}
 			action.callback(object)
+			if (this.map) this.map.closePopup()
+		},
+		onAddFavorite() {
+			this.$emit('add-favorite', { 
+				latLng: this.latLng, 
+				address: this.address, 
+				formattedAddress: this.formattedAddress 
+			})
+			if (this.map) this.map.closePopup()
 		},
+		onPlaceContact() {
+			this.$emit('place-contact', { 
+				latLng: this.latLng, 
+				address: this.address 
+			})
+			if (this.map) this.map.closePopup()
+		}
 	},
 }
 </script>
@@ -155,4 +176,4 @@ span.icon {
 	width: 100%;
 	height: 75px;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/map/ContactLayer.vue b/src/components/map/ContactLayer.vue
deleted file mode 100644
index 6ed0badac..000000000
--- a/src/components/map/ContactLayer.vue
+++ /dev/null
@@ -1,267 +0,0 @@
-<template>
-	<LMarker
-		:options="{ data: contact }"
-		:icon="contactMarkerIcon"
-		:lat-lng="latLng"
-		@click="onMarkerClick"
-		@contextmenu="onMarkerContextmenu">
-		<LTooltip
-			class="tooltip-contact-wrapper"
-			:options="tooltipOptions">
-			<img class="tooltip-contact-avatar"
-				:src="contactAvatar"
-				alt="">
-			<div class="tooltip-contact-content">
-				<h3 class="tooltip-contact-name">
-					{{ contact.FN }}
-				</h3>
-				<p class="tooltip-contact-address-type">
-					<template v-for="adrtype in contact.ADRTYPE">
-						<span v-if=" adrtype.toLowerCase() === 'home'"
-							class="tooltip-contact-address-type">
-							{{ t('maps', 'Home') }}
-						</span>
-						<span v-else-if=" adrtype.toLowerCase() === 'work'"
-							class="tooltip-contact-address-type">
-							{{ t('maps', 'Work') }}
-						</span>
-						<span v-else
-							class="tooltip-contact-address-type">
-							{{ t('maps', adrtype.toLowerCase()) }}
-						</span>
-					</template>
-				</p>
-				<p v-for="l in formattedAddressLines"
-					:key="l"
-					class="tooltip-contact-address">
-					{{ l }}
-				</p>
-			</div>
-		</LTooltip>
-		<LPopup
-			class="popup-contact-wrapper"
-			:options="popupOptions">
-			<div v-if="click === 'left'">
-				<div class="left-contact-popup">
-					<img class="tooltip-contact-avatar"
-						:src="contactAvatar"
-						alt="">
-					<button v-if="contact.isDeletable"
-						v-tooltip="{ content: contact.ADR?t('maps', 'Delete this address'):t('maps', 'Delete this location') }"
-						class="icon icon-delete"
-						@click="onDeleteAddressClick()" />
-					<button v-if="!isPublic()"
-						v-tooltip="{ content: t('maps', 'Copy to map') }"
-						class="icon icon-share"
-						@click="$emit('add-to-map-contact', contact)" />
-				</div>
-				<div class="tooltip-contact-content">
-					<h3 class="tooltip-contact-name">
-						{{ contact.FN }}
-					</h3>
-					<p class="tooltip-contact-address-type">
-						<template v-for="adrtype in contact.ADRTYPE">
-							<span v-if=" adrtype.toLowerCase() === 'home'"
-								class="tooltip-contact-address-type">
-								{{ t('maps', 'Home') }}
-							</span>
-							<span v-else-if=" adrtype.toLowerCase() === 'work'"
-								class="tooltip-contact-address-type">
-								{{ t('maps', 'Work') }}
-							</span>
-							<span v-else
-								class="tooltip-contact-address-type">
-								{{ t('maps', adrtype.toLowerCase()) }}
-							</span>
-						</template>
-					</p>
-					<p v-for="l in formattedAddressLines"
-						:key="l"
-						class="tooltip-contact-address">
-						{{ l }}
-					</p>
-					<a v-if="contact.UID && contact.URI"
-						target="_blank"
-						:href="contactUrl">
-						{{ t('maps', 'Open in Contacts') }}
-					</a>
-				</div>
-			</div>
-			<div v-if="click === 'right'" class="right-contact-popup">
-				<div>
-					<NcActionButton v-if="contact.isUpdateable"
-						icon="icon-delete"
-						@click="onDeleteAddressClick()">
-						{{ contact.ADR?t('maps', 'Delete this address'):t('maps', 'Delete this location') }}
-					</NcActionButton>
-					<NcActionButton v-if="!isPublic()"
-						icon="icon-share"
-						@click="$emit('add-to-map-contact', contact)">
-						{{ t('maps', 'Copy to map') }}
-					</NcActionButton>
-				</div>
-			</div>
-		</LPopup>
-	</LMarker>
-</template>
-
-<script>
-import { generateUrl } from '@nextcloud/router'
-import { getCurrentUser } from '@nextcloud/auth'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-
-import L from 'leaflet'
-import { LMarker, LTooltip, LPopup } from 'vue2-leaflet'
-
-import optionsController from '../../optionsController.js'
-import { geoToLatLng } from '../../utils/mapUtils.js'
-import { getToken, isPublic } from '../../utils/common.js'
-
-const CONTACT_MARKER_VIEW_SIZE = 40
-
-export default {
-	name: 'ContactLayer',
-	components: {
-		LMarker,
-		LTooltip,
-		LPopup,
-		NcActionButton,
-	},
-
-	props: {
-		contact: {
-			type: Object,
-			required: true,
-		},
-	},
-
-	data() {
-		return {
-			click: 'left',
-			optionValues: optionsController.optionValues,
-			tooltipOptions: {
-				className: 'leaflet-marker-contact-tooltip',
-				direction: 'top',
-				offset: L.point(0, 0),
-			},
-			popupOptions: {
-				closeOnClick: false,
-				closeButton: false,
-				className: 'popovermenu open popupMarker contactPopup',
-				offset: L.point(-5, 10),
-			},
-		}
-	},
-
-	computed: {
-		latLng() {
-			return geoToLatLng(this.contact.GEO)
-		},
-		contactMarkerIcon() {
-			const iconUrl = this.contactAvatar
-			return L.divIcon(
-				L.extend({
-					className: 'leaflet-marker-contact contact-marker',
-					html: '<div class="thumbnail" style="background-image: url(\'' + iconUrl + '\');"></div>​',
-				},
-				this.contact,
-				{
-					iconSize: [CONTACT_MARKER_VIEW_SIZE, CONTACT_MARKER_VIEW_SIZE],
-					iconAnchor: [CONTACT_MARKER_VIEW_SIZE / 2, CONTACT_MARKER_VIEW_SIZE],
-				}),
-			)
-		},
-		contactAvatar() {
-			if (this.contact.HAS_PHOTO) {
-				return generateUrl(
-					'/remote.php/dav/addressbooks/users/' + getCurrentUser().uid
-					+ '/' + encodeURIComponent(this.contact.BOOKURI)
-					+ '/' + encodeURIComponent(this.contact.URI) + '?photo').replace(/index\.php\//, '')
-			} else {
-				return generateUrl('/apps/maps' + (isPublic() ? '/s/' + getToken() : '') + '/contacts-avatar?name=' + encodeURIComponent(this.contact.FN))
-			}
-		},
-		formattedAddressLines() {
-			const adrTab = this.contact.ADR.split(';').map((s) => { return s.trim() })
-			const formattedAddressLines = []
-			if (adrTab.length > 6) {
-				// check if street name is set
-				if (adrTab[2] !== '') {
-					formattedAddressLines.push(adrTab[2])
-				}
-				formattedAddressLines.push(adrTab[5] + ' ' + adrTab[3])
-				formattedAddressLines.push(adrTab[4] + ' ' + adrTab[6])
-			}
-			return formattedAddressLines.filter((s) => { return s.trim() !== '' })
-		},
-		contactUrl() {
-			return this.contact.URL || generateUrl('/apps/contacts/direct/contact/' + encodeURIComponent(this.contact.UID + '~contacts'))
-		},
-	},
-
-	methods: {
-		isPublic() {
-			return isPublic()
-		},
-		onMarkerClick(e) {
-			this.click = 'left'
-			this.popupOptions.offset = L.point(-5, 10)
-			this.$nextTick(() => {
-				e.target.closeTooltip()
-			})
-		},
-		onMarkerContextmenu(e) {
-			this.click = 'right'
-			this.popupOptions.offset = L.point(-5, -25)
-			this.$nextTick(() => {
-				e.target.openPopup()
-				e.target.closeTooltip()
-				this.popupOptions.offset = L.point(-5, 10)
-			})
-		},
-		onDeleteAddressClick() {
-			const c = this.contact
-			// We only want to delete the ADR not the GEO
-			if (c.ADR && c.GEO) {
-				delete c.GEO
-			}
-			this.$emit('address-deleted', this.contact)
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.popup-contact-wrapper {
-	width: 100%;
-	.action {
-		width: 100%;
-	}
-}
-
-.popup-contact-wrapper > div,
-.tooltip-contact-wrapper {
-	display: flex;
-}
-
-.left-contact-popup {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	button {
-		width: 44px;
-		height: 44px !important;
-		background-color: transparent;
-		border: 0;
-		&:hover {
-			background-color: var(--color-background-hover);
-		}
-	}
-}
-
-.right-contact-popup {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-}
-</style>
diff --git a/src/components/map/ContactsLayer.vue b/src/components/map/ContactsLayer.vue
index 308dbdcb2..b2c1b24c7 100644
--- a/src/components/map/ContactsLayer.vue
+++ b/src/components/map/ContactsLayer.vue
@@ -1,119 +1,257 @@
 <template>
-	<Vue2LeafletMarkerCluster :options="clusterOptions"
-		@clusterclick="onClusterClick"
-		@spiderfied="spiderfied = true">
-		<ContactLayer v-for="(c, i) in displayedContacts"
-			:key="c.URI + i + c.ADR"
-			:contact="c"
-			@address-deleted="$emit('address-deleted', $event)"
-			@add-to-map-contact="$emit('add-to-map-contact', $event)" />
-	</Vue2LeafletMarkerCluster>
+	<div style="display: none;"></div>
 </template>
 
 <script>
 import { generateUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
-
 import L from 'leaflet'
-import Vue2LeafletMarkerCluster from 'vue2-leaflet-markercluster'
+import 'leaflet.markercluster'
 
-import ContactLayer from './ContactLayer.vue'
-import optionsController from '../../optionsController.js'
 import { getToken, isPublic } from '../../utils/common.js'
 import { splitByNonEscapedComma } from '../../utils.js'
+import { geoToLatLng } from '../../utils/mapUtils.js'
 
 const CONTACT_MARKER_VIEW_SIZE = 40
 
 export default {
 	name: 'ContactsLayer',
-	components: {
-		Vue2LeafletMarkerCluster,
-		ContactLayer,
-	},
 
 	props: {
-		contacts: {
-			type: Array,
-			required: true,
-		},
-		groups: {
-			type: Object,
-			required: true,
-		},
+		map: { type: Object, required: true },
+		contacts: { type: Array, required: true },
+		groups: { type: Object, required: true },
 	},
 
 	data() {
 		return {
-			optionValues: optionsController.optionValues,
-			clusterOptions: {
-				iconCreateFunction: this.getClusterMarkerIcon,
-				spiderfyOnMaxZoom: false,
-				showCoverageOnHover: false,
-				zoomToBoundsOnClick: false,
-				maxClusterRadius: CONTACT_MARKER_VIEW_SIZE + 10,
-				icon: {
-					iconSize: [CONTACT_MARKER_VIEW_SIZE, CONTACT_MARKER_VIEW_SIZE],
-				},
-			},
 			spiderfied: false,
 		}
 	},
 
-	computed: {
-		displayedContacts() {
+	created() {
+		this.clusterGroup = null;
+		this.contactMarkers = [];
+	},
+
+	watch: {
+		contacts: 'renderMarkers',
+		groups: { handler: 'renderMarkers', deep: true },
+	},
+
+	mounted() {
+		this.clusterGroup = L.markerClusterGroup({
+			iconCreateFunction: this.getClusterMarkerIcon.bind(this),
+			spiderfyOnMaxZoom: false,
+			showCoverageOnHover: false,
+			zoomToBoundsOnClick: false,
+			maxClusterRadius: CONTACT_MARKER_VIEW_SIZE + 10,
+		});
+
+		this.clusterGroup.on('clusterclick', this.onClusterClick.bind(this));
+		this.clusterGroup.on('spiderfied', () => this.spiderfied = true);
+
+		this.map.addLayer(this.clusterGroup);
+		this.renderMarkers();
+	},
+
+	beforeUnmount() {
+		if (this.clusterGroup && this.map) {
+			this.map.removeLayer(this.clusterGroup);
+		}
+	},
+
+	methods: {
+		isPublic() { return isPublic() },
+
+		getDisplayedContacts() {
 			return this.contacts.filter((c) => {
 				if (c.GROUPS) {
 					try {
-						const cGroups = splitByNonEscapedComma(c.GROUPS)
+						const cGroups = splitByNonEscapedComma(c.GROUPS);
 						for (let i = 0; i < cGroups.length; i++) {
-							// if at least in one enabled group
-							if (this.groups[cGroups[i]].enabled) {
-								return true
-							}
+							if (this.groups[cGroups[i]] && this.groups[cGroups[i]].enabled) return true;
 						}
 					} catch (error) {
-						console.error(error)
+						console.error(error);
 					}
-				} else if (this.groups['0'].enabled) {
+				} else if (this.groups['0'] && this.groups['0'].enabled) {
 					// or not grouped and this is enabled
-					return true
+					return true;
 				}
-				return false
-			})
+				return false;
+			});
+		},
+
+		renderMarkers() {
+			this.clusterGroup.clearLayers();
+			const activeContacts = this.getDisplayedContacts();
+
+			this.contactMarkers = activeContacts.map((contact) => {
+				const latLng = geoToLatLng(contact.GEO);
+				const iconUrl = this.getContactAvatar(contact);
+				
+				const adrTypesHtml = (contact.ADRTYPE || []).map(adrType => 
+					`<span class="tooltip-contact-address-type">${adrType.toLowerCase() === 'home' ? window.t('maps', 'Home') : adrType.toLowerCase() === 'work' ? window.t('maps', 'Work') : window.t('maps', adrType.toLowerCase())}</span>`
+				).join(' ');
+				
+				const adrTab = (contact.ADR || '').split(';').map(s => s.trim());
+				const formattedLines = [];
+				if (adrTab.length > 6) {
+					if (adrTab[2]) formattedLines.push(adrTab[2]);
+					formattedLines.push(adrTab[5] + ' ' + adrTab[3]);
+					formattedLines.push(adrTab[4] + ' ' + adrTab[6]);
+				}
+				const addressHtml = formattedLines.filter(s => s).map(l => `<p class="tooltip-contact-address">${l}</p>`).join('');
+
+				const marker = L.marker(latLng, {
+					icon: L.divIcon({
+						className: 'leaflet-marker-contact contact-marker',
+						html: `<div class="thumbnail" style="background-image: url('${iconUrl}');"></div>​`,
+						iconSize: [CONTACT_MARKER_VIEW_SIZE, CONTACT_MARKER_VIEW_SIZE],
+						iconAnchor: [CONTACT_MARKER_VIEW_SIZE / 2, CONTACT_MARKER_VIEW_SIZE],
+					})
+				});
+
+				marker.data = contact;
+
+				marker.bindTooltip(`
+					<div class="tooltip-contact-wrapper">
+						<img class="tooltip-contact-avatar" src="${iconUrl}" />
+						<div class="tooltip-contact-content">
+							<h3 class="tooltip-contact-name">${contact.FN || ''}</h3>
+							<p class="tooltip-contact-address-type">${adrTypesHtml}</p>
+							${addressHtml}
+						</div>
+					</div>
+				`, { className: 'leaflet-marker-contact-tooltip', direction: 'top', offset: L.point(0, 0) });
+
+				marker.on('click', (e) => this.onMarkerClick(e, contact, iconUrl, adrTypesHtml, addressHtml));
+				marker.on('contextmenu', (e) => this.onMarkerRightClick(e, contact));
+
+				return marker;
+			});
+
+			this.clusterGroup.addLayers(this.contactMarkers);
+		},
+
+		onMarkerClick(e, contact, iconUrl, adrTypesHtml, addressHtml) {
+			const contactUrl = contact.URL || generateUrl('/apps/contacts/direct/contact/' + encodeURIComponent(contact.UID + '~contacts'));
+			
+			const popupContent = L.DomUtil.create('div', 'popup-contact-wrapper');
+			popupContent.innerHTML = `
+				<div class="left-contact-popup">
+					<img class="tooltip-contact-avatar" src="${iconUrl}" />
+					${contact.isDeletable ? `<button class="icon icon-delete" data-action="delete" title="${contact.ADR ? window.t('maps', 'Delete this address') : window.t('maps', 'Delete this location')}"></button>` : ''}
+					${!this.isPublic() ? `<button class="icon icon-share" data-action="copy" title="${window.t('maps', 'Copy to map')}"></button>` : ''}
+				</div>
+				<div class="tooltip-contact-content">
+					<h3 class="tooltip-contact-name">${contact.FN}</h3>
+					<p class="tooltip-contact-address-type">${adrTypesHtml}</p>
+					${addressHtml}
+					${contact.UID && contact.URI ? `<a target="_blank" href="${contactUrl}">${window.t('maps', 'Open in Contacts')}</a>` : ''}
+				</div>
+			`;
+
+			popupContent.addEventListener('click', (event) => {
+				if (event.target.getAttribute('data-action') === 'delete') this.onDeleteAddressClick(contact);
+				if (event.target.getAttribute('data-action') === 'copy') this.$emit('add-to-map-contact', contact);
+			});
+
+			e.target.closeTooltip();
+			L.popup({ closeButton: false, className: 'popovermenu open popupMarker contactPopup', offset: L.point(-5, 10) })
+				.setLatLng(e.target.getLatLng())
+				.setContent(popupContent)
+				.openOn(this.map);
+		},
+
+		onMarkerRightClick(e, contact) {
+			const popupContent = L.DomUtil.create('div', 'right-contact-popup popup-contact-wrapper');
+			popupContent.innerHTML = `
+				${contact.isUpdateable ? `<button class="action-btn" data-action="delete">${contact.ADR ? window.t('maps', 'Delete this address') : window.t('maps', 'Delete this location')}</button>` : ''}
+				${!this.isPublic() ? `<button class="action-btn" data-action="copy">${window.t('maps', 'Copy to map')}</button>` : ''}
+			`;
+
+			popupContent.addEventListener('click', (event) => {
+				if (event.target.getAttribute('data-action') === 'delete') this.onDeleteAddressClick(contact);
+				if (event.target.getAttribute('data-action') === 'copy') this.$emit('add-to-map-contact', contact);
+			});
+
+			e.target.closeTooltip();
+			L.popup({ closeButton: false, className: 'popovermenu open popupMarker contactPopup', offset: L.point(-5, -25) })
+				.setLatLng(e.target.getLatLng())
+				.setContent(popupContent)
+				.openOn(this.map);
+		},
+
+		onDeleteAddressClick(contact) {
+			if (contact.ADR && contact.GEO) delete contact.GEO;
+			this.$emit('address-deleted', contact);
+			this.map.closePopup();
 		},
-	},
 
-	methods: {
 		onClusterClick(a) {
-			if (a.layer.getChildCount() > 10 && a.layer._map.getZoom() !== a.layer._map.getMaxZoom()) {
-				a.layer.zoomToBounds()
+			if (a.layer.getChildCount() > 10 && this.map.getZoom() !== this.map.getMaxZoom()) {
+				a.layer.zoomToBounds();
 			} else {
-				a.layer.spiderfy()
+				a.layer.spiderfy();
 			}
 		},
+
 		getClusterMarkerIcon(cluster) {
-			const contact = cluster.getAllChildMarkers()[0].options.data
-			const iconUrl = this.getContactAvatar(contact)
-			const label = cluster.getChildCount()
-			return new L.DivIcon(L.extend({
+			const contact = cluster.getAllChildMarkers()[0].data;
+			const iconUrl = this.getContactAvatar(contact);
+			const label = cluster.getChildCount();
+			return new L.DivIcon({
 				className: 'leaflet-marker-contact cluster-marker',
-				html: '<div class="thumbnail" style="background-image: url(' + iconUrl + ');"></div>​<span class="label">' + label + '</span>',
-			}))
+				html: `<div class="thumbnail" style="background-image: url('${iconUrl}');"></div>​<span class="label">${label}</span>`,
+				iconSize: [CONTACT_MARKER_VIEW_SIZE, CONTACT_MARKER_VIEW_SIZE],
+			});
 		},
+
 		getContactAvatar(contact) {
 			if (contact.HAS_PHOTO) {
-				return generateUrl(
-					'/remote.php/dav/addressbooks/users/' + getCurrentUser().uid
-					+ '/' + encodeURIComponent(contact.BOOKURI)
-					+ '/' + encodeURIComponent(contact.URI) + '?photo').replace(/index\.php\//, '')
+				return generateUrl('/remote.php/dav/addressbooks/users/' + getCurrentUser().uid + '/' + encodeURIComponent(contact.BOOKURI) + '/' + encodeURIComponent(contact.URI) + '?photo').replace(/index\.php\//, '');
 			} else {
-				return generateUrl('/apps/maps' + (isPublic() ? '/s/' + getToken() : '') + '/contacts-avatar?name=' + encodeURIComponent(contact.FN))
+				return generateUrl('/apps/maps' + (this.isPublic() ? '/s/' + getToken() : '') + '/contacts-avatar?name=' + encodeURIComponent(contact.FN));
 			}
 		},
 	},
 }
 </script>
 
-<style lang="scss" scoped>
-// nothing
-</style>
+<style lang="scss">
+.popup-contact-wrapper {
+	display: flex;
+}
+.left-contact-popup {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	button {
+		width: 44px;
+		height: 44px !important;
+		background-color: transparent;
+		border: 0;
+		cursor: pointer;
+		&:hover { background-color: var(--color-background-hover); }
+	}
+}
+.right-contact-popup {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+.right-contact-popup .action-btn {
+	display: block;
+	width: 100%;
+	padding: 8px;
+	border: none;
+	background: transparent;
+	text-align: left;
+	cursor: pointer;
+}
+.right-contact-popup .action-btn:hover {
+	background: var(--color-background-hover);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/map/DeviceHoverMarker.vue b/src/components/map/DeviceHoverMarker.vue
index 8f934b752..b98048630 100644
--- a/src/components/map/DeviceHoverMarker.vue
+++ b/src/components/map/DeviceHoverMarker.vue
@@ -1,54 +1,37 @@
 <template>
-	<LFeatureGroup>
-		<LMarker
-			:icon="icon"
-			:lat-lng="[point.lat, point.lng]">
-			<LTooltip :options="tooltipOptions">
-				<div class="tooltip-device-wrapper"
-					:style="'border: 2px solid ' + point.color">
-					<b>{{ t('maps', 'Device') }}:</b>
-					<span>{{ point.user_agent }}</span>
-					<div v-if="date">
-						<b>{{ t('maps', 'Date') }}:</b>
-						<span>{{ date }}</span>
-					</div>
-					<div v-if="altitude">
-						<b>{{ t('maps', 'Altitude') }}:</b>
-						<span>{{ altitude }}</span>
-					</div>
-					<div v-if="battery">
-						<b>{{ t('maps', 'Battery') }}:</b>
-						<span>{{ battery }}</span>
-					</div>
-					<div v-if="accuracy">
-						<b>{{ t('maps', 'Accuracy') }}:</b>
-						<span>{{ accuracy }}</span>
-					</div>
-				</div>
-			</LTooltip>
-		</LMarker>
-	</LFeatureGroup>
+	<div class="tooltip-device-wrapper"
+		:style="'border: 2px solid ' + point.color">
+		<b>{{ t('maps', 'Device') }}:</b>
+		<span>{{ point.user_agent }}</span>
+		<div v-if="date">
+			<b>{{ t('maps', 'Date') }}:</b>
+			<span>{{ date }}</span>
+		</div>
+		<div v-if="altitude">
+			<b>{{ t('maps', 'Altitude') }}:</b>
+			<span>{{ altitude }}</span>
+		</div>
+		<div v-if="battery">
+			<b>{{ t('maps', 'Battery') }}:</b>
+			<span>{{ battery }}</span>
+		</div>
+		<div v-if="accuracy">
+			<b>{{ t('maps', 'Accuracy') }}:</b>
+			<span>{{ accuracy }}</span>
+		</div>
+	</div>
 </template>
 
 <script>
 import L from 'leaflet'
-import { LMarker, LTooltip, LFeatureGroup } from 'vue2-leaflet'
-
 import moment from '@nextcloud/moment'
 
 export default {
 	name: 'DeviceHoverMarker',
-	components: {
-		LFeatureGroup,
-		LMarker,
-		LTooltip,
-	},
 
 	props: {
-		point: {
-			type: Object,
-			required: true,
-		},
+		point: { type: Object, required: true },
+		map: { type: Object, required: true }, // Added map prop
 	},
 
 	data() {
@@ -64,40 +47,54 @@ export default {
 
 	computed: {
 		icon() {
-			return L.divIcon(L.extend({
-				html: '<div class="device-over-marker" style="background-color: ' + this.point.color + ';"></div>',
+			return L.divIcon({
+				html: `<div class="device-over-marker" style="background-color: ${this.point.color};"></div>`,
 				className: 'device-over-marker-wrapper',
-			}, null, {
 				iconSize: [16, 16],
 				iconAnchor: [8, 8],
-			}))
+			})
 		},
 		date() {
-			if (this.point.timestamp) {
-				const mom = moment.unix(this.point.timestamp)
-				return mom.format('LL') + ' ' + mom.format('HH:mm:ss')
-			} else {
-				return null
-			}
-		},
-		altitude() {
-			return this.point.altitude
-				? this.point.altitude + ' m'
-				: null
-		},
-		battery() {
-			return this.point.battery
-				? this.point.battery + ' %'
-				: null
-		},
-		accuracy() {
-			return this.point.accuracy
-				? this.point.accuracy + ' m'
+			return this.point.timestamp 
+				? moment.unix(this.point.timestamp).format('LL') + ' ' + moment.unix(this.point.timestamp).format('HH:mm:ss') 
 				: null
 		},
+		altitude() { return this.point.altitude ? this.point.altitude + ' m' : null },
+		battery() { return this.point.battery ? this.point.battery + ' %' : null },
+		accuracy() { return this.point.accuracy ? this.point.accuracy + ' m' : null },
+	},
+
+	created() {
+		this.marker = null; // Non-reactive leaflet object
+	},
+
+	watch: {
+		point: {
+			handler(newPoint) {
+				if (this.marker) {
+					this.marker.setLatLng([newPoint.lat, newPoint.lng])
+					this.marker.setIcon(this.icon)
+					this.marker.setTooltipContent(this.$el) // Force update DOM
+				}
+			},
+			deep: true
+		}
 	},
 
-	methods: {
+	mounted() {
+		this.marker = L.marker([this.point.lat, this.point.lng], { 
+			icon: this.icon, 
+			interactive: false 
+		}).addTo(this.map)
+
+		this.marker.bindTooltip(this.$el, this.tooltipOptions)
+		this.marker.openTooltip()
+	},
+
+	beforeUnmount() {
+		if (this.marker && this.map) {
+			this.map.removeLayer(this.marker)
+		}
 	},
 }
 </script>
@@ -109,4 +106,4 @@ export default {
 	background-color: var(--color-main-background);
 	color: var(--color-main-text);
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/map/DeviceLayer.vue b/src/components/map/DeviceLayer.vue
deleted file mode 100644
index f49070794..000000000
--- a/src/components/map/DeviceLayer.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-<template>
-	<LFeatureGroup
-		ref="featgroup"
-		@ready="onFGReady"
-		@click="$emit('click', device)"
-		@contextmenu="onFGRightClick">
-		<LPopup :options="popupOptions"
-			class="popup-device-wrapper">
-			<NcActionButton
-				icon="icon-category-monitoring"
-				@click="$emit('toggle-history', device)">
-				{{ device.historyEnabled ? t('maps', 'Hide history') : t('maps', 'Show history') }}
-			</NcActionButton>
-			<NcActionButton v-if="mapIsUpdatable"
-				icon="icon-colorpicker"
-				@click="$emit('change-color', device)">
-				<!--template #icon>
-					<div class="icon-colorpicker" />
-				</template-->
-				{{ t('maps', 'Change color') }}
-			</NcActionButton>
-			<NcActionButton
-				icon="icon-file"
-				@click="$emit('export', device)">
-				{{ t('maps', 'Export') }}
-			</NcActionButton>
-			<NcActionButton v-if="!isPublic()"
-				icon="icon-share"
-				@click="$emit('add-to-map-device', device)">
-				{{ t('maps', 'Link to map') }}
-			</NcActionButton>
-		</LPopup>
-		<LTooltip :options="tooltipOptions">
-			<div class="tooltip-device-wrapper"
-				:style="'border: 2px solid ' + color">
-				<b>{{ t('maps', 'Name') }}:</b>
-				<span>{{ device.user_agent }}</span>
-			</div>
-		</LTooltip>
-		<LMarker
-			:icon="markerIcon"
-			:lat-lng="lastPoint"
-			@mouseover="deviceLastPointMouseover" />
-		<LFeatureGroup
-			@mouseover="deviceLineMouseover">
-			<LPolyline v-if="device.historyEnabled && points.length <= 2500"
-				color="black"
-				:opacity="1"
-				:weight="4 * 1.6"
-				:lat-lngs="points" />
-			<LPolyline v-if="device.historyEnabled && points.length <= 2500"
-				:color="color"
-				:opacity="1"
-				:weight="4"
-				:lat-lngs="points" />
-		</LFeatureGroup>
-	</LFeatureGroup>
-</template>
-
-<script>
-import L from 'leaflet'
-import { LMarker, LTooltip, LPopup, LFeatureGroup, LPolyline } from 'vue2-leaflet'
-
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-
-import { isComputer } from '../../utils.js'
-import { binSearch, isPublic } from '../../utils/common.js'
-import optionsController from '../../optionsController.js'
-import moment from '@nextcloud/moment'
-
-const DEVICE_MARKER_VIEW_SIZE = 40
-
-export default {
-	name: 'DeviceLayer',
-	components: {
-		LMarker,
-		LTooltip,
-		LPopup,
-		LFeatureGroup,
-		LPolyline,
-		NcActionButton,
-	},
-
-	props: {
-		device: {
-			type: Object,
-			required: true,
-		},
-		start: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		end: {
-			type: Number,
-			required: false,
-			default: moment.unix(),
-		},
-	},
-
-	data() {
-		return {
-			optionValues: optionsController.optionValues,
-			lineOptions: {
-				weight: 4,
-				opacity: 1,
-			},
-			tooltipOptions: {
-				sticky: true,
-				className: 'leaflet-marker-device-tooltip',
-				direction: 'top',
-				offset: L.point(0, 0),
-			},
-			popupOptions: {
-				closeButton: false,
-				closeOnClick: false,
-				className: 'popovermenu open popupMarker devicePopup',
-				offset: L.point(-5, -20),
-			},
-		}
-	},
-
-	computed: {
-		points() {
-			const lastNullIndex = binSearch(this.device.points, (p) => !p.timestamp)
-			const firstShownIndex = binSearch(this.device.points, (p) => (p.timestamp || 0) < this.start) + 1
-			const lastShownIndex = binSearch(this.device.points, (p) => (p.timestamp || 0) < this.end)
-			const filteredDevicePoints = [
-				...this.device.points.slice(0, lastNullIndex + 1),
-				...this.device.points.slice(firstShownIndex, lastShownIndex + 1),
-			]
-			return filteredDevicePoints.map((p) => [p.lat, p.lng])
-		},
-		color() {
-			return this.device.color || '#0082c9'
-		},
-		thumbnailClass() {
-			return isComputer(this.device.user_agent)
-				? 'desktop'
-				: 'phone'
-		},
-		markerIcon() {
-			return L.divIcon(L.extend({
-				html: '<div class="thumbnail-wrapper" style="--custom-color: ' + this.color + '; border-color: ' + this.color + ';">'
-					+ '<div class="thumbnail ' + this.thumbnailClass + '" style="background-color: ' + this.color + ';"></div></div>​',
-				className: 'leaflet-marker-device device-marker',
-			}, null, {
-				iconSize: [DEVICE_MARKER_VIEW_SIZE, DEVICE_MARKER_VIEW_SIZE],
-				iconAnchor: [DEVICE_MARKER_VIEW_SIZE / 2, DEVICE_MARKER_VIEW_SIZE],
-			}))
-		},
-		lastPoint() {
-			return this.points.length > 0
-				? this.points[this.points.length - 1]
-				: null
-		},
-		mapIsUpdatable() {
-			return optionsController.optionValues?.isUpdateable
-		},
-	},
-
-	created() {
-	},
-
-	methods: {
-		onFGReady(f) {
-			// avoid left click popup
-			L.DomEvent.on(f, 'click', (ev) => {
-				f.closePopup()
-			})
-		},
-		onFGRightClick(e) {
-			this.$refs.featgroup.mapObject.openPopup()
-		},
-		deviceLineMouseover(e) {
-			const overLatLng = e.layer._map.layerPointToLatLng(e.layerPoint)
-			const closestPoint = this.device.points.reduce((target, p) => {
-				if (
-					(!p.timestamp || (p.timestamp >= this.start && p.timestamp <= this.end))
-						&& (e.layer._map.distance(overLatLng, [p.lat, p.lng]) < target.minDist)
-				) {
-					target.minDist = e.layer._map.distance(overLatLng, [p.lat, p.lng])
-					target.hoverPoint = p
-				}
-				return target
-			}, { minDist: 40000000, hoverPoint: null })
-			if (closestPoint.hoverPoint) {
-				const hoverPoint = {
-					...closestPoint.hoverPoint,
-					color: this.color,
-					user_agent: this.device.user_agent,
-				}
-				this.$emit('point-hover', hoverPoint)
-			}
-		},
-		deviceLastPointMouseover() {
-			const hoverPoint = {
-				...this.device.points[this.device.points.length - 1],
-				color: this.color,
-				user_agent: this.device.user_agent,
-			}
-			this.$emit('point-hover', hoverPoint)
-		},
-		isPublic() {
-			return isPublic()
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.tooltip-device-wrapper {
-	padding: 6px;
-	border-radius: 3px;
-	background-color: var(--color-main-background);
-	color: var(--color-main-text);
-}
-
-::v-deep .icon-colorpicker {
-	opacity: 1;
-	mask: url('../../../img/color_picker.svg') no-repeat;
-	-webkit-mask: url('../../../img/color_picker.svg') no-repeat;
-	background-color: var(--color-main-text);
-	padding: 0 !important;
-	mask-size: 16px auto;
-	mask-position: center;
-	-webkit-mask-size: 16px auto;
-	-webkit-mask-position: center;
-	width: 44px;
-	height: 44px;
-}
-</style>
diff --git a/src/components/map/DevicesLayer.vue b/src/components/map/DevicesLayer.vue
index 15907e1b6..0c645f8c3 100644
--- a/src/components/map/DevicesLayer.vue
+++ b/src/components/map/DevicesLayer.vue
@@ -1,140 +1,220 @@
 <template>
-	<LFeatureGroup>
-		<DeviceLayer v-for="device in displayedDevices"
-			:key="device.id + device.color"
-			:device="device"
-			:start="start"
-			:end="end"
-			@click="$emit('click', $event)"
-			@add-to-map-device="$emit('add-to-map-device', $event)"
-			@export="$emit('export', $event)"
-			@toggle-history="$emit('toggle-history', $event)"
-			@change-color="$emit('change-color', $event)"
-			@point-hover="onPointHover" />
-		<DeviceHoverMarker
-			v-if="hoverPoint"
-			:point="hoverPoint" />
+	<div style="display: none;">
 		<LHeatMap v-if="points.length >= 2500"
 			ref="devicesHeatMap"
+			:map="map"
 			:initial-points="points"
 			:options="optionsHeatMap" />
-	</LFeatureGroup>
+	</div>
 </template>
 
 <script>
-import { LFeatureGroup } from 'vue2-leaflet'
-
-import DeviceLayer from './DeviceLayer.vue'
-import DeviceHoverMarker from './DeviceHoverMarker.vue'
-
-import optionsController from '../../optionsController.js'
+import L from 'leaflet'
+import { isComputer } from '../../utils.js'
+import { binSearch, isPublic } from '../../utils/common.js'
 import moment from '@nextcloud/moment'
-import { binSearch } from '../../utils/common.js'
 import LHeatMap from './LHeatMap.vue'
+import optionsController from '../../optionsController.js'
+
+const DEVICE_MARKER_VIEW_SIZE = 40
 
 export default {
 	name: 'DevicesLayer',
 	components: {
-		LFeatureGroup,
 		LHeatMap,
-		DeviceLayer,
-		DeviceHoverMarker,
 	},
 
 	props: {
-		devices: {
-			type: Array,
-			required: true,
-		},
-		map: {
-			type: Object,
-			required: true,
-		},
-		start: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		end: {
-			type: Number,
-			required: false,
-			default: moment.unix(),
-		},
+		devices: { type: Array, required: true },
+		map: { type: Object, required: true },
+		start: { type: Number, default: 0 },
+		end: { type: Number, default: () => moment.unix() },
 	},
 
 	data() {
 		return {
 			optionsHeatMap: {
-				// minOpacity: null,
-				// maxZoom: null,
 				radius: 15,
 				blur: 10,
 				gradient: { 0.4: 'blue', 0.65: 'lime', 1: 'red' },
 			},
-			optionValues: optionsController.optionValues,
-			hoverPoint: null,
 		}
 	},
 
+	created() {
+		this.featureGroup = L.featureGroup();
+		this.deviceLayersMap = new Map(); // Store reference to markers/lines
+	},
+
 	computed: {
 		displayedDevices() {
-			return this.devices.filter(d => d.enabled && d.points.length > 0)
-		},
-		enabledDevices() {
-			return this.devices.map(d => d.enabled)
-		},
-		displayedDevicesHistories() {
-			return this.devices.map(d => d.enabled && d.historyEnabled)
+			return this.devices.filter(d => d.enabled && d.points && d.points.length > 0);
 		},
 		points() {
-			return this.devices.reduce((points, device) => {
+			return this.devices.reduce((pts, device) => {
 				if (device.enabled && device.historyEnabled) {
-					const lastNullIndex = binSearch(device.points, (p) => !p.timestamp)
-					const firstShownIndex = binSearch(device.points, (p) => (p.timestamp || 0) < this.start) + 1
-					const lastShownIndex = binSearch(device.points, (p) => (p.timestamp || 0) < this.end)
+					const lastNullIndex = binSearch(device.points, (p) => !p.timestamp);
+					const firstShownIndex = binSearch(device.points, (p) => (p.timestamp || 0) < this.start) + 1;
+					const lastShownIndex = binSearch(device.points, (p) => (p.timestamp || 0) < this.end);
 					if (lastNullIndex + 1 + lastShownIndex - firstShownIndex + 1 > 2500) {
 						const filteredDevicePoints = [
 							...device.points.slice(0, lastNullIndex + 1),
 							...device.points.slice(firstShownIndex, lastShownIndex + 1),
-						]
-						const deviceLatLngs = filteredDevicePoints.map((p) => [p.lat, p.lng])
-						points = points.concat(deviceLatLngs)
+						];
+						pts = pts.concat(filteredDevicePoints.map((p) => [p.lat, p.lng]));
 					}
 				}
-				return points
-			}, [])
+				return pts;
+			}, []);
 		},
 	},
 
 	watch: {
-		enabledDevices() {
-			this.hoverPoint = null
-		},
-		displayedDevicesHistories() {
-			if (this.$refs.devicesHeatMap) {
-				this.$refs.devicesHeatMap.setLatLngs(this.points)
-			}
-		},
-		start() {
-			if (this.$refs.devicesHeatMap) {
-				this.$refs.devicesHeatMap.setLatLngs(this.points)
-			}
-		},
-		end() {
-			if (this.$refs.devicesHeatMap) {
-				this.$refs.devicesHeatMap.setLatLngs(this.points)
-			}
-		},
+		displayedDevices: { handler: 'renderDevices', deep: true },
+		start: 'renderDevices',
+		end: 'renderDevices',
+	},
+
+	mounted() {
+		this.featureGroup.addTo(this.map);
+		this.renderDevices();
+	},
+
+	beforeUnmount() {
+		if (this.featureGroup && this.map) {
+			this.map.removeLayer(this.featureGroup);
+		}
 	},
 
 	methods: {
-		onPointHover(point) {
-			this.hoverPoint = point
+		isPublic() { return isPublic() },
+		
+		getDevicePoints(device) {
+			const lastNullIndex = binSearch(device.points, (p) => !p.timestamp);
+			const firstShownIndex = binSearch(device.points, (p) => (p.timestamp || 0) < this.start) + 1;
+			const lastShownIndex = binSearch(device.points, (p) => (p.timestamp || 0) < this.end);
+			const filtered = [
+				...device.points.slice(0, lastNullIndex + 1),
+				...device.points.slice(firstShownIndex, lastShownIndex + 1),
+			];
+			return filtered.map((p) => [p.lat, p.lng]);
 		},
+
+		renderDevices() {
+			this.featureGroup.clearLayers();
+			this.deviceLayersMap.clear();
+
+			this.displayedDevices.forEach(device => {
+				const points = this.getDevicePoints(device);
+				if (points.length === 0) return;
+
+				const lastPoint = points[points.length - 1];
+				const color = device.color || '#0082c9';
+				const thumbnailClass = isComputer(device.user_agent) ? 'desktop' : 'phone';
+
+				// Wrapper group for marker and line
+				const deviceGroup = L.featureGroup();
+
+				// Marker
+				const marker = L.marker(lastPoint, {
+					icon: L.divIcon({
+						html: `<div class="thumbnail-wrapper" style="--custom-color: ${color}; border-color: ${color};"><div class="thumbnail ${thumbnailClass}" style="background-color: ${color};"></div></div>​`,
+						className: 'leaflet-marker-device device-marker',
+						iconSize: [DEVICE_MARKER_VIEW_SIZE, DEVICE_MARKER_VIEW_SIZE],
+						iconAnchor: [DEVICE_MARKER_VIEW_SIZE / 2, DEVICE_MARKER_VIEW_SIZE],
+					})
+				});
+
+				marker.bindTooltip(`
+					<div class="tooltip-device-wrapper" style="border: 2px solid ${color}">
+						<b>${t('maps', 'Name')}:</b> <span>${device.user_agent}</span>
+					</div>
+				`, { sticky: true, className: 'leaflet-marker-device-tooltip', direction: 'top', offset: L.point(0, 0) });
+
+				marker.on('mouseover', () => this.$emit('point-hover', { ...device.points[device.points.length - 1], color, user_agent: device.user_agent }));
+				marker.on('click', () => this.$emit('click', device));
+				marker.on('contextmenu', (e) => this.showDevicePopup(e, device));
+
+				deviceGroup.addLayer(marker);
+
+				// History Polyline
+				if (device.historyEnabled && points.length <= 2500) {
+					const lineBg = L.polyline(points, { color: 'black', opacity: 1, weight: 4 * 1.6 });
+					const lineFg = L.polyline(points, { color: color, opacity: 1, weight: 4 });
+					
+					const lineGroup = L.featureGroup([lineBg, lineFg]);
+					lineGroup.on('mouseover', (e) => this.onDeviceLineMouseover(e, device, color));
+					lineGroup.on('contextmenu', (e) => this.showDevicePopup(e, device));
+
+					deviceGroup.addLayer(lineGroup);
+				}
+
+				this.featureGroup.addLayer(deviceGroup);
+				this.deviceLayersMap.set(device.id, deviceGroup);
+			});
+		},
+
+		showDevicePopup(e, device) {
+			const mapIsUpdatable = optionsController.optionValues?.isUpdateable;
+			const popupContent = L.DomUtil.create('div', 'popup-device-wrapper');
+			
+			popupContent.innerHTML = `
+				<button class="action-btn" data-action="history">${device.historyEnabled ? t('maps', 'Hide history') : t('maps', 'Show history')}</button>
+				${mapIsUpdatable ? `<button class="action-btn" data-action="color">${t('maps', 'Change color')}</button>` : ''}
+				<button class="action-btn" data-action="export">${t('maps', 'Export')}</button>
+				${!this.isPublic() ? `<button class="action-btn" data-action="link">${t('maps', 'Link to map')}</button>` : ''}
+			`;
+
+			popupContent.addEventListener('click', (event) => {
+				const action = event.target.getAttribute('data-action');
+				if (action === 'history') this.$emit('toggle-history', device);
+				if (action === 'color') this.$emit('change-color', device);
+				if (action === 'export') this.$emit('export', device);
+				if (action === 'link') this.$emit('add-to-map-device', device);
+				this.map.closePopup();
+			});
+
+			L.popup({ closeButton: false, className: 'popovermenu open popupMarker devicePopup', offset: L.point(-5, -20) })
+				.setLatLng(e.latlng)
+				.setContent(popupContent)
+				.openOn(this.map);
+		},
+
+		onDeviceLineMouseover(e, device, color) {
+			const overLatLng = e.layer._map.layerPointToLatLng(e.layerPoint);
+			const closestPoint = device.points.reduce((target, p) => {
+				if ((!p.timestamp || (p.timestamp >= this.start && p.timestamp <= this.end)) && (e.layer._map.distance(overLatLng, [p.lat, p.lng]) < target.minDist)) {
+					target.minDist = e.layer._map.distance(overLatLng, [p.lat, p.lng]);
+					target.hoverPoint = p;
+				}
+				return target;
+			}, { minDist: 40000000, hoverPoint: null });
+
+			if (closestPoint.hoverPoint) {
+				this.$emit('point-hover', { ...closestPoint.hoverPoint, color, user_agent: device.user_agent });
+			}
+		}
 	},
 }
 </script>
 
-<style lang="scss" scoped>
-// nothing
-</style>
+<style lang="scss">
+.tooltip-device-wrapper {
+	padding: 6px;
+	border-radius: 3px;
+	background-color: var(--color-main-background);
+	color: var(--color-main-text);
+}
+.popup-device-wrapper .action-btn {
+	display: block;
+	width: 100%;
+	padding: 8px;
+	border: none;
+	background: transparent;
+	text-align: left;
+	cursor: pointer;
+}
+.popup-device-wrapper .action-btn:hover {
+	background: var(--color-background-hover);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/map/FavoriteMarker.vue b/src/components/map/FavoriteMarker.vue
deleted file mode 100644
index 64c96a8ea..000000000
--- a/src/components/map/FavoriteMarker.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-	<LMarker
-		ref="marker"
-		:options="{ data: favorite }"
-		:icon="icon"
-		:lat-lng="[favorite.lat, favorite.lng]"
-		:draggable="draggable && favorite.isUpdateable"
-		@ready="onMarkerReady"
-		@contextmenu="onRightClick"
-		@click="$emit('click', favorite)"
-		@moveend="onMoved">
-		<LTooltip
-			:options="{ ...tooltipOptions, opacity: draggable && favorite.isUpdateable ? 0 : 1 }">
-			<div class="tooltip-favorite-wrapper"
-				:style="'border: 2px solid #' + color">
-				<b>{{ t('maps', 'Name') }}:</b>
-				<span>{{ favorite.name || t('maps', 'No name') }}</span>
-				<br>
-				<b>{{ t('maps', 'Category') }}:</b>
-				<span>{{ favorite.category }}</span>
-				<br v-if="favorite.comment">
-				<b v-if="favorite.comment">{{ t('maps', 'Comment') }}:</b>
-				<span v-if="favorite.comment">{{ favorite.comment }}</span>
-			</div>
-		</LTooltip>
-		<LPopup
-			class="popup-favorite-wrapper"
-			:options="popupOptions">
-			<NcActionButton v-if="favorite.isDeletable" icon="icon-delete" @click="$emit('delete', favorite.id)">
-				{{ t('maps', 'Delete favorite') }}
-			</NcActionButton>
-			<NcActionButton v-if="!isPublic()"
-				icon="icon-share"
-				@click="$emit('add-to-map-favorite', favorite)">
-				{{ t('maps', 'Copy to map') }}
-			</NcActionButton>
-		</LPopup>
-	</LMarker>
-</template>
-
-<script>
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-
-import L from 'leaflet'
-import { LMarker, LTooltip, LPopup } from 'vue2-leaflet'
-import { isPublic } from '../../utils/common'
-
-export default {
-	name: 'FavoriteMarker',
-
-	components: {
-		LMarker,
-		LTooltip,
-		LPopup,
-		NcActionButton,
-	},
-
-	props: {
-		favorite: {
-			type: Object,
-			required: true,
-		},
-		categories: {
-			type: Object,
-			required: true,
-		},
-		icon: {
-			type: Object,
-			required: true,
-		},
-		color: {
-			type: String,
-			required: true,
-		},
-		draggable: {
-			type: Boolean,
-			default: false,
-		},
-	},
-
-	data() {
-		return {
-			tooltipOptions: {
-				className: 'leaflet-marker-favorite-tooltip',
-				direction: 'top',
-				offset: L.point(0, 0),
-			},
-			popupOptions: {
-				closeButton: false,
-				closeOnClick: false,
-				className: 'popovermenu open popupMarker favoritePopup',
-				offset: L.point(-5, 10),
-			},
-		}
-	},
-
-	computed: {
-	},
-
-	beforeMount() {
-	},
-
-	methods: {
-		onMoved(e) {
-			const editedFav = {
-				...this.favorite,
-				lat: e.target.getLatLng().lat,
-				lng: e.target.getLatLng().lng,
-			}
-			this.$emit('edit', editedFav)
-		},
-		onMarkerReady(m) {
-			// avoid left click popup
-			L.DomEvent.on(m, 'click', (ev) => {
-				m.closePopup()
-			})
-		},
-		onRightClick(e) {
-			this.$refs.marker.mapObject.openPopup()
-		},
-		isPublic() {
-			return isPublic()
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.tooltip-favorite-wrapper {
-	padding: 6px;
-	border-radius: 3px;
-	background-color: var(--color-main-background);
-	color: var(--color-main-text);
-}
-</style>
diff --git a/src/components/map/FavoritesLayer.vue b/src/components/map/FavoritesLayer.vue
index 4eb3e4a6a..6be4ae247 100644
--- a/src/components/map/FavoritesLayer.vue
+++ b/src/components/map/FavoritesLayer.vue
@@ -1,215 +1,238 @@
 <template>
-	<Vue2LeafletMarkerCluster :options="clusterOptions"
-		@clusterclick="onClusterClick"
-		@clustercontextmenu="onClusterRightClick"
-		@spiderfied="onSpiderfied">
-		<FavoriteMarker v-for="f in displayedFavorites"
-			:key="f.id + f.name + f.category"
-			:favorite="f"
-			:categories="categories"
-			:draggable="draggable"
-			:color="categories[f.category].color"
-			:icon="getFavoriteMarkerIcon(f)"
-			@click="$emit('click', $event)"
-			@add-to-map-favorite="$emit('add-to-map-favorite', $event)"
-			@edit="$emit('edit', $event)"
-			@delete="$emit('delete', $event)" />
-		<LMarker
-			:lat-lng="[0, 0]"
-			:visible="false">
-			<LPopup
-				ref="clusterPopup"
-				class="popup-favorite-wrapper"
-				:options="clusterPopupOptions">
-				<NcActionButton v-if="!readOnly" icon="icon-delete" @click="onDeleteClusterClick">
-					{{ t('maps', 'Delete favorites') }}
-				</NcActionButton>
-				<NcActionButton icon="icon-search" @click="onZoomClusterClick">
-					{{ t('maps', 'Zoom on bounds') }}
-				</NcActionButton>
-			</LPopup>
-		</LMarker>
-	</Vue2LeafletMarkerCluster>
+	<div style="display: none;"></div>
 </template>
 
 <script>
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-
 import L from 'leaflet'
-import { LMarker, LPopup } from 'vue2-leaflet'
-import Vue2LeafletMarkerCluster from 'vue2-leaflet-markercluster'
-
-import FavoriteMarker from './FavoriteMarker.vue'
+import 'leaflet.markercluster'
 import optionsController from '../../optionsController.js'
+import { isPublic } from '../../utils/common.js'
 
 const CLUSTER_MARKER_VIEW_SIZE = 36
 
 export default {
 	name: 'FavoritesLayer',
-	components: {
-		LMarker,
-		LPopup,
-		Vue2LeafletMarkerCluster,
-		NcActionButton,
-		FavoriteMarker,
-	},
 
 	props: {
-		map: {
-			type: Object,
-			required: true,
-		},
-		favorites: {
-			type: Object,
-			required: true,
-		},
-		categories: {
-			type: Object,
-			required: true,
-		},
-		draggable: {
-			type: Boolean,
-			default: false,
-		},
+		map: { type: Object, required: true },
+		favorites: { type: Object, required: true },
+		categories: { type: Object, required: true },
+		draggable: { type: Boolean, default: false },
 	},
 
 	data() {
 		return {
-			optionValues: optionsController.optionValues,
-			clusterOptions: {
-				iconCreateFunction: this.getClusterMarkerIcon,
-				spiderfyOnMaxZoom: false,
-				showCoverageOnHover: false,
-				zoomToBoundsOnClick: false,
-				maxClusterRadius: CLUSTER_MARKER_VIEW_SIZE + 10,
-				icon: {
-					iconSize: [CLUSTER_MARKER_VIEW_SIZE, CLUSTER_MARKER_VIEW_SIZE],
-					iconAnchor: [CLUSTER_MARKER_VIEW_SIZE / 2, CLUSTER_MARKER_VIEW_SIZE],
-				},
-			},
-			clusterPopupOptions: {
-				closeOnClick: false,
-				className: 'popovermenu open popupMarker favoritePopup',
-				offset: L.point(-5, 20),
-			},
-			contextCluster: null,
 			spiderfied: false,
 		}
 	},
 
+	created() {
+		this.clusterGroup = null;
+		this.favoriteMarkers = [];
+	},
+
 	computed: {
 		readOnly() {
-			const farray = Object.values(this.favorites)
-			return !farray.some((f) => (f.isUpdateable))
-				&& !(farray.length === 0 && optionsController.optionValues?.isCreatable)
+			const farray = Object.values(this.favorites);
+			return !farray.some((f) => f.isUpdateable) && !(farray.length === 0 && optionsController.optionValues?.isCreatable);
 		},
 		displayedFavorites() {
 			const favIds = Object.keys(this.favorites).filter((fid) => {
-				const catid = this.favorites[fid].category
-				return this.categories[catid].enabled
-			})
-			return favIds.map((fid) => {
-				return this.favorites[fid]
-			})
-		},
-		categoryIcons() {
-			const icons = {}
-			Object.keys(this.categories).forEach((catid) => {
-				const color = this.categories[catid].color
-				icons[catid] = L.divIcon({
-					iconAnchor: [18, 18],
-					className: 'leaflet-marker-favorite',
-					// html: '<div class="favoriteMarker ' + darkClass + '" style="background-color: #' + color + '"></div>',
-					html: '<div class="favoriteMarker icon-star-white" style="background-color: #' + color + ';"></div>',
-				})
-			})
-			return icons
-		},
-		categoryIconsSelected() {
-			const icons = {}
-			Object.keys(this.categories).forEach((catid) => {
-				const color = this.categories[catid].color
-				icons[catid] = L.divIcon({
-					iconAnchor: [18, 18],
-					className: 'leaflet-marker-favorite',
-					// html: '<div class="favoriteMarker ' + darkClass + '" style="background-color: #' + color + '"></div>',
-					html: '<div class="favoriteMarker selected icon-star-white" style="background-color: #' + color + ';"></div>',
-				})
-			})
-			return icons
-		},
+				const catid = this.favorites[fid].category;
+				return this.categories[catid]?.enabled;
+			});
+			return favIds.map(fid => this.favorites[fid]);
+		}
 	},
 
-	beforeMount() {
+	watch: {
+		displayedFavorites: { handler: 'renderMarkers', deep: true },
+		categories: { handler: 'renderMarkers', deep: true },
+		draggable: 'updateDraggableState'
+	},
+
+	mounted() {
+		this.clusterGroup = L.markerClusterGroup({
+			iconCreateFunction: this.getClusterMarkerIcon.bind(this),
+			spiderfyOnMaxZoom: false,
+			showCoverageOnHover: false,
+			zoomToBoundsOnClick: false,
+			maxClusterRadius: CLUSTER_MARKER_VIEW_SIZE + 10,
+		});
+
+		this.clusterGroup.on('clusterclick', this.onClusterClick.bind(this));
+		this.clusterGroup.on('clustercontextmenu', this.onClusterRightClick.bind(this));
+		this.clusterGroup.on('spiderfied', this.onSpiderfied.bind(this));
+
+		this.map.addLayer(this.clusterGroup);
+		this.renderMarkers();
+	},
+
+	beforeUnmount() {
+		if (this.clusterGroup && this.map) {
+			this.map.removeLayer(this.clusterGroup);
+		}
 	},
 
 	methods: {
+		isPublic() { return isPublic() },
+
+		renderMarkers() {
+			this.clusterGroup.clearLayers();
+			
+			this.favoriteMarkers = this.displayedFavorites.map((f) => {
+				const color = this.categories[f.category]?.color || '0082c9';
+				const icon = this.getFavoriteMarkerIcon(f, color);
+
+				const marker = L.marker([f.lat, f.lng], {
+					draggable: this.draggable && f.isUpdateable,
+					icon: icon
+				});
+				
+				marker.data = f;
+
+				// Tooltip
+				const tooltipHtml = `
+					<div class="tooltip-favorite-wrapper" style="border: 2px solid #${color}">
+						<b>${window.t('maps', 'Name')}:</b> <span>${f.name || window.t('maps', 'No name')}</span><br>
+						<b>${window.t('maps', 'Category')}:</b> <span>${f.category}</span>
+						${f.comment ? `<br><b>${window.t('maps', 'Comment')}:</b> <span>${f.comment}</span>` : ''}
+					</div>
+				`;
+				marker.bindTooltip(tooltipHtml, {
+					className: 'leaflet-marker-favorite-tooltip',
+					direction: 'top',
+					offset: L.point(0, 0),
+					opacity: (this.draggable && f.isUpdateable) ? 0 : 1
+				});
+
+				// Events
+				marker.on('click', () => this.$emit('click', f));
+				marker.on('contextmenu', (e) => this.onMarkerRightClick(e, f));
+				marker.on('moveend', (e) => {
+					const pos = e.target.getLatLng();
+					this.$emit('edit', { ...f, lat: pos.lat, lng: pos.lng });
+				});
+
+				return marker;
+			});
+
+			this.clusterGroup.addLayers(this.favoriteMarkers);
+		},
+
+		updateDraggableState() {
+			this.favoriteMarkers.forEach(m => {
+				if (m.dragging && m.data.isUpdateable) {
+					this.draggable ? m.dragging.enable() : m.dragging.disable();
+					m.setTooltipContent(m.getTooltip().getContent()); // Refresh tooltip opacity
+				}
+			});
+		},
+
+		onMarkerRightClick(e, f) {
+			const popupContent = L.DomUtil.create('div', 'popup-favorite-wrapper');
+			popupContent.innerHTML = `
+				${f.isDeletable ? `<button class="action-btn" data-action="delete">${window.t('maps', 'Delete favorite')}</button>` : ''}
+				${!this.isPublic() ? `<button class="action-btn" data-action="copy">${window.t('maps', 'Copy to map')}</button>` : ''}
+			`;
+
+			popupContent.addEventListener('click', (event) => {
+				const action = event.target.getAttribute('data-action');
+				if (action === 'delete') this.$emit('delete', f.id);
+				if (action === 'copy') this.$emit('add-to-map-favorite', f);
+				this.map.closePopup();
+			});
+
+			L.popup({ closeButton: false, className: 'popovermenu open popupMarker favoritePopup', offset: L.point(-5, 10) })
+				.setLatLng(e.latlng)
+				.setContent(popupContent)
+				.openOn(this.map);
+		},
+
 		onClusterClick(a) {
-			if (a.layer.getChildCount() > 10 && a.layer._map.getZoom() !== a.layer._map.getMaxZoom()) {
-				a.layer.zoomToBounds()
+			if (a.layer.getChildCount() > 10 && this.map.getZoom() !== this.map.getMaxZoom()) {
+				a.layer.zoomToBounds();
 			} else {
-				a.layer.spiderfy()
+				a.layer.spiderfy();
 			}
 		},
+
 		onClusterRightClick(a) {
-			this.contextCluster = a.layer
-			const popup = this.$refs.clusterPopup.mapObject
-			popup.setLatLng(a.latlng)
-			this.$nextTick(() => {
-				popup.openOn(this.map)
-			})
-		},
-		onDeleteClusterClick() {
-			const favorites = this.contextCluster.getAllChildMarkers().map((m) => {
-				return m.options.data
-			})
-			const favIds = favorites.map((f) => {
-				return f.id
-			})
-			this.$emit('delete-multiple', favIds)
-			this.map.closePopup()
+			const popupContent = L.DomUtil.create('div', 'popup-favorite-wrapper');
+			popupContent.innerHTML = `
+				${!this.readOnly ? `<button class="action-btn" data-action="delete">${window.t('maps', 'Delete favorites')}</button>` : ''}
+				<button class="action-btn" data-action="zoom">${window.t('maps', 'Zoom on bounds')}</button>
+			`;
+
+			popupContent.addEventListener('click', (event) => {
+				const action = event.target.getAttribute('data-action');
+				if (action === 'delete') {
+					const favIds = a.layer.getAllChildMarkers().map(m => m.data.id);
+					this.$emit('delete-multiple', favIds);
+				}
+				if (action === 'zoom') {
+					if (this.map.getZoom() !== this.map.getMaxZoom()) a.layer.zoomToBounds();
+				}
+				this.map.closePopup();
+			});
+
+			L.popup({ closeOnClick: false, className: 'popovermenu open popupMarker favoritePopup', offset: L.point(-5, 20) })
+				.setLatLng(a.latlng)
+				.setContent(popupContent)
+				.openOn(this.map);
 		},
-		onZoomClusterClick() {
-			const cluster = this.contextCluster
-			if (this.map.getZoom() !== this.map.getMaxZoom()) {
-				cluster.zoomToBounds()
+
+		onSpiderfied(e) {
+			if (this.draggable) {
+				e.markers.forEach((m) => {
+					if (m.data && m.data.isUpdateable) m.dragging.enable();
+				});
 			}
-			this.map.closePopup()
+			this.spiderfied = true;
 		},
+
 		getClusterMarkerIcon(cluster) {
-			const favorite = cluster.getAllChildMarkers()[0].options.data
-			const catid = favorite.category
-			const color = this.categories[catid].color
-			const label = cluster.getChildCount()
-			return new L.DivIcon(L.extend({
+			const favorite = cluster.getAllChildMarkers()[0].data;
+			const color = this.categories[favorite.category]?.color || '0082c9';
+			const label = cluster.getChildCount();
+			
+			return new L.DivIcon({
 				className: 'leaflet-marker-favorite-cluster cluster-marker',
-				// html: '<div class="favoriteClusterMarker ' + darkClass + '" style="background-color: #' + color + '"></div>'
-				html: '<div class="favoriteClusterMarker icon-star-white" style="background-color: #' + color + ';"></div>'
-					+ '​<span class="label">' + label + '</span>',
-			}, cluster, {
+				html: `<div class="favoriteClusterMarker icon-star-white" style="background-color: #${color};"></div>​<span class="label">${label}</span>`,
 				iconSize: [CLUSTER_MARKER_VIEW_SIZE, CLUSTER_MARKER_VIEW_SIZE],
 				iconAnchor: [CLUSTER_MARKER_VIEW_SIZE / 2, CLUSTER_MARKER_VIEW_SIZE],
-			}))
-		},
-		getFavoriteMarkerIcon(favorite) {
-			return favorite.selected
-				? this.categoryIconsSelected[favorite.category]
-				: this.categoryIcons[favorite.category]
+			});
 		},
-		onSpiderfied(e) {
-			// markers that were in a cluster when draggable changed are not draggable
-			// so we set them when cluster is spiderfied
-			if (this.draggable) {
-				e.markers.forEach((m) => {
-					m.dragging.enable()
-				})
-			}
-			this.spiderfied = true
+
+		getFavoriteMarkerIcon(favorite, color) {
+			const selectedClass = favorite.selected ? 'selected' : '';
+			return L.divIcon({
+				iconAnchor: [18, 18],
+				className: 'leaflet-marker-favorite',
+				html: `<div class="favoriteMarker icon-star-white ${selectedClass}" style="background-color: #${color};"></div>`,
+			});
 		},
 	},
 }
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss">
+.tooltip-favorite-wrapper {
+	padding: 6px;
+	border-radius: 3px;
+	background-color: var(--color-main-background);
+	color: var(--color-main-text);
+}
+.popup-favorite-wrapper .action-btn {
+	display: block;
+	width: 100%;
+	padding: 8px;
+	border: none;
+	background: transparent;
+	text-align: left;
+	cursor: pointer;
+}
+.popup-favorite-wrapper .action-btn:hover {
+	background: var(--color-background-hover);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/map/HistoryControl.vue b/src/components/map/HistoryControl.vue
index 060f0ad3f..050ccef13 100644
--- a/src/components/map/HistoryControl.vue
+++ b/src/components/map/HistoryControl.vue
@@ -1,6 +1,5 @@
 <template>
-	<LControl class="maps-history-control"
-		:position="position">
+	<div ref="controlContent" class="maps-history-control leaflet-control">
 		<div id="history">
 			<button
 				v-if="lastActions.length"
@@ -15,20 +14,20 @@
 				<span class="icon icon-redo" />
 			</button>
 		</div>
-	</LControl>
+	</div>
 </template>
 
 <script>
-import { LControl } from 'vue2-leaflet'
+import L from 'leaflet'
 
 export default {
 	name: 'HistoryControl',
 
-	components: {
-		LControl,
-	},
-
 	props: {
+		map: {
+			type: Object,
+			required: true,
+		},
 		lastActions: {
 			type: Array,
 			required: true,
@@ -43,11 +42,6 @@ export default {
 		},
 	},
 
-	data() {
-		return {
-		}
-	},
-
 	computed: {
 		lastActionLabel() {
 			const action = this.lastActions[this.lastActions.length - 1]
@@ -59,10 +53,31 @@ export default {
 		},
 	},
 
-	watch: {
+	created() {
+		this.control = null;
 	},
 
-	created() {
+	mounted() {
+		const el = this.$refs.controlContent;
+		if (!el) return;
+
+		// Create native Leaflet Control
+		const CustomControl = L.Control.extend({
+			onAdd: () => el
+		});
+
+		this.control = new CustomControl({ position: this.position });
+		this.control.addTo(this.map);
+
+		// Prevent clicks/scrolls from falling through to the map
+		L.DomEvent.disableClickPropagation(el);
+		L.DomEvent.disableScrollPropagation(el);
+	},
+
+	beforeUnmount() {
+		if (this.control && this.map) {
+			this.map.removeControl(this.control);
+		}
 	},
 
 	methods: {
@@ -116,4 +131,4 @@ export default {
 		-webkit-mask-position: center;
 	}
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/map/LHeatMap.vue b/src/components/map/LHeatMap.vue
index 7bc73b839..eb354fd14 100644
--- a/src/components/map/LHeatMap.vue
+++ b/src/components/map/LHeatMap.vue
@@ -1,83 +1,77 @@
 <template>
-	<div style="display: none;">
-		<slot v-if="ready" />
-	</div>
+	<div style="display: none;"></div>
 </template>
 
 <script>
+import L from 'leaflet'
 import 'leaflet.heat/dist/leaflet-heat.js'
-import { findRealParent, propsBinder } from 'vue2-leaflet'
-import { DomEvent } from 'leaflet'
-
-const props = {
-	initialPoints: {
-		type: Array,
-		required: false,
-		default() { return [] },
-	},
-	options: {
-		type: Object,
-		default() { return {} },
-	},
-}
 
 export default {
-	props,
+	name: 'LHeatMap',
+	props: {
+		map: {
+			type: Object,
+			required: true,
+		},
+		initialPoints: {
+			type: Array,
+			required: false,
+			default: () => [],
+		},
+		options: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
 	data() {
 		return {
-			points: null,
 			ready: false,
 		}
 	},
 	watch: {
 		options: {
 			handler(newOptions) {
-				this.mapObject.setOptions(newOptions)
+				if (this.heatLayer) {
+					this.heatLayer.setOptions(newOptions)
+				}
 			},
 			deep: true,
 		},
-		points: {
+		initialPoints: {
 			handler(newPoints) {
-				this.mapObject.setLatLngs(newPoints)
+				if (this.heatLayer) {
+					this.heatLayer.setLatLngs(newPoints)
+				}
 			},
 			deep: true,
 		},
 	},
+	created() {
+		this.heatLayer = null; // Non-reactive leaflet object
+	},
 	mounted() {
-		this.points = this.initialPoints
-		this.mapObject = L.heatLayer(this.points, this.options)
-		DomEvent.on(this.mapObject, this.$listeners)
-		propsBinder(this, this.mapObject, props)
+		this.heatLayer = L.heatLayer(this.initialPoints, this.options)
+		this.heatLayer.addTo(this.map)
 		this.ready = true
-		this.parentContainer = findRealParent(this.$parent)
-		this.parentContainer.addLayer(this)
 		this.$nextTick(() => {
-			this.$emit('ready', this.mapObject)
+			this.$emit('ready', this.heatLayer)
 		})
 	},
-	beforeDestroy() {
-		this.parentContainer.removeLayer(this)
+	beforeUnmount() {
+		if (this.heatLayer && this.map) {
+			this.map.removeLayer(this.heatLayer)
+		}
 	},
 	methods: {
-		addLayer(layer, alreadyAdded) {
-			if (!alreadyAdded) {
-				this.mapObject.addLayer(layer.mapObject)
-			}
-		},
-		removeLayer(layer, alreadyRemoved) {
-			if (!alreadyRemoved) {
-				this.mapObject.removeLayer(layer.mapObject)
-			}
-		},
 		addLatLng(latlng) {
-			this.mapObject.addLatLng(latlng)
+			if (this.heatLayer) this.heatLayer.addLatLng(latlng)
 		},
 		setLatLngs(latlngs) {
-			this.mapObject.setLatLngs(latlngs)
+			if (this.heatLayer) this.heatLayer.setLatLngs(latlngs)
 		},
 		redraw() {
-			this.mapObject.redraw()
+			if (this.heatLayer) this.heatLayer.redraw()
 		},
 	},
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/src/components/map/PhotoSuggestionsLayer.vue b/src/components/map/PhotoSuggestionsLayer.vue
index da3729497..164154d44 100644
--- a/src/components/map/PhotoSuggestionsLayer.vue
+++ b/src/components/map/PhotoSuggestionsLayer.vue
@@ -1,72 +1,13 @@
 <template>
-	<Vue2LeafletMarkerCluster
-		ref="markerCluster"
-		:options="clusterOptions"
-		@clusterclick="onClusterClick"
-		@clustercontextmenu="onClusterRightClick"
-		@spiderfied="onSpiderfied">
-		<LMarker
-			:lat-lng="[0, 0]"
-			:visible="false">
-			<LTooltip
-				ref="markerTooltip"
-				:class="{
-					'tooltip-photo-suggestion-wrapper': true,
-					'photo-suggestion-marker-selected': photoSuggestionsSelectedIndices.includes(currentSuggestion?.i)
-				}"
-				:options="{ ...tooltipOptions, opacity: draggable ? 0 : 1 }">
-				<img class="photo-suggestion-tooltip"
-					:src="getPreviewUrl(currentSuggestion)">
-				<p class="tooltip-photo-suggestion-date">
-					{{ getPhotoFormattedDate(currentSuggestion) }}
-				</p>
-				<p class="tooltip-photo-suggestion-name">
-					{{ currentSuggestion ? basename(currentSuggestion.path) : '' }}
-				</p>
-			</LTooltip>
-			<LPopup
-				ref="markerPopup"
-				class="popup-photo-wrapper"
-				:options="popupOptions">
-				<NcActionButton icon="icon-toggle" @click="viewPhoto(currentSuggestion)">
-					{{ t('maps', 'Display picture') }}
-				</NcActionButton>
-			</LPopup>
-		</LMarker>
-		<LMarker
-			:lat-lng="[0, 0]"
-			:visible="false">
-			<LPopup
-				ref="clusterPopup"
-				class="popup-photo-suggestion-wrapper"
-				:options="clusterPopupOptions">
-				<NcActionButton icon="icon-checkmark" @click="onSelectAll">
-					{{ t('maps', 'Select All') }}
-				</NcActionButton>
-				<NcActionButton icon="icon-toggle" @click="onDisplayClusterClick">
-					{{ t('maps', 'Display pictures') }}
-				</NcActionButton>
-				<NcActionButton icon="icon-toggle-pictures" @click="onSpiderfyClusterClick">
-					{{ t('maps', 'Spiderfy') }}
-				</NcActionButton>
-				<NcActionButton icon="icon-search" @click="onZoomClusterClick">
-					{{ t('maps', 'Zoom on bounds') }}
-				</NcActionButton>
-			</LPopup>
-		</LMarker>
-	</Vue2LeafletMarkerCluster>
+	<div style="display: none;"></div>
 </template>
 
 <script>
+import L from 'leaflet'
+import 'leaflet.markercluster'
 import { generateUrl } from '@nextcloud/router'
 import moment from '@nextcloud/moment'
 import { basename } from '@nextcloud/paths'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-
-import L from 'leaflet'
-import { LMarker, LTooltip, LPopup } from 'vue2-leaflet'
-import Vue2LeafletMarkerCluster from 'vue2-leaflet-markercluster'
-
 import optionsController from '../../optionsController.js'
 import { binSearch, getToken } from '../../utils/common.js'
 
@@ -74,423 +15,275 @@ const PHOTO_MARKER_VIEW_SIZE = 40
 
 export default {
 	name: 'PhotoSuggestionsLayer',
-	components: {
-		Vue2LeafletMarkerCluster,
-		LMarker,
-		LTooltip,
-		LPopup,
-		NcActionButton,
-	},
-
 	props: {
-		map: {
-			type: Object,
-			required: true,
-		},
-		photoSuggestions: {
-			type: Array,
-			required: true,
-		},
-		photoSuggestionsTracksAndDevices: {
-			type: Object,
-			required: true,
-		},
-		photoSuggestionsSelectedIndices: {
-			type: Array,
-			required: true,
-		},
-		dateFilterEnabled: {
-			type: Boolean,
-			required: true,
-		},
-		dateFilterStart: {
-			type: Number,
-			required: true,
-		},
-		dateFilterEnd: {
-			type: Number,
-			required: true,
-		},
-		draggable: {
-			type: Boolean,
-			required: true,
-		},
+		map: { type: Object, required: true },
+		photoSuggestions: { type: Array, required: true },
+		photoSuggestionsTracksAndDevices: { type: Object, required: true },
+		photoSuggestionsSelectedIndices: { type: Array, required: true },
+		dateFilterEnabled: { type: Boolean, required: true },
+		dateFilterStart: { type: Number, required: true },
+		dateFilterEnd: { type: Number, required: true },
+		draggable: { type: Boolean, required: true },
 	},
 
 	data() {
 		return {
-			optionValues: optionsController.optionValues,
-			clusterOptions: {
-				iconCreateFunction: this.getClusterMarkerIcon,
-				spiderfyOnMaxZoom: false,
-				singleMarkerMode: true,
-				showCoverageOnHover: false,
-				zoomToBoundsOnClick: false,
-				maxClusterRadius: PHOTO_MARKER_VIEW_SIZE + 10,
-				icon: {
-					iconSize: [PHOTO_MARKER_VIEW_SIZE, PHOTO_MARKER_VIEW_SIZE],
-				},
-				chunkedLoading: true,
-				chunkDelay: 50,
-				chunkInterval: 250,
-				chunkProgress: this.updateClusterLoadingProgress,
-			},
-			tooltipOptions: {
-				className: 'leaflet-marker-photo-suggestion-tooltip',
-				direction: 'right',
-				offset: L.point(0, -30),
-			},
-			popupOptions: {
-				closeOnClick: false,
-				className: 'popovermenu open popupMarker photoPopup',
-				offset: L.point(-5, -20),
-			},
-			clusterPopupOptions: {
-				closeOnClick: false,
-				className: 'popovermenu open popupMarker photoPopup',
-				offset: L.point(-5, 20),
-			},
-			contextCluster: null,
 			spiderfied: false,
-			currentSuggestion: null,
-			suggestionMarkers: [],
 			clustersLoading: false,
 		}
 	},
 
-	computed: {
-		suggestionsLastNullIndex() {
-			return this.dateFilterEnabled ? binSearch(this.photoSuggestions, (p) => !p.dateTaken) : -1
-		},
-		suggestionsFirstShownIndex() {
-			return this.dateFilterEnabled ? binSearch(this.photoSuggestions, (p) => (p.dateTaken || 0) < this.dateFilterStart) + 1 : 0
-		},
-		suggestionsLastShownIndex() {
-			return this.dateFilterEnabled ? binSearch(this.photoSuggestions, (p) => (p.dateTaken || 0) < this.dateFilterEnd) : this.photoSuggestions.length - 1
-		},
+	created() {
+		this.clusterGroup = null;
+		this.suggestionMarkers = [];
 	},
 
 	watch: {
-		photoSuggestions() {
-			this.updateSuggestionMarkers()
-		},
-		photoSuggestionsTracksAndDevices: {
-			handler() {
-				this.updateSuggestionMarkers()
-			},
-			deep: true,
-		},
-		draggable() {
-			this.updateSuggestionMarkersDraggable()
-		},
-		dateFilterEnabled(newValue) {
-			if (newValue) {
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.suggestionMarkers.slice(
-						this.suggestionsLastNullIndex + 1,
-						this.suggestionsFirstShownIndex,
-					),
-				)
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.suggestionMarkers.slice(
-						this.suggestionsLastShownIndex + 1,
-					),
-				)
-			} else {
-				this.$refs.markerCluster.mapObject.addLayers(
-					this.suggestionMarkers.slice(
-						this.suggestionsLastNullIndex + 1,
-						this.suggestionsFirstShownIndex,
-					),
-				)
-				this.$refs.markerCluster.mapObject.addLayers(
-					this.suggestionMarkers.slice(
-						this.suggestionsLastShownIndex + 1,
-					),
-				)
-			}
-		},
-		suggestionsFirstShownIndex(newIndex, oldIndex) {
-			if (newIndex < oldIndex) {
-				this.$refs.markerCluster.mapObject.addLayers(
-					this.suggestionMarkers.slice(
-						newIndex,
-						oldIndex,
-					),
-				)
-			} else if (newIndex > oldIndex) {
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.suggestionMarkers.slice(
-						oldIndex,
-						newIndex,
-					),
-				)
-			}
-		},
-		suggestionsLastShownIndex(newIndex, oldIndex) {
-			if (newIndex < oldIndex) {
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.suggestionMarkers.slice(
-						newIndex + 1,
-						oldIndex + 1,
-					),
-				)
-			} else if (newIndex > oldIndex) {
-				this.$refs.markerCluster.mapObject.addLayers(
-					this.suggestionMarkers.slice(
-						oldIndex + 1,
-						newIndex + 1,
-					),
-				)
-			}
-		},
-		photoSuggestionsSelectedIndices(newIndices, oldIndices) {
-			const oldSet = new Set(oldIndices)
-			const newSet = new Set(newIndices)
-			const removedIndices = oldIndices.filter((i) => { return !newSet.has(i) })
-			const addedIndices = newIndices.filter((i) => { return !oldSet.has(i) })
-			const changedMarkers = removedIndices.concat(addedIndices).filter((i) => { return !!this.suggestionMarkers[i] }).map((i) => { return this.suggestionMarkers[i] })
-			this.$refs.markerCluster.mapObject.refreshClusters(changedMarkers)
-		},
+		photoSuggestions: 'updateSuggestionMarkers',
+		photoSuggestionsTracksAndDevices: { handler: 'updateSuggestionMarkers', deep: true },
+		draggable: 'updateSuggestionMarkersDraggable',
+		dateFilterEnabled: 'updateSuggestionMarkers',
+		dateFilterStart: 'updateSuggestionMarkers',
+		dateFilterEnd: 'updateSuggestionMarkers',
+		photoSuggestionsSelectedIndices: 'updateClusterStyles'
 	},
 
-	beforeMount() {
+	mounted() {
+		this.clusterGroup = L.markerClusterGroup({
+			iconCreateFunction: this.getClusterMarkerIcon.bind(this),
+			spiderfyOnMaxZoom: false,
+			singleMarkerMode: true,
+			showCoverageOnHover: false,
+			zoomToBoundsOnClick: false,
+			maxClusterRadius: PHOTO_MARKER_VIEW_SIZE + 10,
+			chunkedLoading: true,
+			chunkDelay: 50,
+			chunkInterval: 250,
+			chunkProgress: this.updateClusterLoadingProgress.bind(this),
+		});
+
+		this.clusterGroup.on('clusterclick', this.onClusterClick.bind(this));
+		this.clusterGroup.on('clustercontextmenu', this.onClusterRightClick.bind(this));
+		this.clusterGroup.on('spiderfied', this.onSpiderfied.bind(this));
+
+		this.map.addLayer(this.clusterGroup);
+		this.updateSuggestionMarkers();
 	},
 
-	mounted() {
-		this.updateSuggestionMarkers()
+	beforeUnmount() {
+		if (this.clusterGroup && this.map) {
+			this.map.removeLayer(this.clusterGroup);
+		}
 	},
 
 	methods: {
-		basename(path) {
-			return basename(path)
+		basename(path) { return basename(path); },
+
+		updateSuggestionMarkers() {
+			this.clusterGroup.clearLayers();
+			this.suggestionMarkers = [];
+
+			const lastNullIndex = this.dateFilterEnabled ? binSearch(this.photoSuggestions, (p) => !p.dateTaken) : -1;
+			const firstShownIndex = this.dateFilterEnabled ? binSearch(this.photoSuggestions, (p) => (p.dateTaken || 0) < this.dateFilterStart) + 1 : 0;
+			const lastShownIndex = this.dateFilterEnabled ? binSearch(this.photoSuggestions, (p) => (p.dateTaken || 0) < this.dateFilterEnd) : this.photoSuggestions.length - 1;
+
+			this.photoSuggestions.forEach((p, i) => {
+				if (!p) return;
+
+				// Date Filtering
+				if (this.dateFilterEnabled) {
+					if (i > lastNullIndex && i < firstShownIndex) return;
+					if (i > lastShownIndex) return;
+				}
+
+				// Track/Device Enablement Filtering
+				const parentTod = this.photoSuggestionsTracksAndDevices[p.trackOrDeviceId];
+				if (!parentTod || !parentTod.enabled) return;
+
+				const marker = L.marker([p.lat, p.lng], {
+					draggable: this.draggable,
+					icon: this.getPhotoMarkerIcon(p, i)
+				});
+
+				marker.data = p;
+				marker.i = i;
+
+				// Tooltip
+				marker.bindTooltip(`
+					<div class="tooltip-photo-suggestion-wrapper ${this.photoSuggestionsSelectedIndices.includes(i) ? 'photo-suggestion-marker-selected' : ''}">
+						<img class="photo-suggestion-tooltip" src="${this.getPreviewUrl(p)}" />
+						<p class="tooltip-photo-suggestion-date">${this.getPhotoFormattedDate(p)}</p>
+						<p class="tooltip-photo-suggestion-name">${this.basename(p.path)}</p>
+					</div>
+				`, { className: 'leaflet-marker-photo-suggestion-tooltip', direction: 'right', offset: L.point(0, -30), opacity: this.draggable ? 0 : 1 });
+
+				// Events
+				marker.on('click', (e) => this.onPhotoClick(e, p, i));
+				marker.on('contextmenu', (e) => this.onPhotoRightClick(e, p, i));
+				marker.on('moveend', (e) => this.$emit('photo-suggestion-moved', i, e.target.getLatLng()));
+
+				this.suggestionMarkers.push(marker);
+			});
+
+			this.clusterGroup.addLayers(this.suggestionMarkers);
 		},
+
+		updateSuggestionMarkersDraggable() {
+			this.suggestionMarkers.forEach((m) => {
+				if (m.dragging) this.draggable ? m.dragging.enable() : m.dragging.disable();
+			});
+		},
+
+		updateClusterStyles() {
+			this.updateSuggestionMarkers(); // Easiest way to force refresh of icons with selection state
+		},
+
+		onPhotoClick(e, photo, index) {
+			this.$emit('photo-suggestion-selected', index);
+		},
+
+		onPhotoRightClick(e, photo, index) {
+			const popupContent = L.DomUtil.create('div', 'popup-photo-wrapper');
+			popupContent.innerHTML = `<button class="action-btn" data-action="display">${t('maps', 'Display picture')}</button>`;
+
+			popupContent.addEventListener('click', (event) => {
+				const action = event.target.getAttribute('data-action');
+				if (action === 'display') this.viewPhoto(photo);
+			});
+
+			L.popup({ closeOnClick: false, offset: L.point(-5, -20), className: 'popovermenu open popupMarker photoPopup' })
+				.setLatLng([photo.lat, photo.lng])
+				.setContent(popupContent)
+				.openOn(this.map);
+		},
+
 		onClusterClick(a) {
 			if (a.layer.getChildCount() > 10 && this.map.getZoom() !== this.map.getMaxZoom()) {
-				a.layer.zoomToBounds()
+				a.layer.zoomToBounds();
 			} else {
-				a.layer.spiderfy()
+				a.layer.spiderfy();
 			}
 		},
+
 		onClusterRightClick(a) {
-			this.contextCluster = a.layer
-			const popup = this.$refs.clusterPopup.mapObject
-			popup.setLatLng(a.latlng)
-			this.$nextTick(() => {
-				popup.openOn(this.map)
-			})
+			const popupContent = L.DomUtil.create('div', 'popup-photo-suggestion-wrapper');
+			popupContent.innerHTML = `
+				<button class="action-btn" data-action="selectall">${t('maps', 'Select All')}</button>
+				<button class="action-btn" data-action="display">${t('maps', 'Display pictures')}</button>
+				<button class="action-btn" data-action="spiderfy">${t('maps', 'Spiderfy')}</button>
+				<button class="action-btn" data-action="zoom">${t('maps', 'Zoom on bounds')}</button>
+			`;
+
+			popupContent.addEventListener('click', (event) => {
+				const action = event.target.getAttribute('data-action');
+				if (action === 'selectall') a.layer.getAllChildMarkers().forEach(m => this.$emit('photo-suggestion-selected', m.i));
+				if (action === 'display') this.displayCluster(a.layer);
+				if (action === 'spiderfy') { a.layer.spiderfy(); this.map.closePopup(); }
+				if (action === 'zoom') { if (this.map.getZoom() !== this.map.getMaxZoom()) a.layer.zoomToBounds(); this.map.closePopup(); }
+			});
+
+			L.popup({ closeOnClick: false, offset: L.point(-5, 20), className: 'popovermenu open popupMarker photoPopup' })
+				.setLatLng(a.latlng)
+				.setContent(popupContent)
+				.openOn(this.map);
 		},
+
 		onSpiderfied(e) {
-			// markers that were in a cluster when draggable changed are not draggable
-			// so we set them when cluster is spiderfied
-			if (this.draggable) {
-				e.markers.forEach((m) => {
-					m.dragging.enable()
-				})
-			}
-			this.spiderfied = true
-		},
-		onZoomClusterClick() {
-			const cluster = this.contextCluster
-			if (this.map.getZoom() !== this.map.getMaxZoom()) {
-				cluster.zoomToBounds()
-			}
-			this.map.closePopup()
-		},
-		onSpiderfyClusterClick() {
-			this.contextCluster.spiderfy()
-			this.map.closePopup()
-		},
-		onDisplayClusterClick() {
-			this.displayCluster(this.contextCluster)
-		},
-		onSelectAll() {
-			this.contextCluster.getAllChildMarkers().forEach((m) => {
-				this.$emit('photo-suggestion-selected', m.i)
-			})
+			if (this.draggable) e.markers.forEach((m) => m.dragging.enable());
 		},
+
 		displayCluster(cluster) {
-			const photoList = cluster.getAllChildMarkers().map((m) => {
-				return m.data
-			})
-			photoList.sort((a, b) => {
-				return a.dateTaken - b.dateTaken
-			})
-			this.$emit('open-sidebar', photoList[0].path)
-			OCA.Viewer.open({ path: photoList[0].path, list: photoList })
-			this.map.closePopup()
+			const photoList = cluster.getAllChildMarkers().map(m => m.data);
+			photoList.sort((a, b) => a.dateTaken - b.dateTaken);
+			this.$emit('open-sidebar', photoList[0].path);
+			if (window.OCA && window.OCA.Viewer && window.OCA.Viewer.open) {
+				window.OCA.Viewer.open({ path: photoList[0].path, list: photoList });
+			}
+			this.map.closePopup();
 		},
+
 		getClusterMarkerIcon(cluster) {
-			const count = cluster.getChildCount()
-			const markers = cluster.getAllChildMarkers()
-			const selectedCount = markers.filter((m) => this.photoSuggestionsSelectedIndices.includes(m.i)).length
-			const marker = markers[0]
-			const photo = marker.data
-			const index = marker.i
-			if (count === 1) {
-				return this.getPhotoMarkerIcon(photo, index)
-			}
-			const iconUrl = this.getPreviewUrl(photo)
-			return new L.DivIcon(L.extend({
+			const count = cluster.getChildCount();
+			const markers = cluster.getAllChildMarkers();
+			const selectedCount = markers.filter(m => this.photoSuggestionsSelectedIndices.includes(m.i)).length;
+			const photo = markers[0].data;
+			
+			if (count === 1) return this.getPhotoMarkerIcon(photo, markers[0].i);
+
+			const iconUrl = this.getPreviewUrl(photo);
+			return new L.DivIcon({
 				className: 'leaflet-marker-photo-suggestion cluster-suggestion-marker',
-				html: '<div class="thumbnail" style="background-image: url(' + iconUrl + ');"></div>​<span class="label">'
-					+ (selectedCount > 0 ? '<div style="color: var(--color-warning); display: inline;">' + selectedCount + '</div>/' : '')
-					+ count + '</span>',
-			}, cluster, {
+				html: `<div class="thumbnail" style="background-image: url('${iconUrl}');"></div>​<span class="label">${selectedCount > 0 ? `<div style="color: var(--color-warning); display: inline;">${selectedCount}</div>/` : ''}${count}</span>`,
 				iconSize: [PHOTO_MARKER_VIEW_SIZE, PHOTO_MARKER_VIEW_SIZE],
 				iconAnchor: [PHOTO_MARKER_VIEW_SIZE / 2, PHOTO_MARKER_VIEW_SIZE],
-			}))
+			});
 		},
+
 		getPhotoMarkerIcon(photo, index) {
-			const iconUrl = this.getPreviewUrl(photo)
-			const selectedClass = this.photoSuggestionsSelectedIndices.includes(index)
-				? '-selected'
-				: ''
-			return L.divIcon(L.extend({
-				className: 'leaflet-marker-photo-suggestion photo-suggestion-marker' + selectedClass,
-				html: '<div class="thumbnail" style="background-image: url(' + iconUrl + ');"></div>​',
-			}, photo, {
+			const iconUrl = this.getPreviewUrl(photo);
+			const selectedClass = this.photoSuggestionsSelectedIndices.includes(index) ? '-selected' : '';
+			
+			return L.divIcon({
+				className: `leaflet-marker-photo-suggestion photo-suggestion-marker${selectedClass}`,
+				html: `<div class="thumbnail" style="background-image: url('${iconUrl}');"></div>​`,
 				iconSize: [PHOTO_MARKER_VIEW_SIZE, PHOTO_MARKER_VIEW_SIZE],
 				iconAnchor: [PHOTO_MARKER_VIEW_SIZE / 2, PHOTO_MARKER_VIEW_SIZE],
-			}))
+			});
 		},
+
 		getPreviewUrl(photo) {
 			if (photo && photo.hasPreview) {
-				const token = getToken()
-				return token
-					? generateUrl('apps/files_sharing/publicpreview/') + token + '?file=' + encodeURIComponent(photo.path) + '&x=341&y=256&a=1'
-					: generateUrl('core') + '/preview?fileId=' + photo.fileId + '&x=341&y=256&a=1'
-			} else {
-				return generateUrl('/apps/theming/img/core/filetypes') + '/image.svg?v=2'
+				const token = getToken();
+				return token ? generateUrl('apps/files_sharing/publicpreview/') + token + '?file=' + encodeURIComponent(photo.path) + '&x=341&y=256&a=1'
+					: generateUrl('core') + '/preview?fileId=' + photo.fileId + '&x=341&y=256&a=1';
 			}
+			return generateUrl('/apps/theming/img/core/filetypes') + '/image.svg?v=2';
 		},
+
 		getPhotoFormattedDate(photo) {
 			if (photo) {
-				const d = new Date(photo.dateTaken * 1000)
-				const mom = moment.unix(photo.dateTaken + d.getTimezoneOffset() * 60)
-				return mom.format('LL') + ' ' + mom.format('HH:mm:ss')
+				const d = new Date(photo.dateTaken * 1000);
+				const mom = moment.unix(photo.dateTaken + d.getTimezoneOffset() * 60);
+				return mom.format('LL') + ' ' + mom.format('HH:mm:ss');
 			}
-			return ''
-		},
-		onPhotoClick(e) {
-			const index = e.target.i
-			// we want popup to open on right click only
-			this.$nextTick(() => {
-				e.target.closePopup()
-			})
-			this.$emit('photo-suggestion-selected', index)
+			return '';
 		},
+
 		viewPhoto(photo) {
-			if (OCA.Viewer && OCA.Viewer.open) {
-				OCA.Viewer.open({ path: photo.path, list: [photo] })
-				this.map.closePopup()
+			if (window.OCA && window.OCA.Viewer && window.OCA.Viewer.open) {
+				window.OCA.Viewer.open({ path: photo.path, list: [photo] });
+				this.map.closePopup();
 			}
 		},
-		onPhotoRightClick(e) {
-			const photo = e.target.data
-			this.currentSuggestion = photo
-			const popup = this.$refs.markerPopup.mapObject
-			popup.setLatLng([photo.lat, photo.lng])
-			this.$nextTick(() => {
-				popup.openOn(this.map)
-			})
-		},
-		onPhotoMouseOver(e) {
-			const photo = e.target.data
-			this.currentSuggestion = photo
-			const tooltip = this.$refs.markerTooltip.mapObject
-			tooltip.setLatLng([photo.lat, photo.lng])
-			this.$nextTick(() => {
-				tooltip.openOn(this.map)
-			})
-		},
-		onPhotoMouseOut(e) {
-			const tooltip = this.$refs.markerTooltip.mapObject
-			tooltip.close()
-		},
-		onPhotoMoved(e) {
-			this.$emit('photo-suggestion-moved', e.target.i, e.target.getLatLng())
-		},
-		updateClusterLoadingProgress(processed, total, elapsed, layersArray) {
-			if (elapsed > 100 && !this.clustersLoading) {
-				this.clustersLoading = true
-			}
-			this.$emit('cluster-loading', processed, total)
 
+		updateClusterLoadingProgress(processed, total, elapsed) {
+			if (elapsed > 100 && !this.clustersLoading) this.clustersLoading = true;
+			this.$emit('cluster-loading', processed, total);
 			if (processed === total) {
-				this.clustersLoading = false
-				// all markers processed - hide the progress bar:
-				this.$emit('cluster-loaded')
-			}
-		},
-
-		async updateSuggestionMarkers() {
-			this.$refs.markerCluster.mapObject.removeLayers(this.suggestionMarkers.filter((m) => !!m))
-			this.suggestionMarkers = this.photoSuggestions.map((p, i) => {
-				if (p) {
-					const m = new L.Marker([p.lat, p.lng],
-						{
-							draggable: this.draggable,
-						},
-					)
-					m.on(
-						'click', this.onPhotoClick,
-					)
-					m.on(
-						'contextmenu', this.onPhotoRightClick,
-					)
-					m.on(
-						'mouseover', this.onPhotoMouseOver,
-					)
-					m.on(
-						'mouseout', this.onPhotoMouseOut,
-					)
-					m.on(
-						'moveend', this.onPhotoMoved,
-					)
-					m.data = p
-					m.i = i
-					return m
-				} else {
-					return null
-				}
-			})
-			this.$refs.markerCluster.mapObject.addLayers(this.suggestionMarkers.filter((m) => { return m ? this.photoSuggestionsTracksAndDevices[m.data.trackOrDeviceId].enabled : false }))
-			if (this.dateFilterEnabled) {
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.suggestionMarkers.slice(
-						this.suggestionsLastNullIndex + 1,
-						this.suggestionsFirstShownIndex,
-					),
-				)
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.suggestionMarkers.slice(
-						this.suggestionsLastShownIndex + 1,
-					),
-				)
+				this.clustersLoading = false;
+				this.$emit('cluster-loaded');
 			}
 		},
-		async updateSuggestionMarkersDraggable() {
-			this.suggestionMarkers.forEach((m) => {
-				if (m) {
-					if (m.dragging) {
-						this.draggable ? m.dragging.enable() : m.dragging.disable()
-					}
-					m.options.draggable = this.draggable
-					m.update()
-				}
-			})
-		},
 	},
 }
 </script>
 
-<style lang="scss" scoped>
-// nothing
+<style lang="scss">
 .tooltip-photo-suggestion-wrapper {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 }
-
-</style>
+.popup-photo-wrapper .action-btn {
+	display: block;
+	width: 100%;
+	padding: 8px;
+	border: none;
+	background: transparent;
+	text-align: left;
+	cursor: pointer;
+}
+.popup-photo-wrapper .action-btn:hover {
+	background: var(--color-background-hover);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/map/PhotosLayer.vue b/src/components/map/PhotosLayer.vue
index 1e56c319f..39db15698 100644
--- a/src/components/map/PhotosLayer.vue
+++ b/src/components/map/PhotosLayer.vue
@@ -1,80 +1,13 @@
 <template>
-	<Vue2LeafletMarkerCluster
-		ref="markerCluster"
-		:options="clusterOptions"
-		@clusterclick="onClusterClick"
-		@clustercontextmenu="onClusterRightClick"
-		@spiderfied="onSpiderfied">
-		<LMarker
-			:lat-lng="[0, 0]"
-			:visible="false">
-			<LTooltip
-				ref="markerTooltip"
-				:class="{ 'tooltip-photo-wrapper': true }"
-				:options="{ ...tooltipOptions, opacity: draggable ? 0 : 1 }">
-				<img class="photo-tooltip"
-					:src="getPreviewUrl(currentPhoto)">
-				<p class="tooltip-photo-date">
-					{{ getPhotoFormattedDate(currentPhoto) }}
-				</p>
-				<p class="tooltip-photo-name">
-					{{ currentPhoto ? basename(currentPhoto.path) : '' }}
-				</p>
-			</LTooltip>
-			<LPopup
-				ref="markerPopup"
-				class="popup-photo-wrapper"
-				:options="popupOptions">
-				<NcActionButton v-if="currentPhoto && currentPhoto.path" icon="icon-toggle" @click="$emit('open-sidebar',currentPhoto.path)">
-					{{ t('maps', 'Open in Sidebar') }}
-				</NcActionButton>
-				<NcActionButton icon="icon-toggle" @click="viewPhoto(currentPhoto)">
-					{{ t('maps', 'Display picture') }}
-				</NcActionButton>
-				<NcActionButton v-if="currentPhoto && currentPhoto.isUpdateable" icon="icon-history" @click="resetPhotosCoords([currentPhoto])">
-					{{ t('maps', 'Remove geo data') }}
-				</NcActionButton>
-				<NcActionButton v-if="!isPublic()"
-					icon="icon-share"
-					@click="$emit('add-to-map-photo', currentPhoto)">
-					{{ t('maps', 'Copy to map') }}
-				</NcActionButton>
-			</LPopup>
-		</LMarker>
-		<LMarker
-			:lat-lng="[0, 0]"
-			:visible="false">
-			<LPopup
-				ref="clusterPopup"
-				class="popup-photo-wrapper"
-				:options="clusterPopupOptions">
-				<NcActionButton icon="icon-toggle" @click="onDisplayClusterClick">
-					{{ t('maps', 'Display pictures') }}
-				</NcActionButton>
-				<NcActionButton icon="icon-toggle-pictures" @click="onSpiderfyClusterClick">
-					{{ t('maps', 'Spiderfy') }}
-				</NcActionButton>
-				<NcActionButton icon="icon-search" @click="onZoomClusterClick">
-					{{ t('maps', 'Zoom on bounds') }}
-				</NcActionButton>
-				<NcActionButton v-if="readOnly" icon="icon-history" @click="resetClusterPhotoCoords">
-					{{ t('maps', 'Remove geo data') }}
-				</NcActionButton>
-			</LPopup>
-		</LMarker>
-	</Vue2LeafletMarkerCluster>
+	<div style="display: none;"></div>
 </template>
 
 <script>
+import L from 'leaflet'
+import 'leaflet.markercluster'
 import { generateUrl } from '@nextcloud/router'
 import moment from '@nextcloud/moment'
 import { basename } from '@nextcloud/paths'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-
-import L from 'leaflet'
-import { LMarker, LTooltip, LPopup } from 'vue2-leaflet'
-import Vue2LeafletMarkerCluster from 'vue2-leaflet-markercluster'
-
 import optionsController from '../../optionsController.js'
 import { binSearch, getToken, isPublic } from '../../utils/common.js'
 
@@ -82,420 +15,285 @@ const PHOTO_MARKER_VIEW_SIZE = 40
 
 export default {
 	name: 'PhotosLayer',
-	components: {
-		Vue2LeafletMarkerCluster,
-		LMarker,
-		LTooltip,
-		LPopup,
-		NcActionButton,
-	},
-
 	props: {
-		map: {
-			type: Object,
-			required: true,
-		},
-		photos: {
-			type: Array,
-			required: true,
-		},
-		dateFilterEnabled: {
-			type: Boolean,
-			required: true,
-		},
-		dateFilterStart: {
-			type: Number,
-			required: true,
-		},
-		dateFilterEnd: {
-			type: Number,
-			required: true,
-		},
-		draggable: {
-			type: Boolean,
-			required: true,
-		},
+		map: { type: Object, required: true },
+		photos: { type: Array, required: true },
+		dateFilterEnabled: { type: Boolean, required: true },
+		dateFilterStart: { type: Number, required: true },
+		dateFilterEnd: { type: Number, required: true },
+		draggable: { type: Boolean, required: true },
 	},
-
 	data() {
 		return {
-			optionValues: optionsController.optionValues,
-			clusterOptions: {
-				iconCreateFunction: this.getClusterMarkerIcon,
-				spiderfyOnMaxZoom: false,
-				singleMarkerMode: true,
-				showCoverageOnHover: false,
-				zoomToBoundsOnClick: false,
-				maxClusterRadius: PHOTO_MARKER_VIEW_SIZE + 10,
-				icon: {
-					iconSize: [PHOTO_MARKER_VIEW_SIZE, PHOTO_MARKER_VIEW_SIZE],
-				},
-				chunkedLoading: true,
-				chunkDelay: 50,
-				chunkInterval: 250,
-				chunkProgress: this.updateClusterLoadingProgress,
-			},
-			tooltipOptions: {
-				className: 'leaflet-marker-photo-tooltip',
-				direction: 'right',
-				offset: L.point(0, -30),
-			},
-			popupOptions: {
-				closeOnClick: false,
-				className: 'popovermenu open popupMarker photoPopup',
-				offset: L.point(-5, -20),
-			},
-			clusterPopupOptions: {
-				closeOnClick: false,
-				className: 'popovermenu open popupMarker photoPopup',
-				offset: L.point(-5, 20),
-			},
-			contextCluster: null,
 			spiderfied: false,
-			currentPhoto: null,
-			photoMarkers: [],
 			clustersLoading: false,
 		}
 	},
-
-	computed: {
-		readOnly() {
-			return !this.photos.some((f) => (f.isUpdateable))
-				&& !(this.photos.length === 0 && optionsController.optionValues?.isCreatable)
-		},
-		photosLastNullIndex() {
-			return this.dateFilterEnabled ? binSearch(this.photos, (p) => !p.dateTaken) : -1
-		},
-		photosFirstShownIndex() {
-			return this.dateFilterEnabled ? binSearch(this.photos, (p) => (p.dateTaken || 0) < this.dateFilterStart) + 1 : 0
-		},
-		photosLastShownIndex() {
-			return this.dateFilterEnabled ? binSearch(this.photos, (p) => (p.dateTaken || 0) < this.dateFilterEnd) : this.photos.length - 1
-		},
+	created() {
+		// Non-reactive storage for leaflet objects
+		this.clusterGroup = null;
+		this.photoMarkers = [];
 	},
-
 	watch: {
 		photos() {
-			this.updatePhotoMarkers()
+			this.renderMarkers();
 		},
 		draggable() {
-			this.updatePhotoMarkersDraggable()
+			this.updatePhotoMarkersDraggable();
 		},
-		dateFilterEnabled(newValue) {
-			if (newValue) {
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.photoMarkers.slice(
-						this.photosLastNullIndex + 1,
-						this.photosFirstShownIndex,
-					),
-				)
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.photoMarkers.slice(
-						this.photosLastShownIndex + 1,
-					),
-				)
-			} else {
-				this.$refs.markerCluster.mapObject.addLayers(
-					this.photoMarkers.slice(
-						this.photosLastNullIndex + 1,
-						this.photosFirstShownIndex,
-					),
-				)
-				this.$refs.markerCluster.mapObject.addLayers(
-					this.photoMarkers.slice(
-						this.photosLastShownIndex + 1,
-					),
-				)
-			}
+		dateFilterEnabled() {
+			this.renderMarkers();
 		},
-		photosFirstShownIndex(newIndex, oldIndex) {
-			if (newIndex < oldIndex) {
-				this.$refs.markerCluster.mapObject.addLayers(
-					this.photoMarkers.slice(
-						newIndex,
-						oldIndex,
-					),
-				)
-			} else if (newIndex > oldIndex) {
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.photoMarkers.slice(
-						oldIndex,
-						newIndex,
-					),
-				)
-			}
-		},
-		photosLastShownIndex(newIndex, oldIndex) {
-			if (newIndex < oldIndex) {
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.photoMarkers.slice(
-						newIndex + 1,
-						oldIndex + 1,
-					),
-				)
-			} else if (newIndex > oldIndex) {
-				this.$refs.markerCluster.mapObject.addLayers(
-					this.photoMarkers.slice(
-						oldIndex + 1,
-						newIndex + 1,
-					),
-				)
-			}
+		dateFilterStart() {
+			this.renderMarkers();
 		},
+		dateFilterEnd() {
+			this.renderMarkers();
+		}
 	},
+	mounted() {
+		this.clusterGroup = L.markerClusterGroup({
+			iconCreateFunction: this.getClusterMarkerIcon,
+			spiderfyOnMaxZoom: false,
+			singleMarkerMode: true,
+			showCoverageOnHover: false,
+			zoomToBoundsOnClick: false,
+			maxClusterRadius: PHOTO_MARKER_VIEW_SIZE + 10,
+			chunkedLoading: true,
+			chunkDelay: 50,
+			chunkInterval: 250,
+			chunkProgress: this.updateClusterLoadingProgress,
+		});
 
-	beforeMount() {
-	},
+		this.clusterGroup.on('clusterclick', this.onClusterClick.bind(this));
+		this.clusterGroup.on('clustercontextmenu', this.onClusterRightClick.bind(this));
+		this.clusterGroup.on('spiderfied', this.onSpiderfied.bind(this));
 
-	mounted() {
-		this.updatePhotoMarkers()
+		this.map.addLayer(this.clusterGroup);
+		this.renderMarkers();
+	},
+	beforeUnmount() {
+		if (this.clusterGroup && this.map) {
+			this.map.removeLayer(this.clusterGroup);
+		}
 	},
-
 	methods: {
-		basename(path) {
-			return basename(path)
+		basename(path) { return basename(path) },
+		isPublic() { return isPublic() },
+		
+		getFilteredPhotos() {
+			if (!this.dateFilterEnabled) return this.photos;
+			
+			const lastNullIndex = binSearch(this.photos, (p) => !p.dateTaken);
+			const firstShownIndex = binSearch(this.photos, (p) => (p.dateTaken || 0) < this.dateFilterStart) + 1;
+			const lastShownIndex = binSearch(this.photos, (p) => (p.dateTaken || 0) < this.dateFilterEnd);
+			
+			return [
+				...this.photos.slice(0, lastNullIndex + 1),
+				...this.photos.slice(firstShownIndex, lastShownIndex + 1),
+			];
+		},
+		
+		renderMarkers() {
+			this.clusterGroup.clearLayers();
+			const filteredPhotos = this.getFilteredPhotos();
+			
+			this.photoMarkers = filteredPhotos.map((photo) => {
+				const marker = L.marker([photo.lat, photo.lng], {
+					draggable: this.draggable,
+					icon: this.getPhotoMarkerIcon(photo)
+				});
+				
+				marker.data = photo;
+				
+				// Bind tooltips
+				marker.bindTooltip(`
+					<div class="tooltip-photo-wrapper">
+						<img class="photo-tooltip" src="${this.getPreviewUrl(photo)}" />
+						<p class="tooltip-photo-date">${this.getPhotoFormattedDate(photo)}</p>
+						<p class="tooltip-photo-name">${this.basename(photo.path)}</p>
+					</div>
+				`, { className: 'leaflet-marker-photo-tooltip', direction: 'right', offset: L.point(0, -30), opacity: this.draggable ? 0 : 1 });
+
+				// Event Listeners
+				marker.on('click', (e) => this.onPhotoClick(e, photo));
+				marker.on('contextmenu', (e) => this.onPhotoRightClick(e, photo));
+				marker.on('moveend', (e) => this.onPhotoMoved(e, photo));
+				
+				return marker;
+			});
+			
+			this.clusterGroup.addLayers(this.photoMarkers);
+		},
+		
+		updatePhotoMarkersDraggable() {
+			this.photoMarkers.forEach((m) => {
+				if (m.dragging) {
+					this.draggable ? m.dragging.enable() : m.dragging.disable();
+				}
+				m.setTooltipContent(m.getTooltip().getContent()); // refresh opacity logic if needed
+			});
 		},
+
+		// Actions
+		onPhotoClick(e, photo) {
+			this.viewPhoto(photo);
+		},
+		onPhotoRightClick(e, photo) {
+			const popupContent = L.DomUtil.create('div', 'popup-photo-wrapper');
+			popupContent.innerHTML = `
+				<button class="action-btn" data-action="sidebar">${t('maps', 'Open in Sidebar')}</button>
+				<button class="action-btn" data-action="display">${t('maps', 'Display picture')}</button>
+				${photo.isUpdateable ? `<button class="action-btn" data-action="reset">${t('maps', 'Remove geo data')}</button>` : ''}
+				${!this.isPublic() ? `<button class="action-btn" data-action="copy">${t('maps', 'Copy to map')}</button>` : ''}
+			`;
+
+			popupContent.addEventListener('click', (event) => {
+				const action = event.target.getAttribute('data-action');
+				if (action === 'sidebar') this.$emit('open-sidebar', photo.path);
+				if (action === 'display') this.viewPhoto(photo);
+				if (action === 'reset') { this.$emit('coords-reset', [photo.path]); this.map.closePopup(); }
+				if (action === 'copy') { this.$emit('add-to-map-photo', photo); this.map.closePopup(); }
+			});
+
+			L.popup({ closeOnClick: false, offset: L.point(-5, -20), className: 'popovermenu open popupMarker photoPopup' })
+				.setLatLng([photo.lat, photo.lng])
+				.setContent(popupContent)
+				.openOn(this.map);
+		},
+		onPhotoMoved(e, photo) {
+			this.$emit('photo-moved', photo, e.target.getLatLng());
+		},
+
 		onClusterClick(a) {
 			if (a.layer.getChildCount() > 10 && this.map.getZoom() !== this.map.getMaxZoom()) {
-				a.layer.zoomToBounds()
+				a.layer.zoomToBounds();
 			} else {
-				if (OCA.Viewer && OCA.Viewer.open) {
-					this.displayCluster(a.layer)
+				if (window.OCA && window.OCA.Viewer && window.OCA.Viewer.open) {
+					this.displayCluster(a.layer);
 				} else {
-					this.$emit('open-sidebar', a.layer.getAllChildMarkers()[0].data.path)
-					a.layer.spiderfy()
+					this.$emit('open-sidebar', a.layer.getAllChildMarkers()[0].data.path);
+					a.layer.spiderfy();
 				}
 			}
 		},
 		onClusterRightClick(a) {
-			this.contextCluster = a.layer
-			const popup = this.$refs.clusterPopup.mapObject
-			popup.setLatLng(a.latlng)
-			this.$nextTick(() => {
-				popup.openOn(this.map)
-			})
+			const clusterSize = a.layer.getChildCount();
+			const popupContent = L.DomUtil.create('div', 'popup-photo-wrapper');
+			popupContent.innerHTML = `
+				<button class="action-btn" data-action="display">${t('maps', 'Display pictures')}</button>
+				<button class="action-btn" data-action="spiderfy">${t('maps', 'Spiderfy')}</button>
+				<button class="action-btn" data-action="zoom">${t('maps', 'Zoom on bounds')}</button>
+				${!this.readOnly ? `<button class="action-btn" data-action="reset">${t('maps', 'Remove geo data')}</button>` : ''}
+			`;
+
+			popupContent.addEventListener('click', (event) => {
+				const action = event.target.getAttribute('data-action');
+				if (action === 'display') this.displayCluster(a.layer);
+				if (action === 'spiderfy') { a.layer.spiderfy(); this.map.closePopup(); }
+				if (action === 'zoom') { if (this.map.getZoom() !== this.map.getMaxZoom()) a.layer.zoomToBounds(); this.map.closePopup(); }
+				if (action === 'reset') {
+					OC.dialogs.confirmDestructive('', t('maps', 'Are you sure you want to remove geo data of {nb} photos?', { nb: clusterSize }), {
+						type: OC.dialogs.YES_NO_BUTTONS, confirm: t('maps', 'Yes'), cancel: t('maps', 'Cancel')
+					}, (result) => {
+						if (result) {
+							const photos = a.layer.getAllChildMarkers().map(m => m.data);
+							this.$emit('coords-reset', photos.map(p => p.path));
+							this.map.closePopup();
+						}
+					}, true);
+				}
+			});
+
+			L.popup({ closeOnClick: false, offset: L.point(-5, 20), className: 'popovermenu open popupMarker photoPopup' })
+				.setLatLng(a.latlng)
+				.setContent(popupContent)
+				.openOn(this.map);
 		},
 		onSpiderfied(e) {
-			// markers that were in a cluster when draggable changed are not draggable
-			// so we set them when cluster is spiderfied
 			if (this.draggable) {
-				e.markers.forEach((m) => {
-					m.dragging.enable()
-				})
-			}
-			this.spiderfied = true
-		},
-		onZoomClusterClick() {
-			const cluster = this.contextCluster
-			if (this.map.getZoom() !== this.map.getMaxZoom()) {
-				cluster.zoomToBounds()
+				e.markers.forEach((m) => m.dragging.enable());
 			}
-			this.map.closePopup()
-		},
-		onSpiderfyClusterClick() {
-			this.contextCluster.spiderfy()
-			this.map.closePopup()
-		},
-		onDisplayClusterClick() {
-			this.displayCluster(this.contextCluster)
+			this.spiderfied = true;
 		},
 		displayCluster(cluster) {
-			const photoList = cluster.getAllChildMarkers().map((m) => {
-				return m.data
-			})
-			photoList.sort((a, b) => {
-				return a.dateTaken - b.dateTaken
-			})
-			// this.$emit('open-sidebar', photoList[0].path)
-			OCA.Viewer.open({ path: photoList[0].path, list: photoList })
-			this.map.closePopup()
+			const photoList = cluster.getAllChildMarkers().map(m => m.data);
+			photoList.sort((a, b) => a.dateTaken - b.dateTaken);
+			if (window.OCA && window.OCA.Viewer && window.OCA.Viewer.open) {
+				window.OCA.Viewer.open({ path: photoList[0].path, list: photoList });
+				this.map.closePopup();
+			}
 		},
+		
 		getClusterMarkerIcon(cluster) {
-			const count = cluster.getChildCount()
-			const photo = cluster.getAllChildMarkers()[0].data
-			if (count === 1) {
-				return this.getPhotoMarkerIcon(photo)
-			}
-			const iconUrl = this.getPreviewUrl(photo)
+			const count = cluster.getChildCount();
+			const photo = cluster.getAllChildMarkers()[0].data;
+			if (count === 1) return this.getPhotoMarkerIcon(photo);
+			
+			const iconUrl = this.getPreviewUrl(photo);
 			return new L.DivIcon(L.extend({
 				className: 'leaflet-marker-photo cluster-marker',
 				html: '<div class="thumbnail" style="background-image: url(' + iconUrl + ');"></div>​<span class="label">' + count + '</span>',
-			}, cluster, {
-				iconSize: [PHOTO_MARKER_VIEW_SIZE, PHOTO_MARKER_VIEW_SIZE],
-				iconAnchor: [PHOTO_MARKER_VIEW_SIZE / 2, PHOTO_MARKER_VIEW_SIZE],
-			}))
+			}, cluster, { iconSize: [PHOTO_MARKER_VIEW_SIZE, PHOTO_MARKER_VIEW_SIZE], iconAnchor: [PHOTO_MARKER_VIEW_SIZE / 2, PHOTO_MARKER_VIEW_SIZE] }));
 		},
 		getPhotoMarkerIcon(photo) {
-			const iconUrl = this.getPreviewUrl(photo)
+			const iconUrl = this.getPreviewUrl(photo);
 			return L.divIcon(L.extend({
 				className: 'leaflet-marker-photo photo-marker',
 				html: '<div class="thumbnail" style="background-image: url(' + iconUrl + ');"></div>​',
-			}, photo, {
-				iconSize: [PHOTO_MARKER_VIEW_SIZE, PHOTO_MARKER_VIEW_SIZE],
-				iconAnchor: [PHOTO_MARKER_VIEW_SIZE / 2, PHOTO_MARKER_VIEW_SIZE],
-			}))
+			}, photo, { iconSize: [PHOTO_MARKER_VIEW_SIZE, PHOTO_MARKER_VIEW_SIZE], iconAnchor: [PHOTO_MARKER_VIEW_SIZE / 2, PHOTO_MARKER_VIEW_SIZE] }));
 		},
 		getPreviewUrl(photo) {
 			if (photo && photo.hasPreview) {
-				const token = getToken()
-				return token
-					? generateUrl('apps/files_sharing/publicpreview/') + token + '?file=' + encodeURIComponent(photo.path) + '&x=341&y=256&a=1'
-					: generateUrl('core') + '/preview?fileId=' + photo.fileId + '&x=341&y=256&a=1'
-			} else {
-				return generateUrl('/apps/theming/img/core/filetypes') + '/image.svg?v=2'
+				const token = getToken();
+				return token ? generateUrl('apps/files_sharing/publicpreview/') + token + '?file=' + encodeURIComponent(photo.path) + '&x=341&y=256&a=1'
+					: generateUrl('core') + '/preview?fileId=' + photo.fileId + '&x=341&y=256&a=1';
 			}
+			return generateUrl('/apps/theming/img/core/filetypes') + '/image.svg?v=2';
 		},
 		getPhotoFormattedDate(photo) {
 			if (photo) {
-				const d = new Date(photo.dateTaken * 1000)
-				const mom = moment.unix(photo.dateTaken + d.getTimezoneOffset() * 60)
-				return mom.format('LL') + ' ' + mom.format('HH:mm:ss')
+				const d = new Date(photo.dateTaken * 1000);
+				const mom = moment.unix(photo.dateTaken + d.getTimezoneOffset() * 60);
+				return mom.format('LL') + ' ' + mom.format('HH:mm:ss');
 			}
-			return ''
-		},
-		onPhotoClick(e) {
-			const photo = e.target.data
-			// we want popup to open on right click only
-			this.$nextTick(() => {
-				e.target.closePopup()
-			})
-			// this.$emit('open-sidebar', photo.path)
-			this.viewPhoto(photo)
+			return '';
 		},
 		viewPhoto(photo) {
-			if (OCA.Viewer && OCA.Viewer.open) {
-				OCA.Viewer.open({ path: photo.path, list: [photo] })
-				this.map.closePopup()
+			if (window.OCA && window.OCA.Viewer && window.OCA.Viewer.open) {
+				window.OCA.Viewer.open({ path: photo.path, list: [photo] });
+				if(this.map) this.map.closePopup();
 			}
 		},
-		onPhotoRightClick(e) {
-			const photo = e.target.data
-			this.currentPhoto = photo
-			const popup = this.$refs.markerPopup.mapObject
-			popup.setLatLng([photo.lat, photo.lng])
-			this.$nextTick(() => {
-				popup.openOn(this.map)
-			})
-		},
-		onPhotoMouseOver(e) {
-			const photo = e.target.data
-			this.currentPhoto = photo
-			const tooltip = this.$refs.markerTooltip.mapObject
-			tooltip.setLatLng([photo.lat, photo.lng])
-			this.$nextTick(() => {
-				tooltip.openOn(this.map)
-			})
-		},
-		onPhotoMouseOut(e) {
-			const tooltip = this.$refs.markerTooltip.mapObject
-			tooltip.close()
-		},
-		onPhotoMoved(e) {
-			const photo = e.target.data
-			this.$emit('photo-moved', photo, e.target.getLatLng())
-		},
-		resetClusterPhotoCoords() {
-			const clusterSize = this.contextCluster.getChildCount()
-			OC.dialogs.confirmDestructive(
-				'',
-				t('maps', 'Are you sure you want to remove geo data of {nb} photos?', { nb: clusterSize }),
-				{
-					type: OC.dialogs.YES_NO_BUTTONS,
-					confirm: t('maps', 'Yes'),
-					confirmClasses: '',
-					cancel: t('maps', 'Cancel'),
-				},
-				(result) => {
-					if (result) {
-						const photos = this.contextCluster.getAllChildMarkers().map((m) => {
-							return m.data
-						})
-						this.resetPhotosCoords(photos)
-					}
-				},
-				true,
-			)
-		},
-		resetPhotosCoords(photos) {
-			const paths = photos.map((p) => { return p.path })
-			this.$emit('coords-reset', paths)
-			this.map.closePopup()
-		},
-		updateClusterLoadingProgress(processed, total, elapsed, layersArray) {
-			if (elapsed > 100 && !this.clustersLoading) {
-				this.clustersLoading = true
-			}
-			this.$emit('cluster-loading', processed, total)
-
+		updateClusterLoadingProgress(processed, total, elapsed) {
+			if (elapsed > 100 && !this.clustersLoading) this.clustersLoading = true;
+			this.$emit('cluster-loading', processed, total);
 			if (processed === total) {
-				this.clustersLoading = false
-				// all markers processed - hide the progress bar:
-				this.$emit('cluster-loaded')
+				this.clustersLoading = false;
+				this.$emit('cluster-loaded');
 			}
-		},
-
-		async updatePhotoMarkers() {
-			this.$refs.markerCluster.mapObject.removeLayers(this.photoMarkers)
-			this.photoMarkers = this.photos.map((p, i) => {
-				const m = new L.Marker([p.lat, p.lng],
-					{
-						draggable: this.draggable,
-					},
-				)
-				m.on(
-					'click', this.onPhotoClick,
-				)
-				m.on(
-					'contextmenu', this.onPhotoRightClick,
-				)
-				m.on(
-					'mouseover', this.onPhotoMouseOver,
-				)
-				m.on(
-					'mouseout', this.onPhotoMouseOut,
-				)
-				m.on(
-					'moveend', this.onPhotoMoved,
-				)
-				m.data = p
-				return m
-			})
-			this.$refs.markerCluster.mapObject.addLayers(this.photoMarkers)
-			if (this.dateFilterEnabled) {
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.photoMarkers.slice(
-						this.photosLastNullIndex + 1,
-						this.photosFirstShownIndex,
-					),
-				)
-				this.$refs.markerCluster.mapObject.removeLayers(
-					this.photoMarkers.slice(
-						this.photosLastShownIndex + 1,
-					),
-				)
-			}
-		},
-		async updatePhotoMarkersDraggable() {
-			this.photoMarkers.forEach((m) => {
-				if (m.dragging) {
-					this.draggable ? m.dragging.enable() : m.dragging.disable()
-				}
-				m.options.draggable = this.draggable
-				m.update()
-			})
-		},
-		isPublic() {
-			return isPublic()
-		},
-	},
+		}
+	}
 }
 </script>
 
-<style lang="scss" scoped>
-// nothing
+<style lang="scss">
+/* Note: Since we are rendering HTML templates via JS, we remove the "scoped" attribute so styles apply to the dynamic HTML */
 .tooltip-photo-wrapper {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 }
-</style>
+.popup-photo-wrapper .action-btn {
+	display: block;
+	width: 100%;
+	padding: 8px;
+	border: none;
+	background: transparent;
+	text-align: left;
+	cursor: pointer;
+}
+.popup-photo-wrapper .action-btn:hover {
+	background: var(--color-background-hover);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/map/PlaceContactPopup.vue b/src/components/map/PlaceContactPopup.vue
index 42488e27b..5d459388f 100644
--- a/src/components/map/PlaceContactPopup.vue
+++ b/src/components/map/PlaceContactPopup.vue
@@ -1,96 +1,89 @@
 <template>
-	<LMarker :lat-lng="latLng"
-		@ready="onMarkerReady">
-		<LIcon
-			class-name="placement-marker-icon"
-			:icon-size="[40, 40]"
-			:icon-url="markerIconUrl" />
-		<LPopup :options="popupOptions"
-			@ready="onPopupReady">
-			<h3 id="place-popup-title">
-				{{ t('maps', 'New contact address') }}
-			</h3>
-			<span v-if="addressLoading"
-				class="icon icon-loading-small" />
-			<textarea v-else
-				id="placeContactPopupAddress"
-				v-model="formattedAddress"
-				@input="addressEdited = true" />
-			<br>
-			<div class="contact-select">
-				<label for="userMultiselect">
-					<span class="icon icon-user" />
-				</label>
-				<NcSelect
-					id="userMultiselect"
-					ref="userMultiselect"
-					v-model="selectedContact"
-					class="contact-input"
-					track-by="URI"
-					label="FN"
-					:placeholder="t('maps', 'Choose a contact')"
-					:options="contactData"
-					:internal-search="true"
-					@search="asyncSearchContacts">
-					<template #option="option">
-						<Avatar
-							class="contact-avatar"
-							:is-no-user="true"
-							:url="option.AVATAR_URL"
-							:user="option.FN" />
-						{{ option.FN }}
-					</template>
-				</NcSelect>
-			</div>
-			<div class="address-type"
-				:name="t('maps', 'Address type')">
-				<label for="addressTypeSelect">
-					<span class="icon icon-address" />
-				</label>
-				<select id="addressTypeSelect"
-					v-model="addressType"
-					:disabled="!selectedContact">
-					<option value="home">
-						🏠 {{ t('maps', 'Home') }}
-					</option>
-					<option value="work">
-						🏢 {{ t('maps', 'Work') }}
-					</option>
-				</select>
-			</div>
-			<button class="submit-place-contact"
-				:disabled="!selectedContact"
-				:class="{ loading: searchingEditedAddress }"
-				@click="onValidate">
-				<span class="icon-add" />
-				{{ t('maps', 'Add address to contact') }}
-			</button>
-		</LPopup>
-	</LMarker>
+	<div class="place-contact-popup-content">
+		<h3 id="place-popup-title">
+			{{ t('maps', 'New contact address') }}
+		</h3>
+		<span v-if="addressLoading"
+			class="icon icon-loading-small" />
+		<textarea v-else
+			id="placeContactPopupAddress"
+			v-model="formattedAddress"
+			@input="addressEdited = true" />
+		<br>
+		<div class="contact-select">
+			<label for="userMultiselect">
+				<span class="icon icon-user" />
+			</label>
+			<NcSelect
+				id="userMultiselect"
+				ref="userMultiselect"
+				v-model="selectedContact"
+				class="contact-input"
+				track-by="URI"
+				inputLabel="FN"
+				:placeholder="t('maps', 'Choose a contact')"
+				:options="contactData"
+				:internal-search="true"
+				@search="asyncSearchContacts">
+				<template #option="option">
+					<Avatar
+						class="contact-avatar"
+						:is-no-user="true"
+						:url="option.AVATAR_URL"
+						:user="option.FN" />
+					{{ option.FN }}
+				</template>
+			</NcSelect>
+		</div>
+		<div class="address-type"
+			:name="t('maps', 'Address type')">
+			<label for="addressTypeSelect">
+				<span class="icon icon-address" />
+			</label>
+			<select id="addressTypeSelect"
+				v-model="addressType"
+				:disabled="!selectedContact">
+				<option value="home">
+					🏠 {{ t('maps', 'Home') }}
+				</option>
+				<option value="work">
+					🏢 {{ t('maps', 'Work') }}
+				</option>
+			</select>
+		</div>
+		<button class="submit-place-contact"
+			:disabled="!selectedContact"
+			:class="{ loading: searchingEditedAddress }"
+			@click="onValidate">
+			<span class="icon-add" />
+			{{ t('maps', 'Add address to contact') }}
+		</button>
+	</div>
 </template>
 
 <script>
+import L from 'leaflet'
 import { generateUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
 
-import { LMarker, LPopup, LIcon } from 'vue2-leaflet'
-import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
+import { NcSelect, NcAvatar } from '@nextcloud/vue'
 
 import { formatAddress } from '../../utils.js'
 import { searchContacts, geocode, searchAddress } from '../../network.js'
 
 export default {
 	name: 'PlaceContactPopup',
+	
 	components: {
-		LMarker,
-		LPopup,
-		LIcon,
 		NcSelect,
-		NcAvatar,
+		Avatar: NcAvatar, // Mapped to match template usage
 	},
 
 	props: {
+		map: {
+			type: Object,
+			required: true,
+		},
 		latLng: {
 			type: Object,
 			required: true,
@@ -99,9 +92,6 @@ export default {
 
 	data() {
 		return {
-			popupOptions: {
-				closeButton: false,
-			},
 			contactData: [],
 			addressLoading: false,
 			addressEdited: false,
@@ -121,6 +111,13 @@ export default {
 					: generateUrl('/apps/maps/contacts-avatar?name=' + encodeURIComponent(this.selectedContact.FN))
 				: generateUrl('/svg/core/actions/user?color=000000')
 		},
+		markerIcon() {
+			return L.icon({
+				className: 'placement-marker-icon',
+				iconSize: [40, 40],
+				iconUrl: this.markerIconUrl,
+			})
+		}
 	},
 
 	watch: {
@@ -129,13 +126,46 @@ export default {
 			this.formattedAddress = ''
 			this.addressEdited = false
 			this.getAddress()
+			
+			// Update marker position natively
+			if (this.marker) {
+				this.marker.setLatLng(this.latLng)
+			}
 		},
+		markerIconUrl() {
+			// Update marker icon natively when the user selects a different contact
+			if (this.marker) {
+				this.marker.setIcon(this.markerIcon)
+			}
+		}
+	},
+
+	created() {
+		// Store leaflet object non-reactively
+		this.marker = null
 	},
 
 	beforeMount() {
 		this.getAddress()
 	},
 
+	mounted() {
+		// 1. Create native Leaflet marker
+		this.marker = L.marker(this.latLng, { icon: this.markerIcon }).addTo(this.map)
+		
+		// 2. Bind THIS component's HTML to the popup natively
+		this.marker.bindPopup(this.$el, { closeButton: false })
+		
+		this.marker.openPopup()
+	},
+
+	beforeUnmount() {
+		// 3. Clean up native marker on destroy
+		if (this.marker && this.map) {
+			this.map.removeLayer(this.marker)
+		}
+	},
+
 	methods: {
 		asyncSearchContacts(query) {
 			if (query === '') {
@@ -153,13 +183,6 @@ export default {
 				console.error(error)
 			})
 		},
-		onMarkerReady(m) {
-			m.openPopup()
-		},
-		onPopupReady(p) {
-			// i don't know why but it is placed too high when it's created
-			p.setLatLng(this.latLng)
-		},
 		getContactAvatar(contact) {
 			if (contact.HAS_PHOTO && contact.HAS_PHOTO2) {
 				return generateUrl(
@@ -188,6 +211,7 @@ export default {
 					address: this.address,
 					addressType: this.addressType,
 				})
+				if (this.map) this.map.closePopup()
 			} else {
 				this.searchingEditedAddress = true
 				searchAddress(this.formattedAddress, 1).then((response) => {
@@ -203,10 +227,12 @@ export default {
 						address,
 						addressType: this.addressType,
 					})
+					
+					if (this.map) this.map.closePopup()
 				}).catch((error) => {
 					console.error(error)
 				}).then(() => {
-					this.searchingEditedAddress = true
+					this.searchingEditedAddress = false
 				})
 			}
 		},
@@ -230,7 +256,7 @@ export default {
 }
 
 .contact-select {
-	.multiselect {
+	::v-deep .multiselect {
 		flex-grow: 1;
 	}
 }
@@ -269,4 +295,4 @@ span.icon {
 	height: 75px;
 	resize: block;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/map/PoiMarker.vue b/src/components/map/PoiMarker.vue
index e9aa40873..c85e90d4d 100644
--- a/src/components/map/PoiMarker.vue
+++ b/src/components/map/PoiMarker.vue
@@ -1,123 +1,38 @@
 <template>
-	<LMarker
-		:lat-lng="[poi.lat, poi.lon]">
-		<LTooltip>
-			{{ tooltipContent }}
-		</LTooltip>
-		<LPopup>
-			<div v-if="poi.icon" class="inline-wrapper">
-				<img class="location-icon" :src="poi.icon">
-				<h2 class="location-header">
-					{{ header }}
-				</h2>
-			</div>
-			<span class="location-city">{{ desc }}</span>
-			<button class="search-add-favorite" @click="onAddFavorite">
-				<span class="icon-favorite" />
-				{{ t('maps', 'Add to favorites') }}
-			</button>
-			<button class="search-place-contact" @click="onAddContact">
-				<span class="icon-user" />
-				{{ t('maps', 'Add contact address') }}
-			</button>
-			<div v-if="myOpeningHours"
-				class="opening-hours-header inline-wrapper"
-				@click="ohOpen = !ohOpen">
-				<img class="popup-icon" :src="recentImagePath">
-
-				<span v-if="ohChangeDt && ohIsCurrentlyOpen"
-					class="poi-open">
-					{{ t('maps', 'Open') }}
-					&nbsp;
-				</span>
-				<span v-if="ohChangeDt && ohIsCurrentlyOpen && ohDtDiff <= 60"
-					class="poi-closes">
-					&nbsp;
-					{{ t('maps', 'closes in {nb} minutes', { nb: parseInt(ohDtDiff) }) }}
-				</span>
-				<span v-if="ohChangeDt && ohIsCurrentlyOpen && ohDtDiff > 60">
-					&nbsp;
-					{{ t('maps', 'until {date}', { date: formattedOhChangeDt }) }}
-				</span>
-
-				<span v-if="ohChangeDt && !ohIsCurrentlyOpen"
-					class="poi-closed">
-					{{ t('maps', 'Closed') }}
-					&nbsp;
-				</span>
-				<span v-if="ohChangeDt && !ohIsCurrentlyOpen"
-					class="poi-opens">
-					{{ t('maps', 'opens at {date}', { date: formattedOhChangeDt }) }}
-				</span>
-
-				<img v-if="ohOpen"
-					id="opening-hours-table-toggle-collapse"
-					:src="triangleSimagePath">
-				<img v-if="!ohOpen"
-					id="opening-hours-table-toggle-expand"
-					:src="triangleEPath">
-			</div>
-			<table v-if="myOpeningHours && ohOpen"
-				class="opening-hours-table">
-				<tr v-for="(int, i) in ohIntervals"
-					:key="i"
-					:class="{ selected: int.selected }">
-					<td class="opening-hours-day">
-						{{ int.day }}
-					</td>
-					<td class="opening-hours-hours">
-						{{ int.startTime }} - {{ int.endTime }}
-					</td>
-				</tr>
-			</table>
-			<div v-if="poi.extratags && poi.extratags.website" class="inline-wrapper extra-wrapper">
-				<img class="popup-icon" :src="linkImagePath">
-				<a :href="poi.extratags.website" target="_blank">
-					{{ poi.extratags.website.replace(/^(?:\w+:|)\/\/(?:www\.|)(.*[^\/])\/*$/, '$1') }}
-				</a>
-			</div>
-			<div v-if="poi.extratags && poi.extratags.phone" class="inline-wrapper extra-wrapper">
-				<img class="popup-icon" :src="linkImagePath">
-				<a :href="'tel:' + poi.extratags.phone" target="_blank">
-					{{ poi.extratags.phone }}
-				</a>
-			</div>
-			<div v-if="poi.extratags && poi.extratags.email" class="inline-wrapper extra-wrapper">
-				<img class="popup-icon" :src="mailImagePath">
-				<a :href="'mailto:' + poi.extratags.email" target="_blank">
-					{{ poi.extratags.email }}
-				</a>
-			</div>
-		</LPopup>
-	</LMarker>
+	<div class="poi-popup-content">
+		<div v-if="poi.icon" class="inline-wrapper">
+			<img class="location-icon" :src="poi.icon">
+			<h2 class="location-header">{{ header }}</h2>
+		</div>
+		<span class="location-city">{{ desc }}</span>
+		
+		<button class="search-add-favorite" @click="onAddFavorite">
+			<span class="icon-favorite" />
+			{{ t('maps', 'Add to favorites') }}
+		</button>
+		<button class="search-place-contact" @click="onAddContact">
+			<span class="icon-user" />
+			{{ t('maps', 'Add contact address') }}
+		</button>
+		
+		</div>
 </template>
 
 <script>
+import L from 'leaflet'
 import { imagePath } from '@nextcloud/router'
 import moment from '@nextcloud/moment'
-import { formatAddress } from '../../utils.js'
-
-import { LMarker, LPopup, LTooltip } from 'vue2-leaflet'
 import OpeningHours from 'opening_hours'
+import { formatAddress } from '../../utils.js'
 
 export default {
 	name: 'PoiMarker',
-
-	components: {
-		LMarker,
-		LPopup,
-		LTooltip,
-	},
-
 	props: {
-		poi: {
-			type: Object,
-			required: true,
-		},
+		poi: { type: Object, required: true },
+		map: { type: Object, required: true },
 	},
-
 	data() {
-		return {
+		return { 
 			recentImagePath: imagePath('maps', 'recent.svg'),
 			triangleSimagePath: imagePath('maps', 'triangle-s.svg'),
 			triangleEPath: imagePath('maps', 'triangle-e.svg'),
@@ -126,8 +41,7 @@ export default {
 			ohOpen: false,
 		}
 	},
-
-	computed: {
+	computed: { 
 		tooltipContent() {
 			return this.poi.namedetails?.name || this.poi.display_name
 		},
@@ -233,63 +147,24 @@ export default {
 			}
 			return desc
 		},
+	 },
+	created() {
+		this.marker = null; // Non-reactive
 	},
-
-	methods: {
-		onAddFavorite() {
-			this.$emit('add-favorite',
-				{
-					...this.poi,
-					latLng: {
-						lat: this.poi.lat,
-						lng: this.poi.lon,
-					},
-					name: this.header,
-					formattedAddress: formatAddress(this.poi.address),
-				})
-		},
-		onAddContact() {
-			this.$emit('place-contact',
-				{
-					...this.poi,
-					latLng: {
-						lat: this.poi.lat,
-						lng: this.poi.lon,
-					},
-					name: this.header,
-					formattedAddress: formatAddress(this.poi.address),
-				})
-		},
+	mounted() {
+		this.marker = L.marker([this.poi.lat, this.poi.lon]).addTo(this.map);
+		
+		this.marker.bindTooltip(this.tooltipContent);
+		
+		this.marker.bindPopup(this.$el);
 	},
+	beforeUnmount() {
+		if (this.marker && this.map) {
+			this.map.removeLayer(this.marker);
+		}
+	},
+	methods: { 
 
+	 }
 }
-</script>
-
-<style lang="scss" scoped>
-.opening-hours-header {
-	height: 30px;
-	img {
-		height: 100%;
-		padding: 5px 0 5px 0;
-	}
-	* {
-		cursor: pointer;
-	}
-	span {
-		line-height: 30px;
-	}
-}
-
-.opening-hours-table {
-	width: 100%;
-	td {
-		padding: 0 5px 0 5px;
-	}
-}
-
-.extra-wrapper {
-	a {
-		line-height: 20px;
-	}
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/src/components/map/SearchControl.vue b/src/components/map/SearchControl.vue
index 1af37f912..77ccc1f82 100644
--- a/src/components/map/SearchControl.vue
+++ b/src/components/map/SearchControl.vue
@@ -1,5 +1,5 @@
 <template>
-	<LControl position="topleft" class="maps-search-control leaflet-control" :class="{'mobile':isMobile, 'desktop': !isMobile}">
+	<div ref="controlContent" class="maps-search-control leaflet-control" :class="{'mobile':isMobile, 'desktop': !isMobile}">
 		<div id="search">
 			<SearchField
 				class="search-field"
@@ -19,13 +19,13 @@
 				<span class="icon icon-close" />
 			</button>
 		</div>
-	</LControl>
+	</div>
 </template>
 
 <script>
+import L from 'leaflet'
 import { getLocale } from '@nextcloud/l10n'
-import { LControl } from 'vue2-leaflet'
-import { isMobile } from '@nextcloud/vue'
+import { useIsMobile } from '@nextcloud/vue'
 
 import SearchField from './SearchField.vue'
 
@@ -33,29 +33,20 @@ export default {
 	name: 'SearchControl',
 
 	components: {
-		LControl,
 		SearchField,
 	},
 
-	mixins: [isMobile],
+	setup() {
+		const isMobile = useIsMobile()
+		return { isMobile }
+	},
 
 	props: {
-		map: {
-			type: Object,
-			required: true,
-		},
-		searchData: {
-			type: Array,
-			required: true,
-		},
-		loading: {
-			type: Boolean,
-			default: false,
-		},
-		resultPoiNumber: {
-			type: Number,
-			default: 0,
-		},
+		map: { type: Object, required: true },
+		searchData: { type: Array, required: true },
+		loading: { type: Boolean, default: false },
+		resultPoiNumber: { type: Number, default: 0 },
+		position: { type: String, default: 'topleft' }
 	},
 
 	data() {
@@ -64,13 +55,29 @@ export default {
 		}
 	},
 
-	watch: {
+	created() {
+		this.control = null;
 	},
 
-	created() {
+	mounted() {
+		const el = this.$refs.controlContent;
+		if (!el) return;
+
+		const CustomControl = L.Control.extend({
+			onAdd: () => el
+		});
+
+		this.control = new CustomControl({ position: this.position });
+		this.control.addTo(this.map);
+
+		L.DomEvent.disableClickPropagation(el);
+		L.DomEvent.disableScrollPropagation(el);
 	},
 
-	methods: {
+	beforeUnmount() {
+		if (this.control && this.map) {
+			this.map.removeControl(this.control);
+		}
 	},
 }
 </script>
@@ -132,4 +139,4 @@ export default {
 	-webkit-mask-size: 16px auto;
 	-webkit-mask-position: center;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/map/SearchField.vue b/src/components/map/SearchField.vue
index 9d890daf4..7e51b3dd3 100644
--- a/src/components/map/SearchField.vue
+++ b/src/components/map/SearchField.vue
@@ -1,6 +1,7 @@
 <template>
 	<NcSelect
 		ref="select"
+		inputLabel="label"
 		class="search-select"
 		label="label"
 		track-by="multiselectKey"
@@ -39,7 +40,7 @@
 </template>
 
 <script>
-import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
+import { NcSelect } from '@nextcloud/vue'
 
 import L from 'leaflet'
 
diff --git a/src/components/map/SimpleOSMAddress.vue b/src/components/map/SimpleOSMAddress.vue
index 41edd8994..cd9724c54 100644
--- a/src/components/map/SimpleOSMAddress.vue
+++ b/src/components/map/SimpleOSMAddress.vue
@@ -22,9 +22,9 @@
 <template>
 	<div class="osm-address">
 		<p class="osm-address-text">
-			<template v-for="line in addressLines">
-				<span :key="line" :title="line" class="osm-address-line">{{ line }}</span>
-				<br :key="line">
+			<template  :key="line" v-for="line in addressLines">
+				<span :title="line" class="osm-address-line">{{ line }}</span>
+				<br />
 			</template>
 		</p>
 		<div class="loading" :class="{ visible: loading }" />
diff --git a/src/components/map/TrackHoverMarker.vue b/src/components/map/TrackHoverMarker.vue
index 91ac2aa9f..26828d22a 100644
--- a/src/components/map/TrackHoverMarker.vue
+++ b/src/components/map/TrackHoverMarker.vue
@@ -1,50 +1,33 @@
 <template>
-	<LFeatureGroup>
-		<LMarker
-			:icon="icon"
-			:lat-lng="[point.lat, point.lng]">
-			<LTooltip :options="tooltipOptions">
-				<div class="tooltip-device-wrapper"
-					:style="'border: 2px solid ' + point.color">
-					<b>{{ t('maps', 'File') }}:</b>
-					<span>{{ point.file_name }}</span>
-					<div v-if="trackName">
-						<b>{{ t('maps', 'Track/Route') }}:</b>
-						<span>{{ trackName }}</span>
-					</div>
-					<div v-if="date">
-						<b>{{ t('maps', 'Date') }}:</b>
-						<span>{{ date }}</span>
-					</div>
-					<div v-if="altitude">
-						<b>{{ t('maps', 'Altitude') }}:</b>
-						<span>{{ altitude }}</span>
-					</div>
-				</div>
-			</LTooltip>
-		</LMarker>
-	</LFeatureGroup>
+	<div class="tooltip-device-wrapper"
+		:style="'border: 2px solid ' + point.color">
+		<b>{{ t('maps', 'File') }}:</b>
+		<span>{{ point.file_name }}</span>
+		<div v-if="trackName">
+			<b>{{ t('maps', 'Track/Route') }}:</b>
+			<span>{{ trackName }}</span>
+		</div>
+		<div v-if="date">
+			<b>{{ t('maps', 'Date') }}:</b>
+			<span>{{ date }}</span>
+		</div>
+		<div v-if="altitude">
+			<b>{{ t('maps', 'Altitude') }}:</b>
+			<span>{{ altitude }}</span>
+		</div>
+	</div>
 </template>
 
 <script>
 import L from 'leaflet'
-import { LMarker, LTooltip, LFeatureGroup } from 'vue2-leaflet'
-
 import moment from '@nextcloud/moment'
 
 export default {
 	name: 'TrackHoverMarker',
-	components: {
-		LFeatureGroup,
-		LMarker,
-		LTooltip,
-	},
 
 	props: {
-		point: {
-			type: Object,
-			required: true,
-		},
+		point: { type: Object, required: true },
+		map: { type: Object, required: true }, // Added map prop
 	},
 
 	data() {
@@ -60,35 +43,53 @@ export default {
 
 	computed: {
 		icon() {
-			return L.divIcon(L.extend({
-				html: '<div class="device-over-marker" style="background-color: ' + this.point.color + ';"></div>',
+			return L.divIcon({
+				html: `<div class="device-over-marker" style="background-color: ${this.point.color};"></div>`,
 				className: 'device-over-marker-wrapper',
-			}, null, {
 				iconSize: [16, 16],
 				iconAnchor: [8, 8],
-			}))
+			})
 		},
 		date() {
-			if (this.point.timestamp) {
-				const mom = moment.unix(this.point.timestamp)
-				return mom.format('LL') + ' ' + mom.format('HH:mm:ss')
-			} else {
-				return null
-			}
-		},
-		altitude() {
-			return this.point.ele
-				? this.point.ele + ' m'
-				: null
-		},
-		trackName() {
-			return this.point.track_name
-				? this.point.track_name
+			return this.point.timestamp 
+				? moment.unix(this.point.timestamp).format('LL') + ' ' + moment.unix(this.point.timestamp).format('HH:mm:ss') 
 				: null
 		},
+		altitude() { return this.point.ele ? this.point.ele + ' m' : null },
+		trackName() { return this.point.track_name ? this.point.track_name : null },
+	},
+
+	created() {
+		this.marker = null;
 	},
 
-	methods: {
+	watch: {
+		point: {
+			handler(newPoint) {
+				if (this.marker) {
+					this.marker.setLatLng([newPoint.lat, newPoint.lng])
+					this.marker.setIcon(this.icon)
+					this.marker.setTooltipContent(this.$el)
+				}
+			},
+			deep: true
+		}
+	},
+
+	mounted() {
+		this.marker = L.marker([this.point.lat, this.point.lng], { 
+			icon: this.icon, 
+			interactive: false 
+		}).addTo(this.map)
+
+		this.marker.bindTooltip(this.$el, this.tooltipOptions)
+		this.marker.openTooltip()
+	},
+
+	beforeUnmount() {
+		if (this.marker && this.map) {
+			this.map.removeLayer(this.marker)
+		}
 	},
 }
 </script>
@@ -100,4 +101,4 @@ export default {
 	background-color: var(--color-main-background);
 	color: var(--color-main-text);
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/map/TrackLayer.vue b/src/components/map/TrackLayer.vue
deleted file mode 100644
index 6d082c969..000000000
--- a/src/components/map/TrackLayer.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<template>
-	<LFeatureGroup
-		ref="featgroup"
-		@ready="onFGReady"
-		@click="$emit('click', track)"
-		@contextmenu="onFGRightClick">
-		<LPopup :options="popupOptions"
-			class="popup-track-wrapper">
-			<NcActionButton v-if="track.isUpdateable"
-				icon="icon-colorpicker"
-				@click="$emit('change-color', track)">
-				{{ t('maps', 'Change color') }}
-			</NcActionButton>
-			<NcActionButton icon="icon-category-monitoring" @click="$emit('display-elevation', track)">
-				{{ t('maps', 'Display elevation') }}
-			</NcActionButton>
-			<NcActionButton v-if="!isPublic() && track.isShareable"
-				icon="icon-share"
-				@click="$emit('add-to-map-track', track)">
-				{{ t('maps', 'Copy to map') }}
-			</NcActionButton>
-			<NcActionLink v-if="!isPublic()"
-				:href="downloadTrackUrl"
-				target="_self"
-				icon="icon-download"
-				:close-after-click="true"
-				@click="closeafterclickworkaround">
-				<!--
-				looks like close-after-click not working in this popovermenu
-				therefore added workaround closeafterclickworkaround
-				-->
-				{{ t('maps', 'Download track') }}
-			</NcActionLink>
-			<NcActionLink v-if="isPublic() && !(track.hideDownload)"
-				target="_self"
-				:href="downloadTrackShareUrl"
-				icon="icon-download"
-				:close-after-click="true"
-				@click="closeafterclickworkaround">
-				<!--
-				looks like close-after-click not working in this popovermenu
-				therefore added workaround closeafterclickworkaround
-				-->
-				{{ t('maps', 'Download track') }}
-			</NcActionLink>
-		</LPopup>
-		<LMarker v-if="firstPoint"
-			:icon="firstPointMarkerIcon"
-			:lat-lng="firstPoint" >
-			<LTooltip :options="tooltipOptions">
-        		<div class="tooltip-track-wrapper"
-					:style="'border: 2px solid ' + color">					
-					<b>{{ t('maps', 'File') }}:</b>
-					<span>{{ track.file_name }}</span>
-					<br v-if="dateBegin">
-					<b v-if="dateBegin">{{ t('maps', 'Begins at') }}:</b>
-					<span v-if="dateBegin">{{ dateBegin }}</span>
-					<br v-if="firstPoint.name">
-					<b v-if="firstPoint.name">{{ t('maps', 'Name') }}:</b>
-					<span v-if="firstPoint.name">{{ firstPoint.name }}</span>
-					<br v-if="firstPoint.desc">
-					<b v-if="firstPoint.desc">{{ t('maps', 'Description') }}:</b>
-					<span v-if="firstPoint.desc">{{ firstPoint.desc }}</span>
-					<br v-if="firstPoint.ele">
-					<b v-if="firstPoint.ele">{{ t('maps', 'Altitude') }}:</b>
-					<span v-if="firstPoint.ele">{{ firstPoint.ele }} m</span>					
-				</div>
-    		</LTooltip>
-		</LMarker>
-		<LMarker v-for="(point, i) in wayPoints"
-			:key="'waypoint:'.concat(i)"
-			:icon="wayPointMarkerIcon"
-			:lat-lng="point">
-			<LTooltip :options="tooltipOptions">
-        		<div class="tooltip-track-wrapper"
-					:style="'border: 2px solid ' + color">					
-					<b>{{ t('maps', 'File') }}:</b>
-					<span>{{ track.file_name }}</span>
-					<br v-if="point.name">
-					<b v-if="point.name">{{ t('maps', 'Name') }}:</b>
-					<span v-if="point.name">{{ point.name }}</span>
-					<br v-if="point.desc">
-					<b v-if="point.desc">{{ t('maps', 'Description') }}:</b>
-					<span v-if="point.desc">{{ point.desc }}</span>
-					<br v-if="point.ele">
-					<b v-if="point.ele">{{ t('maps', 'Altitude') }}:</b>
-					<span v-if="point.ele">{{ point.ele }} m</span>
-				</div>
-    		</LTooltip>
-		</LMarker>
-		<LFeatureGroup v-for="(line, i) in lines"
-			:key="'line'.concat(i)"
-			@mouseover="trackLineMouseover($event, line)">
-			<LPolyline
-				color="black"
-				:opacity="1"
-				:weight="4 * 1.6"
-				:lat-lngs="line.points" />
-			<LPolyline
-				:color="color"
-				:opacity="1"
-				:weight="4"
-				:lat-lngs="line.points" />
-		</LFeatureGroup>
-	</LFeatureGroup>
-</template>
-
-<script>
-import L from 'leaflet'
-import { LMarker, LTooltip, LPopup, LFeatureGroup, LPolyline } from 'vue2-leaflet'
-
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
-import moment from '@nextcloud/moment'
-import { generateUrl } from '@nextcloud/router'
-
-import optionsController from '../../optionsController.js'
-import { binSearch, isPublic, getToken } from '../../utils/common.js'
-
-const TRACK_MARKER_VIEW_SIZE = 40
-const WAYPOINT_MARKER_VIEW_SIZE = 30
-
-export default {
-	name: 'TrackLayer',
-	components: {
-		LMarker,
-		LTooltip,
-		LPopup,
-		LFeatureGroup,
-		LPolyline,
-		NcActionButton,
-		NcActionLink,
-	},
-
-	props: {
-		track: {
-			type: Object,
-			required: true,
-		},
-		start: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		end: {
-			type: Number,
-			required: false,
-			default: moment().unix(),
-		},
-	},
-
-	data() {
-		return {
-			optionValues: optionsController.optionValues,
-			lineOptions: {
-				weight: 4,
-				opacity: 1,
-			},
-			tooltipOptions: {
-				sticky: true,
-				className: 'leaflet-marker-track-tooltip',
-				direction: 'top',
-				offset: L.point(0, 0),
-			},
-			popupOptions: {
-				closeButton: false,
-				closeOnClick: false,
-				className: 'popovermenu open popupMarker trackPopup',
-				offset: L.point(-5, -20),
-			},
-		}
-	},
-
-	computed: {
-		downloadTrackUrl() {
-			return OCA.Files.App.fileList.filesClient.getBaseUrl() + this.track.file_path
-		},
-		downloadTrackShareUrl() {
-			return generateUrl('s/' + getToken() + '/download' + '?path=/&files=' + this.track.file_name)
-		},
-		dateBegin() {
-			return this.track.metadata?.begin
-				? moment.unix(this.track.metadata.begin).format('LLL')
-				: ''
-		},
-		lines() {
-			const trkSegments = []
-			if ((this.metadata?.begin && this.metadata?.begin > 0 && this.track.metadata.begin >= this.end) || (this.track.metadata?.end && this.track.metadata?.end > 0 && this.track.metadata?.end <= this.start)) {
-				return [...this.track.data.routes, trkSegments]
-			} else if ((!this.track.metadata?.begin || this.metadata?.begin < 0 || this.track.metadata?.begin >= this.start) && (!this.track.metadata?.end || !this.track.metadata?.end < 0 || this.track.metadata?.end <= this.end)) {
-				this.track.data.tracks.forEach((trk) => {
-					trk.segments.forEach((segment) => {
-						// add track name to each segment
-						trkSegments.push({
-							...segment,
-							name: trk.name,
-						})
-					})
-				})
-			} else {
-				this.track.data.tracks.forEach((trk) => {
-					trk.segments.forEach((segment) => {
-						const lastNullIndex = binSearch(segment.points, (p) => !p.timestamp)
-						const firstShownIndex = binSearch(segment.points, (p) => (p.timestamp || -1) < this.start) + 1
-						const lastShownIndex = binSearch(segment.points, (p) => (p.timestamp || -1) < this.end)
-						const points = [
-							...segment.points.slice(0, lastNullIndex + 1),
-							...segment.points.slice(firstShownIndex, lastShownIndex + 1),
-						]
-						// add track name to each segment
-						trkSegments.push({
-							...segment,
-							name: trk.name,
-							points,
-						})
-					})
-				})
-			}
-			return [...this.track.data.routes, ...trkSegments]
-		},
-		color() {
-			return this.track.color || '#0082c9'
-		},
-		firstPointMarkerIcon() {
-			const selectedClass = this.track.selected
-				? 'selected'
-				: ''
-			return L.divIcon(L.extend({
-				html: '<div class="thumbnail-wrapper" style="--custom-color: ' + this.color + '; border-color: ' + this.color + ';">'
-					+ '<div class="thumbnail" style="background-color: ' + this.color + ';"></div></div>​',
-				className: 'leaflet-marker-track track-marker ' + selectedClass,
-			}, null, {
-				iconSize: [TRACK_MARKER_VIEW_SIZE, TRACK_MARKER_VIEW_SIZE],
-				iconAnchor: [TRACK_MARKER_VIEW_SIZE / 2, TRACK_MARKER_VIEW_SIZE],
-			}))
-		},
-		wayPointMarkerIcon() {
-			return L.divIcon(L.extend({
-				html: '<div class="thumbnail-wrapper" style="--custom-color: ' + this.color + '; border-color: ' + this.color + ';">'
-					+ '<div class="thumbnail" style="background-color: ' + this.color + ';"></div></div>​',
-				className: 'leaflet-marker-track track-waypoint ',
-			}, null, {
-				iconSize: [WAYPOINT_MARKER_VIEW_SIZE, WAYPOINT_MARKER_VIEW_SIZE],
-				iconAnchor: [WAYPOINT_MARKER_VIEW_SIZE / 2, WAYPOINT_MARKER_VIEW_SIZE],
-			}))
-		},
-		firstPoint() {
-			let firstPoint = null
-			if (this.track.data.tracks.length > 0
-				&& this.track.data.tracks[0].segments.length > 0
-				&& this.track.data.tracks[0].segments[0].points.length > 0) {
-				firstPoint = this.track.data.tracks[0].segments[0].points[0]
-			}
-			if (this.track.data.routes.length > 0
-				&& this.track.data.routes[0].points.length > 0
-				&& (firstPoint === null
-					|| (!firstPoint.timestamp && this.track.data.routes[0].points[0].timestamp)
-					|| (this.track.data.routes[0].points[0].timestamp && firstPoint.timestamp
-						&& this.track.data.routes[0].points[0].timestamp < firstPoint.timestamp))) {
-				firstPoint = this.track.data.routes[0].points[0]
-			}
-			if (this.track.data.waypoints.length > 0
-				&& (firstPoint === null
-					|| (!firstPoint.timestamp && this.track.data.waypoints[0].timestamp)
-					|| (this.track.data.waypoints[0].timestamp && firstPoint.timestamp
-						&& this.track.data.waypoints[0].timestamp < firstPoint.timestamp))) {
-				firstPoint = this.track.data.waypoints[0]
-			}
-			return firstPoint
-		},
-		wayPoints() {
-			let points = []
-			if (this.firstPoint === this.track.data.waypoints[0]) {
-				points = this.track.data.waypoints.slice(1)
-			} else {
-				points = this.track.data.waypoints
-			}
-			if (this.track.metadata?.begin >= this.end || (this.track.metadata?.end >= 0 && this.track.metadata?.end <= this.start)) {
-				return []
-			} else if (this.track.metadata?.begin >= this.start && this.track.metadata?.end <= this.end) {
-				return points
-			} else {
-				const lastNullIndex = binSearch(points, (p) => !p.timestamp)
-				const firstShownIndex = binSearch(points, (p) => (p.timestamp || -1) < this.start) + 1
-				const lastShownIndex = binSearch(points, (p) => (p.timestamp || -1) < this.end)
-				return [
-					...points.slice(0, lastNullIndex + 1),
-					...points.slice(firstShownIndex, lastShownIndex + 1),
-				]
-			}
-		},
-	},
-
-	created() {
-	},
-
-	methods: {
-		// looks like close-after-click not working for NcAcionLink
-		// added working closeafterclickworkaround
-		closeafterclickworkaround() {
-			this.$refs.featgroup.mapObject.closePopup()
-		},
-		onFGReady(f) {
-			// avoid left click popup
-			L.DomEvent.on(f, 'click', (ev) => {
-				f.closePopup()
-			})
-		},
-		onFGRightClick(e) {
-			this.$refs.featgroup.mapObject.openPopup()
-		},
-		trackLineMouseover(e, line) {
-			console.debug(this.track)
-			const overLatLng = e.layer._map.layerPointToLatLng(e.layerPoint)
-			let minDist = 40000000
-			let tmpDist
-			let closestI = -1
-			for (let i = 0; i < line.points.length; i++) {
-				tmpDist = e.layer._map.distance(overLatLng, line.points[i])
-				if (tmpDist < minDist) {
-					minDist = tmpDist
-					closestI = i
-				}
-			}
-			if (closestI !== -1) {
-				const hoverPoint = {
-					...line.points[closestI],
-					color: this.color,
-					file_name: this.track.file_name,
-					track_name: line.name,
-				}
-				this.$emit('point-hover', hoverPoint)
-			}
-		},
-		isPublic() {
-			return isPublic()
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-// nothing
-.tooltip-track-wrapper {
-	padding: 6px;
-	border-radius: 3px;
-	background-color: var(--color-main-background);
-	color: var(--color-main-text);
-}
-
-::v-deep .icon-colorpicker {
-	opacity: 1;
-	mask: url('../../../img/color_picker.svg') no-repeat;
-	-webkit-mask: url('../../../img/color_picker.svg') no-repeat;
-	background-color: var(--color-main-text);
-	padding: 0 !important;
-	mask-size: 16px auto;
-	mask-position: center;
-	-webkit-mask-size: 16px auto;
-	-webkit-mask-position: center;
-	width: 44px;
-	height: 44px;
-}
-</style>
diff --git a/src/components/map/TracksLayer.vue b/src/components/map/TracksLayer.vue
index 07d2ace49..7a36291c6 100644
--- a/src/components/map/TracksLayer.vue
+++ b/src/components/map/TracksLayer.vue
@@ -1,91 +1,249 @@
 <template>
-	<LFeatureGroup>
-		<TrackLayer v-for="track in displayedTracks"
-			:key="track.id + track.color"
-			:track="track"
-			:start="start"
-			:end="end"
-			@click="$emit('click', $event)"
-			@add-to-map-track="$emit('add-to-map-track', $event)"
-			@change-color="$emit('change-color', $event)"
-			@display-elevation="$emit('display-elevation', $event)"
-			@point-hover="onPointHover" />
-		<TrackHoverMarker
-			v-if="hoverPoint"
-			:point="hoverPoint" />
-	</LFeatureGroup>
+	<div style="display: none;"></div>
 </template>
 
 <script>
-import { LFeatureGroup } from 'vue2-leaflet'
-
-import TrackLayer from './TrackLayer.vue'
-import TrackHoverMarker from './TrackHoverMarker.vue'
-
-import optionsController from '../../optionsController.js'
+import L from 'leaflet'
 import moment from '@nextcloud/moment'
+import { generateUrl } from '@nextcloud/router'
+import optionsController from '../../optionsController.js'
+import { binSearch, isPublic, getToken } from '../../utils/common.js'
+
+const TRACK_MARKER_VIEW_SIZE = 40
+const WAYPOINT_MARKER_VIEW_SIZE = 30
 
 export default {
 	name: 'TracksLayer',
-	components: {
-		LFeatureGroup,
-		TrackLayer,
-		TrackHoverMarker,
-	},
 
 	props: {
-		tracks: {
-			type: Array,
-			required: true,
-		},
-		map: {
-			type: Object,
-			required: true,
-		},
-		start: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		end: {
-			type: Number,
-			required: false,
-			default: moment().unix(),
-		},
+		tracks: { type: Array, required: true },
+		map: { type: Object, required: true },
+		start: { type: Number, default: 0 },
+		end: { type: Number, default: () => moment().unix() },
 	},
 
-	data() {
-		return {
-			optionValues: optionsController.optionValues,
-			hoverPoint: null,
-		}
+	created() {
+		this.featureGroup = L.featureGroup();
 	},
 
 	computed: {
 		displayedTracks() {
-			return this.tracks.filter((track) => {
-				return track.enabled
-			})
+			return this.tracks.filter(track => track.enabled);
 		},
 	},
 
 	watch: {
-		tracks: {
-			handler() {
-				this.hoverPoint = null
-			},
-			deep: true,
-		},
+		displayedTracks: { handler: 'renderTracks', deep: true },
+		start: 'renderTracks',
+		end: 'renderTracks',
+	},
+
+	mounted() {
+		this.featureGroup.addTo(this.map);
+		this.renderTracks();
+	},
+
+	beforeUnmount() {
+		if (this.featureGroup && this.map) {
+			this.map.removeLayer(this.featureGroup);
+		}
 	},
 
 	methods: {
-		onPointHover(point) {
-			this.hoverPoint = point
+		isPublic() { return isPublic() },
+
+		renderTracks() {
+			this.featureGroup.clearLayers();
+
+			this.displayedTracks.forEach(track => {
+				const trackGroup = L.featureGroup();
+				const color = track.color || '#0082c9';
+
+				// Calculate Lines
+				const linesData = this.calculateLines(track);
+				linesData.forEach(line => {
+					const lineBg = L.polyline(line.points, { color: 'black', opacity: 1, weight: 4 * 1.6 });
+					const lineFg = L.polyline(line.points, { color: color, opacity: 1, weight: 4 });
+					
+					const lineGroup = L.featureGroup([lineBg, lineFg]);
+					lineGroup.on('mouseover', (e) => this.onTrackLineMouseover(e, line, track, color));
+					lineGroup.on('contextmenu', (e) => this.showTrackPopup(e, track));
+					lineGroup.on('click', () => this.$emit('click', track));
+
+					trackGroup.addLayer(lineGroup);
+				});
+
+				// Calculate First Point & Waypoints
+				const firstPoint = this.calculateFirstPoint(track);
+				if (firstPoint) {
+					const marker = this.createTrackMarker(firstPoint, track, color, true);
+					trackGroup.addLayer(marker);
+				}
+
+				const waypoints = this.calculateWaypoints(track, firstPoint);
+				waypoints.forEach(pt => {
+					const marker = this.createTrackMarker(pt, track, color, false);
+					trackGroup.addLayer(marker);
+				});
+
+				this.featureGroup.addLayer(trackGroup);
+			});
 		},
+
+		calculateLines(track) {
+			const trkSegments = [];
+			if ((track.metadata?.begin > 0 && track.metadata.begin >= this.end) || (track.metadata?.end > 0 && track.metadata.end <= this.start)) {
+				return [...(track.data?.routes || []), trkSegments];
+			} else if ((!track.metadata?.begin || track.metadata.begin >= this.start) && (!track.metadata?.end || track.metadata.end <= this.end)) {
+				(track.data?.tracks || []).forEach((trk) => {
+					trk.segments.forEach((segment) => {
+						trkSegments.push({ ...segment, name: trk.name });
+					});
+				});
+			} else {
+				(track.data?.tracks || []).forEach((trk) => {
+					trk.segments.forEach((segment) => {
+						const lastNullIndex = binSearch(segment.points, (p) => !p.timestamp);
+						const firstShownIndex = binSearch(segment.points, (p) => (p.timestamp || -1) < this.start) + 1;
+						const lastShownIndex = binSearch(segment.points, (p) => (p.timestamp || -1) < this.end);
+						const points = [
+							...segment.points.slice(0, lastNullIndex + 1),
+							...segment.points.slice(firstShownIndex, lastShownIndex + 1),
+						];
+						trkSegments.push({ ...segment, name: trk.name, points });
+					});
+				});
+			}
+			return [...(track.data?.routes || []), ...trkSegments];
+		},
+
+		calculateFirstPoint(track) {
+			let firstPoint = null;
+			if (track.data?.tracks?.[0]?.segments?.[0]?.points?.length > 0) {
+				firstPoint = track.data.tracks[0].segments[0].points[0];
+			}
+			if (track.data?.routes?.[0]?.points?.length > 0 && (firstPoint === null || (!firstPoint.timestamp && track.data.routes[0].points[0].timestamp) || (track.data.routes[0].points[0].timestamp && firstPoint.timestamp && track.data.routes[0].points[0].timestamp < firstPoint.timestamp))) {
+				firstPoint = track.data.routes[0].points[0];
+			}
+			if (track.data?.waypoints?.length > 0 && (firstPoint === null || (!firstPoint.timestamp && track.data.waypoints[0].timestamp) || (track.data.waypoints[0].timestamp && firstPoint.timestamp && track.data.waypoints[0].timestamp < firstPoint.timestamp))) {
+				firstPoint = track.data.waypoints[0];
+			}
+			return firstPoint;
+		},
+
+		calculateWaypoints(track, firstPoint) {
+			if(!track.data?.waypoints) return [];
+			let points = firstPoint === track.data.waypoints[0] ? track.data.waypoints.slice(1) : track.data.waypoints;
+
+			if (track.metadata?.begin >= this.end || (track.metadata?.end >= 0 && track.metadata?.end <= this.start)) {
+				return [];
+			} else if (track.metadata?.begin >= this.start && track.metadata?.end <= this.end) {
+				return points;
+			} else {
+				const lastNullIndex = binSearch(points, (p) => !p.timestamp);
+				const firstShownIndex = binSearch(points, (p) => (p.timestamp || -1) < this.start) + 1;
+				const lastShownIndex = binSearch(points, (p) => (p.timestamp || -1) < this.end);
+				return [
+					...points.slice(0, lastNullIndex + 1),
+					...points.slice(firstShownIndex, lastShownIndex + 1),
+				];
+			}
+		},
+
+		createTrackMarker(point, track, color, isFirstPoint) {
+			const size = isFirstPoint ? TRACK_MARKER_VIEW_SIZE : WAYPOINT_MARKER_VIEW_SIZE;
+			const markerClass = isFirstPoint ? `track-marker ${track.selected ? 'selected' : ''}` : 'track-waypoint';
+
+			const marker = L.marker([point.lat, point.lng], {
+				icon: L.divIcon({
+					html: `<div class="thumbnail-wrapper" style="--custom-color: ${color}; border-color: ${color};"><div class="thumbnail" style="background-color: ${color};"></div></div>​`,
+					className: `leaflet-marker-track ${markerClass}`,
+					iconSize: [size, size],
+					iconAnchor: [size / 2, size],
+				})
+			});
+
+			const dateBegin = track.metadata?.begin ? moment.unix(track.metadata.begin).format('LLL') : '';
+			let tooltipHtml = `<div class="tooltip-track-wrapper" style="border: 2px solid ${color}"><b>${t('maps', 'File')}:</b> <span>${track.file_name}</span>`;
+			if (isFirstPoint && dateBegin) tooltipHtml += `<br><b>${t('maps', 'Begins at')}:</b> <span>${dateBegin}</span>`;
+			if (point.name) tooltipHtml += `<br><b>${t('maps', 'Name')}:</b> <span>${point.name}</span>`;
+			if (point.desc) tooltipHtml += `<br><b>${t('maps', 'Description')}:</b> <span>${point.desc}</span>`;
+			if (point.ele) tooltipHtml += `<br><b>${t('maps', 'Altitude')}:</b> <span>${point.ele} m</span>`;
+			tooltipHtml += `</div>`;
+
+			marker.bindTooltip(tooltipHtml, { sticky: true, className: 'leaflet-marker-track-tooltip', direction: 'top', offset: L.point(0, 0) });
+			marker.on('contextmenu', (e) => this.showTrackPopup(e, track));
+			marker.on('click', () => this.$emit('click', track));
+
+			return marker;
+		},
+
+		showTrackPopup(e, track) {
+			const downloadUrl = (window.OCA?.Files?.App?.fileList?.filesClient?.getBaseUrl) 
+				? window.OCA.Files.App.fileList.filesClient.getBaseUrl() + track.file_path 
+				: generateUrl('s/' + getToken() + '/download' + '?path=/&files=' + track.file_name);
+
+			const popupContent = L.DomUtil.create('div', 'popup-track-wrapper');
+			popupContent.innerHTML = `
+				${track.isUpdateable ? `<button class="action-btn" data-action="color">${t('maps', 'Change color')}</button>` : ''}
+				<button class="action-btn" data-action="elevation">${t('maps', 'Display elevation')}</button>
+				${!this.isPublic() && track.isShareable ? `<button class="action-btn" data-action="copy">${t('maps', 'Copy to map')}</button>` : ''}
+				${(!this.isPublic() || (this.isPublic() && !track.hideDownload)) ? `<a class="action-btn" href="${downloadUrl}" target="_self">${t('maps', 'Download track')}</a>` : ''}
+			`;
+
+			popupContent.addEventListener('click', (event) => {
+				const action = event.target.getAttribute('data-action');
+				if (action === 'color') this.$emit('change-color', track);
+				if (action === 'elevation') this.$emit('display-elevation', track);
+				if (action === 'copy') this.$emit('add-to-map-track', track);
+				if (action !== 'download') this.map.closePopup(); // Let anchor handle native download
+			});
+
+			L.popup({ closeButton: false, className: 'popovermenu open popupMarker trackPopup', offset: L.point(-5, -20) })
+				.setLatLng(e.latlng)
+				.setContent(popupContent)
+				.openOn(this.map);
+		},
+
+		onTrackLineMouseover(e, line, track, color) {
+			const overLatLng = e.layer._map.layerPointToLatLng(e.layerPoint);
+			let minDist = 40000000, tmpDist, closestI = -1;
+			for (let i = 0; i < line.points.length; i++) {
+				tmpDist = e.layer._map.distance(overLatLng, line.points[i]);
+				if (tmpDist < minDist) { minDist = tmpDist; closestI = i; }
+			}
+			if (closestI !== -1) {
+				this.$emit('point-hover', {
+					...line.points[closestI],
+					color,
+					file_name: track.file_name,
+					track_name: line.name,
+				});
+			}
+		}
 	},
 }
 </script>
 
-<style lang="scss" scoped>
-// nothing
-</style>
+<style lang="scss">
+.tooltip-track-wrapper {
+	padding: 6px;
+	border-radius: 3px;
+	background-color: var(--color-main-background);
+	color: var(--color-main-text);
+}
+.popup-track-wrapper .action-btn {
+	display: block;
+	width: 100%;
+	padding: 8px;
+	border: none;
+	background: transparent;
+	text-decoration: none;
+	color: var(--color-main-text);
+	text-align: left;
+	cursor: pointer;
+}
+.popup-track-wrapper .action-btn:hover {
+	background: var(--color-background-hover);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/map/Vue2LeafletDelayedMarkerCluster.vue b/src/components/map/Vue2LeafletDelayedMarkerCluster.vue
deleted file mode 100644
index c72c52e0a..000000000
--- a/src/components/map/Vue2LeafletDelayedMarkerCluster.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-	<div style="display: none;">
-		<slot v-if="ready" />
-	</div>
-</template>
-
-<script>
-import { MarkerClusterGroup } from 'leaflet.markercluster'
-import { findRealParent, propsBinder } from 'vue2-leaflet'
-import { DomEvent } from 'leaflet'
-
-const props = {
-	options: {
-		type: Object,
-		default() { return {} },
-	},
-	delay: {
-		type: Number,
-		default: 1,
-	},
-}
-
-export default {
-	props,
-	data() {
-		return {
-			ready: false,
-		}
-	},
-	mounted() {
-		this.lastChange = Date.now()
-		this.addLayerCache = {}
-		this.removeLayerCache = {}
-		this.caching = false
-		this.mapObject = new MarkerClusterGroup(this.options)
-		DomEvent.on(this.mapObject, this.$listeners)
-		propsBinder(this, this.mapObject, props)
-		this.ready = true
-		this.parentContainer = findRealParent(this.$parent)
-		this.parentContainer.addLayer(this)
-		this.$nextTick(() => {
-			this.$emit('ready', this.mapObject)
-		})
-	},
-	beforeDestroy() {
-		this.parentContainer.removeLayer(this)
-	},
-	methods: {
-		addLayer(layer, alreadyAdded) {
-			if (!alreadyAdded) {
-				this.lastChange = Date.now()
-				delete this.removeLayerCache[layer._uid]
-				this.addLayerCache[layer._uid] = layer.mapObject
-				if (!this.caching) {
-					this.scheduleUpdate()
-				}
-			}
-		},
-		removeLayer(layer, alreadyRemoved) {
-			if (!alreadyRemoved) {
-				this.lastChange = Date.now()
-				delete this.addLayerCache[layer._uid]
-				this.removeLayerCache[layer._uid] = layer.mapObject
-				if (!this.caching) {
-					this.scheduleUpdate()
-				}
-			}
-		},
-		scheduleUpdate() {
-			setTimeout(function() {
-				this.update()
-			}.bind(this),
-			this.delay + 1,
-			)
-		},
-		update() {
-			if ((Date.now() - this.lastChange) >= this.delay) {
-				this.mapObject.addLayers(
-					Object.values(this.addLayerCache),
-				)
-				this.mapObject.removeLayers(
-					Object.values(this.removeLayerCache),
-				)
-				this.caching = false
-				this.addLayerCache = {}
-				this.removeLayerCache = {}
-			} else {
-				this.scheduleUpdate()
-			}
-		},
-	},
-}
-</script>
diff --git a/src/components/map/routing/RoutingControl.vue b/src/components/map/routing/RoutingControl.vue
index c6077e399..e28f2b17b 100644
--- a/src/components/map/routing/RoutingControl.vue
+++ b/src/components/map/routing/RoutingControl.vue
@@ -1,5 +1,5 @@
 <template>
-	<LControl class="maps-routing-control leaflet-control" :class="{'mobile': isMobile, 'desktop':!isMobile}" position="topleft">
+	<div ref="controlContent" class="maps-routing-control leaflet-control" :class="{'mobile': isMobile, 'desktop':!isMobile}">
 		<div class="routing-header">
 			<span class="icon icon-routing" />
 			<span class="title">
@@ -27,12 +27,12 @@
 			@plan-ready-changed="onPlanReadyChanged"
 			@route-selected="onRouteSelected"
 			@track-added="$emit('track-added', $event)" />
-	</LControl>
+	</div>
 </template>
 
 <script>
-import { LControl } from 'vue2-leaflet'
-import { isMobile } from '@nextcloud/vue'
+import L from 'leaflet'
+import { useIsMobile } from '@nextcloud/vue'
 
 import RoutingSteps from './RoutingSteps.vue'
 import RoutingMachine from './RoutingMachine.vue'
@@ -50,24 +50,18 @@ export default {
 	components: {
 		RoutingSteps,
 		RoutingMachine,
-		LControl,
 	},
 
-	mixins: [isMobile],
+	setup() {
+		const isMobile = useIsMobile()
+		return { isMobile }
+	},
 
 	props: {
-		map: {
-			type: Object,
-			required: true,
-		},
-		searchData: {
-			type: Array,
-			required: true,
-		},
-		visible: {
-			type: Boolean,
-			default: true,
-		},
+		map: { type: Object, required: true },
+		searchData: { type: Array, required: true },
+		visible: { type: Boolean, default: true },
+		position: { type: String, default: 'topleft' }
 	},
 
 	data() {
@@ -77,10 +71,29 @@ export default {
 		}
 	},
 
-	watch: {
+	created() {
+		this.control = null;
 	},
 
-	created() {
+	mounted() {
+		const el = this.$refs.controlContent;
+		if (!el) return;
+
+		const CustomControl = L.Control.extend({
+			onAdd: () => el
+		});
+
+		this.control = new CustomControl({ position: this.position });
+		this.control.addTo(this.map);
+
+		L.DomEvent.disableClickPropagation(el);
+		L.DomEvent.disableScrollPropagation(el);
+	},
+
+	beforeUnmount() {
+		if (this.control && this.map) {
+			this.map.removeControl(this.control);
+		}
 	},
 
 	methods: {
@@ -167,4 +180,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/map/routing/RoutingMachine.vue b/src/components/map/routing/RoutingMachine.vue
index 792c2911f..df4c3cc26 100644
--- a/src/components/map/routing/RoutingMachine.vue
+++ b/src/components/map/routing/RoutingMachine.vue
@@ -8,7 +8,7 @@ import { generateUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
 import moment from '@nextcloud/moment'
 import { showSuccess, showError } from '@nextcloud/dialogs'
-import { isMobile } from '@nextcloud/vue'
+import { useIsMobile } from '@nextcloud/vue'
 
 import L from 'leaflet'
 import 'leaflet-control-geocoder/dist/Control.Geocoder.js'
@@ -22,7 +22,10 @@ import optionsController from '../../../optionsController.js'
 export default {
 	name: 'RoutingMachine',
 
-	mixins: [isMobile],
+	setup() {
+		const isMobile = useIsMobile()
+		return { isMobile }
+	},
 
 	props: {
 		map: {
diff --git a/src/files-actions/import-devices.ts b/src/files-actions/import-devices.ts
index 140892fcc..28d38b017 100644
--- a/src/files-actions/import-devices.ts
+++ b/src/files-actions/import-devices.ts
@@ -1,49 +1,52 @@
 import axios from '@nextcloud/axios'
 import { showError, showSuccess } from '@nextcloud/dialogs'
-import { FileAction, Permission } from '@nextcloud/files'
-import { n, t } from '@nextcloud/l10n'
+import { type IFileAction, type IFile, type ActionContext } from '@nextcloud/files'
+import { t, n } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
-
 import svgMapMarker from '@mdi/svg/svg/map-marker.svg?raw'
 
-export default new FileAction({
-	id: 'maps:import-device',
-
-	displayName() {
-		return t('maps', 'Import as devices in Maps')
-	},
-
-	enabled(files) {
-		if (files.length !== 1) {
-			return false
-		}
-
-		const [file] = files
-		if (!(file.permissions & Permission.READ)) {
-			return false
-		}
-		return [
-			'application/gpx+xml',
-			'application/vnd.google-earth.kmz',
-			'application/vnd.google-earth.kml+xml',
-		].includes(file.mime)
-	},
-
-	async exec(file) {
-		const path = file.path
-		const url = generateUrl('/apps/maps/import/devices')
-		try {
-			const { data } = await axios.post(url, { path })
-			const number = typeof data === 'number' ? data : data.nbImported
-			showSuccess(n('maps', 'One device imported', '%n devices imported', number))
-		} catch (error) {
-			showError(t('maps', 'Failed to import devices'))
-			console.error('Failed to import devices', { error })
-		}
-		return null
-	},
-
-	iconSvgInline() {
-		return svgMapMarker
-	},
-})
+const importDevicesAction: IFileAction = {
+    id: 'maps:import-device',
+
+    displayName() {
+        return t('maps', 'Import as devices in Maps')
+    },
+
+    enabled(context: ActionContext) {
+        const files = context.contents
+        if (!files || files.length !== 1) {
+            return false
+        }
+
+        const file = files[0] as IFile
+        return [
+            'application/gpx+xml',
+            'application/vnd.google-earth.kmz',
+            'application/vnd.google-earth.kml+xml',
+        ].includes(file.mime)
+    },
+
+    async exec(context: ActionContext) {
+        const file = context.contents[0] as IFile
+        const url = generateUrl('/apps/maps/import/devices')
+
+        try {
+            const { data } = await axios.post(url, { path: file.path })
+            const number = typeof data === 'number' ? data : data.nbImported
+            showSuccess(
+                n('maps', 'One device imported', '%n devices imported', number)
+            )
+        } catch (error) {
+            showError(t('maps', 'Failed to import devices'))
+            console.error('Failed to import devices', { error })
+        }
+
+        return null
+    },
+
+    iconSvgInline() {
+        return svgMapMarker
+    },
+}
+
+export default importDevicesAction
\ No newline at end of file
diff --git a/src/files-actions/import-favorite.ts b/src/files-actions/import-favorite.ts
index 6e2f03dd1..008e4304e 100644
--- a/src/files-actions/import-favorite.ts
+++ b/src/files-actions/import-favorite.ts
@@ -1,20 +1,17 @@
 import axios from '@nextcloud/axios'
 import { showError, showSuccess } from '@nextcloud/dialogs'
-import { FileAction, Permission } from '@nextcloud/files'
+import { type IFileAction, Permission } from '@nextcloud/files'
 import { n, t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
 
 import svgMapMarker from '@mdi/svg/svg/map-marker.svg?raw'
 
-export default new FileAction({
-	id: 'maps:import-as-favorite',
-
-	displayName() {
-		return t('maps', 'Import as favorites in Maps')
-	},
-
-	enabled(files) {
-		if (files.length !== 1) {
+const action: IFileAction = {
+    id: 'maps:import-as-favorite',
+    displayName: (content) => t('maps', 'Import as favorites in Maps'),
+    enabled: (content) => {
+        const files = content.contents
+        if (files.length !== 1) {
 			return false
 		}
 
@@ -28,10 +25,10 @@ export default new FileAction({
 			'application/vnd.google-earth.kmz',
 			'application/vnd.google-earth.kml+xml',
 		].includes(file.mime)
-	},
-
-	async exec(file) {
-		const path = file.path
+    },
+    exec: async (content) => {
+        const [file] = content.contents
+        const path = file.path
 		const url = generateUrl('/apps/maps/import/favorites')
 		try {
 			const { data } = await axios.post(url, { path })
@@ -42,9 +39,8 @@ export default new FileAction({
 			console.error('Failed to import favorites', { error })
 		}
 		return null
-	},
+    },
+    iconSvgInline: () => svgMapMarker
+}
 
-	iconSvgInline() {
-		return svgMapMarker
-	},
-})
+export default action
\ No newline at end of file
diff --git a/src/files-actions/view-in-maps.ts b/src/files-actions/view-in-maps.ts
index b3ee74123..ce7f06f97 100644
--- a/src/files-actions/view-in-maps.ts
+++ b/src/files-actions/view-in-maps.ts
@@ -1,23 +1,17 @@
-import { DefaultType, FileAction, Permission } from '@nextcloud/files'
+import { Permission, type IFileAction } from '@nextcloud/files'
 import { t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
 
 import svgMapMarker from '@mdi/svg/svg/map-marker.svg?raw'
 
-export default new FileAction({
-	id: 'maps:view-map',
-	default: DefaultType.DEFAULT,
-
-	displayName() {
-		return t('maps', 'View in Maps')
-	},
-
-	enabled(files) {
-		if (files.length !== 1) {
-			return false
-		}
-
-		const [file] = files
+const iFileAction: IFileAction = {
+    id: 'maps:view-map',
+    displayName: (context) => t('maps', 'View in Maps'),
+    enabled: (context) => {
+        if(context.contents.length !== 1) {
+            return false
+        }
+        const [file] = context.contents
 		if (!(file.permissions & Permission.READ)) {
 			return false
 		}
@@ -25,21 +19,21 @@ export default new FileAction({
 			'application/gpx+xml',
 			'application/x-nextcloud-maps',
 		].includes(file.mime)
-	},
-
-	async exec(file) {
-		if (file.mime === 'application/x-nextcloud-maps') {
-			const url = generateUrl('apps/maps/m/{mapId}', { mapId: file.fileid })
+    },
+    exec: async (context) => {
+        const [file] = context.contents
+        if (file.mime === 'application/x-nextcloud-maps') {
+			const url = generateUrl('apps/maps/m/{mapId}', { mapId: file.id })
+            console.log("log url : " + url)
 			window.open(url, '_self')
 		} else {
 			const url = generateUrl('apps/maps/?track={path}', { path: file.path })
+            console.log("log url : " + url)
 			window.open(url, '_self')
 		}
+        return null
+    },
+    iconSvgInline: (context) => svgMapMarker
+} 
 
-		return null
-	},
-
-	iconSvgInline() {
-		return svgMapMarker
-	},
-})
+export default iFileAction
diff --git a/src/main.js b/src/main.js
index 12eb2f0d7..cf095ba0a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,89 +20,90 @@
  *
  */
 
-import Vue from 'vue'
+import { createApp } from 'vue'
 import App from './views/App.vue'
-import './bootstrap.js'
-import optionsController from './optionsController.js'
 import '../css/style.scss'
 
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import optionsController from './optionsController.js'
 import { emit } from '@nextcloud/event-bus'
-
 import { generateUrl } from '@nextcloud/router'
 
-// Fixing Some leaflet webpack stuff See https://vue2-leaflet.netlify.app/faq/#my-map-and-or-markers-don-t-fully-render-what-gives
 import L from 'leaflet'
 import 'lrm-graphhopper'
-import { isPublic } from './utils/common.js'
-delete L.Icon.Default.prototype._getIconUrl
 
+delete L.Icon.Default.prototype._getIconUrl
 L.Icon.Default.mergeOptions({
-	iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
-	iconUrl: require('leaflet/dist/images/marker-icon.png'),
-	shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
+    iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+    iconUrl: require('leaflet/dist/images/marker-icon.png'),
+    shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
 })
 
-// Vue
-Vue.directive('tooltip', Tooltip)
-
-// eslint-disable-next-line
-'use strict'
-
 // Maps actions registrations (other apps that want to receive a position)
 if (!window.OCA.Maps) {
-	window.OCA.Maps = {
-		mapActions: [],
-	}
+    window.OCA.Maps = {
+        mapActions: [],
+    }
 }
 
 window.OCA.Maps.registerMapsAction = ({ label, callback, icon }) => {
-	const mapAction = {
-		label,
-		callback,
-		icon,
-	}
+    const mapAction = {
+        label,
+        callback,
+        icon,
+    }
 
-	window.OCA.Maps.mapActions.push(mapAction)
+    window.OCA.Maps.mapActions.push(mapAction)
 }
 
 // SIDEBAR
 if (!window.OCA.Files) {
-	window.OCA.Files = {}
+    window.OCA.Files = {}
 }
 // register unused client for the sidebar to have access to its parser methods
 if (!window.OCA.Files.Sidebar) {
-	Object.assign(window.OCA.Files, {
-		Sidebar: {
-			state: {
-				file: '',
-			},
-			open: (path) => {
-				emit('files:sidebar:opened')
-			},
-			close: () => {
-				emit('files:sidebar:closed')
-			},
-			setFullScreenMode: () => {}, // SIDEBARFULLSCREEN,
-		},
-	}, window.OCA.Files)
+    Object.assign(window.OCA.Files, {
+        Sidebar: {
+            state: {
+                file: '',
+            },
+            open: (path) => {
+                emit('files:sidebar:opened')
+            },
+            close: () => {
+                emit('files:sidebar:closed')
+            },
+            setFullScreenMode: () => {}, // SIDEBARFULLSCREEN,
+        },
+    }, window.OCA.Files)
 }
 
 if (window.navigator.registerProtocolHandler) {
-	window.navigator.registerProtocolHandler('geo', generateUrl('/apps/maps/openGeoLink/') + '%s', 'Nextcloud Maps')
+    window.navigator.registerProtocolHandler('geo', generateUrl('/apps/maps/openGeoLink/') + '%s', 'Nextcloud Maps')
 }
 
-document.addEventListener('DOMContentLoaded', (event) => {
-	Object.assign(window.OCA.Files, {
-		App: { fileList: { filesClient: OC.Files.getClient() } },
-	}, window.OCA.Files)
-	optionsController.restoreOptions(main)
-})
-
 function main() {
-	// eslint-disable-next-line
-	new Vue({
-		el: '#content',
-		render: h => h(App),
-	})
+    const app = createApp(App);
+    
+    app.config.globalProperties.t = window.t;
+    app.config.globalProperties.n = window.n;
+    app.config.globalProperties.OC = window.OC;
+    app.config.globalProperties.OCA = window.OCA;
+
+    // Custom Tooltip Directive (converts v-tooltip to native title attribute)
+    app.directive('tooltip', {
+        mounted(el, binding) {
+            const text = binding.value?.content || binding.value || '';
+            el.setAttribute('title', text);
+        },
+        updated(el, binding) {
+            const text = binding.value?.content || binding.value || '';
+            el.setAttribute('title', text);
+        }
+    });
+
+    app.mount('#content');
 }
+
+document.addEventListener('DOMContentLoaded', () => {
+    optionsController.restoreOptions(main)
+})
\ No newline at end of file
diff --git a/src/models/copyMapsLinkAction.js b/src/models/copyMapsLinkAction.js
index 3d6c6f1a1..79a92268d 100644
--- a/src/models/copyMapsLinkAction.js
+++ b/src/models/copyMapsLinkAction.js
@@ -20,7 +20,7 @@
  *
  */
 
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import { NcActionButton } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 
diff --git a/src/publicFavoriteShare.js b/src/publicFavoriteShare.js
index 8aaee4abb..1551e9a84 100644
--- a/src/publicFavoriteShare.js
+++ b/src/publicFavoriteShare.js
@@ -20,13 +20,20 @@
  *
  */
 
-import Vue from 'vue'
+import { createApp } from 'vue'
 import PublicFavoriteShare from './views/PublicFavoriteShare.vue'
-import './bootstrap.js'
+
+import './bootstrap.js' 
 
 import store from './store/publicFavoriteShareStore.js'
 
-new Vue({
-	render: h => h(PublicFavoriteShare),
-	store,
-}).$mount('#content')
+const app = createApp(PublicFavoriteShare)
+
+app.use(store)
+
+app.config.globalProperties.t = window.t
+app.config.globalProperties.n = window.n
+app.config.globalProperties.OC = window.OC
+app.config.globalProperties.OCA = window.OCA
+
+app.mount('#content')
\ No newline at end of file
diff --git a/src/services/FileInfo.js b/src/services/FileInfo.js
index 8b62063e1..0abfa96e6 100644
--- a/src/services/FileInfo.js
+++ b/src/services/FileInfo.js
@@ -23,48 +23,108 @@
 import axios from '@nextcloud/axios'
 
 /**
- * @param {any} url -
+ * Fetches file info using PROPFIND
+ * @param {string} url
  */
 export default async function(url) {
-	const response = await axios({
-		method: 'PROPFIND',
-		url,
-		data: `<?xml version="1.0"?>
-			<d:propfind  xmlns:d="DAV:"
-				xmlns:oc="http://owncloud.org/ns"
-				xmlns:nc="http://nextcloud.org/ns"
-				xmlns:ocs="http://open-collaboration-services.org/ns">
-			<d:prop>
-				<d:getlastmodified />
-				<d:getetag />
-				<d:getcontenttype />
-				<d:resourcetype />
-				<oc:fileid />
-				<oc:permissions />
-				<oc:size />
-				<d:getcontentlength />
-				<nc:has-preview />
-				<nc:mount-type />
-				<nc:is-encrypted />
-				<ocs:share-permissions />
-				<oc:tags />
-				<oc:favorite />
-				<oc:comments-unread />
-				<oc:owner-id />
-				<oc:owner-display-name />
-				<oc:share-types />
-			</d:prop>
-			</d:propfind>`,
-	})
-
-	// TODO: create new parser or use cdav-lib when available
-	const file = OCA.Files.App.fileList.filesClient._client.parseMultiStatus(response.data)
-	// TODO: create new parser or use cdav-lib when available
-	const fileInfo = OCA.Files.App.fileList.filesClient._parseFileInfo(file[0])
-
-	// TODO remove when no more legacy backbone is used
-	fileInfo.get = (key) => fileInfo[key]
-	fileInfo.isDirectory = () => fileInfo.mimetype === 'httpd/unix-directory'
-
-	return fileInfo
-}
+    const response = await axios({
+        method: 'PROPFIND',
+        url,
+        headers: {
+            Depth: 0,
+        },
+        data: `<?xml version="1.0"?>
+            <d:propfind xmlns:d="DAV:"
+                        xmlns:oc="http://owncloud.org/ns"
+                        xmlns:nc="http://nextcloud.org/ns"
+                        xmlns:ocs="http://open-collaboration-services.org/ns">
+                <d:prop>
+                    <d:getlastmodified />
+                    <d:getetag />
+                    <d:getcontenttype />
+                    <d:resourcetype />
+                    <oc:fileid />
+                    <oc:permissions />
+                    <oc:size />
+                    <d:getcontentlength />
+                    <nc:has-preview />
+                    <nc:mount-type />
+                    <nc:is-encrypted />
+                    <ocs:share-permissions />
+                    <oc:tags />
+                    <oc:favorite />
+                    <oc:comments-unread />
+                    <oc:owner-id />
+                    <oc:owner-display-name />
+                    <oc:share-types />
+                </d:prop>
+            </d:propfind>`,
+    })
+
+    const parser = new DOMParser()
+    const xml = parser.parseFromString(response.data, 'text/xml')
+
+    const responseNode = xml.querySelector('d\\:response, response')
+    if (!responseNode) {
+        throw new Error('Invalid DAV response')
+    }
+
+    const getText = (selector) => {
+        const el = responseNode.querySelector(selector)
+        return el ? el.textContent : null
+    }
+
+    const getBool = (selector) => {
+        const value = getText(selector)
+        return value === 'true' || value === '1'
+    }
+
+    const getInt = (selector) => {
+        const value = getText(selector)
+        return value ? parseInt(value, 10) : 0
+    }
+
+    const isDirectory =
+        !!responseNode.querySelector('d\\:resourcetype d\\:collection')
+
+    const fileInfo = {
+        // Core
+        id: getText('oc\\:fileid'),
+        etag: getText('d\\:getetag')?.replace(/"/g, ''),
+        mimetype: isDirectory
+            ? 'httpd/unix-directory'
+            : getText('d\\:getcontenttype'),
+        size: getInt('d\\:getcontentlength') || getInt('oc\\:size'),
+        lastModified: getText('d\\:getlastmodified'),
+
+        // Permissions
+        permissions: getText('oc\\:permissions'),
+        sharePermissions: getInt('ocs\\:share-permissions'),
+
+        // Owner
+        ownerId: getText('oc\\:owner-id'),
+        ownerDisplayName: getText('oc\\:owner-display-name'),
+
+        // Sharing
+        shareTypes: getText('oc\\:share-types'),
+
+        // Tags & metadata
+        tags: getText('oc\\:tags'),
+        favorite: getBool('oc\\:favorite'),
+        commentsUnread: getInt('oc\\:comments-unread'),
+
+        // Nextcloud-specific
+        hasPreview: getBool('nc\\:has-preview'),
+        mountType: getText('nc\\:mount-type'),
+        isEncrypted: getBool('nc\\:is-encrypted'),
+
+        // Raw resourcetype
+        resourcetype: isDirectory ? 'collection' : 'file',
+    }
+
+    // Legacy Backbone compatibility
+    fileInfo.get = (key) => fileInfo[key]
+    fileInfo.isDirectory = () => isDirectory
+
+    return fileInfo
+}
\ No newline at end of file
diff --git a/src/store/publicFavoriteShareStore.js b/src/store/publicFavoriteShareStore.js
index bfc7f217d..6d59d0387 100644
--- a/src/store/publicFavoriteShareStore.js
+++ b/src/store/publicFavoriteShareStore.js
@@ -20,14 +20,11 @@
  *
  */
 
-import * as Vuex from 'vuex'
-import Vue from 'vue'
+import { createStore } from 'vuex'
 import publicFavorites from './modules/publicFavorites.js'
 import map from './modules/map.js'
 
-Vuex.install(Vue)
-
-export default new Vuex.Store({
+export default createStore({
 	modules: {
 		publicFavorites,
 		map,
diff --git a/src/track-metadata-tab.js b/src/track-metadata-tab.js
index 5673715c1..f718a9b4d 100644
--- a/src/track-metadata-tab.js
+++ b/src/track-metadata-tab.js
@@ -19,53 +19,79 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import Vue from 'vue'
-import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 
+import { createApp } from 'vue'
+import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import TrackMetadataTab from './views/TrackMetadataTab.vue'
 
-Vue.prototype.t = t
-Vue.prototype.n = n
-
-// Init Tracks tab component
-const View = Vue.extend(TrackMetadataTab)
-
-// Init Maps Track tab component
+let appInstance = null
 let TabInstance = null
-const trackMetadataTab = new OCA.Files.Sidebar.Tab({
-	id: 'maps-track-metadata',
-	name: t('maps', 'Metadata'),
-	icon: 'icon-info',
 
-	async mount(el, fileInfo, context) {
-		if (TabInstance) {
-			TabInstance.$destroy()
-		}
-		TabInstance = new View({
-			// Better integration with vue parent component
-			parent: context,
-		})
-		// Only mount after we have all the info we need
-		await TabInstance.update(fileInfo.id)
-		TabInstance.$mount(el)
-	},
-	update(fileInfo) {
-		TabInstance.update(fileInfo.id)
-	},
-	destroy() {
-		TabInstance.$destroy()
-		TabInstance = null
-	},
-	enabled(fileInfo) {
-		return ['application/gpx+xml'].includes(fileInfo.mimetype)
-	},
-	scrollBottomReached() {
-		TabInstance.onScrollBottomReached()
-	},
-})
+function registerTab() {
+	const fileList = window.OCA?.Files?.App?.fileList
 
-window.addEventListener('DOMContentLoaded', function() {
-	if (OCA.Files && OCA.Files.Sidebar) {
-		OCA.Files.Sidebar.registerTab(trackMetadataTab)
+	if (!fileList?.registerSidebarTab) {
+		return false
 	}
-})
+
+	fileList.registerSidebarTab({
+		id: 'maps-track-metadata',
+		name: t('maps', 'Metadata'),
+		icon: 'icon-info',
+
+		async mount(el, fileInfo, context) {
+			// Unmount the previous instance if it exists
+			if (appInstance) {
+				appInstance.unmount()
+			}
+
+			// Create a new Vue 3 app instance for the sidebar tab
+			appInstance = createApp(TrackMetadataTab)
+			
+			// Replace Vue.prototype with globalProperties
+			appInstance.config.globalProperties.t = t
+			appInstance.config.globalProperties.n = n
+
+			// Mount it to the provided DOM element
+			TabInstance = appInstance.mount(el)
+
+			if (TabInstance && typeof TabInstance.update === 'function') {
+				await TabInstance.update(fileInfo.id)
+			}
+		},
+
+		update(fileInfo) {
+			if (TabInstance && typeof TabInstance.update === 'function') {
+				TabInstance.update(fileInfo.id)
+			}
+		},
+
+		destroy() {
+			if (appInstance) {
+				appInstance.unmount()
+				appInstance = null
+				TabInstance = null
+			}
+		},
+
+		enabled(fileInfo) {
+			return fileInfo?.mimetype === 'application/gpx+xml'
+		},
+
+		scrollBottomReached() {
+			if (TabInstance && typeof TabInstance.onScrollBottomReached === 'function') {
+				TabInstance.onScrollBottomReached()
+			}
+		},
+	})
+
+	return true
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+	const interval = setInterval(() => {
+		if (registerTab()) {
+			clearInterval(interval)
+		}
+	}, 100)
+})
\ No newline at end of file
diff --git a/src/views/App.vue b/src/views/App.vue
index c11e0cdfe..09450b67e 100644
--- a/src/views/App.vue
+++ b/src/views/App.vue
@@ -30,7 +30,8 @@
 					@toggle-all-categories="onToggleAllFavoriteCategories"
 					@export="onExportFavorites"
 					@import="onImportFavorites"
-					@draggable-clicked="favoritesDraggable = !favoritesDraggable" />
+					@draggable-clicked="favoritesDraggable = !favoritesDraggable" 
+				/>
 				<AppNavigationContactsItem
 					:enabled="contactsEnabled"
 					:loading="contactsLoading"
@@ -56,7 +57,8 @@
 					@redo-clicked="redoPhotoMove"
 					@draggable-clicked="photosDraggable = !photosDraggable"
 					@suggestions-clicked="onPhotoSuggestionsClicked"
-					@clear-cache="onPhotosClearCache" />
+					@clear-cache="onPhotosClearCache" 
+				/>
 				<AppNavigationTracksItem
 					ref="tracksNavigation"
 					:enabled="tracksEnabled"
@@ -85,7 +87,8 @@
 					@toggle-all="onToggleAllDevices"
 					@color="onChangeDeviceColor"
 					@device-clicked="onNavDeviceClicked"
-					@devices-clicked="onDevicesClicked" />
+					@devices-clicked="onDevicesClicked" 
+				/>
 				<AppNavigationMyMapsItem
 					v-if="!token"
 					ref="myMapsNavigation"
@@ -98,7 +101,8 @@
 					@share="onShareMyMap"
 					@color="onChangeMyMapColor"
 					@my-map-clicked="onMyMapClicked"
-					@my-maps-clicked="onMyMapsClicked" />
+					@my-maps-clicked="onMyMapsClicked" 
+				/>
 			</template>
 		</MapsNavigation>
 		<NcAppContent>
@@ -175,6 +179,7 @@
 			v-if="true"
 			ref="Sidebar"
 			:show="showSidebar"
+			:active-tab="activeTab"
 			:favorite="selectedFavorite"
 			:favorite-categories="favoriteCategories"
 			:track="selectedTrack"
@@ -204,10 +209,7 @@
 </template>
 
 <script>
-import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
-import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import { NcContent, NcAppContent, NcActions, NcActionButton } from '@nextcloud/vue'
 import { showError, showInfo, showSuccess } from '@nextcloud/dialogs'
 
 import moment from '@nextcloud/moment'
@@ -234,6 +236,7 @@ import * as network from '../network.js'
 import { all as axiosAll, spread as axiosSpread } from 'axios'
 import { generateUrl } from '@nextcloud/router'
 import { placeFileOrFolder } from '../utils/photoPicker.ts'
+import { getClient } from '@nextcloud/files/dav'
 
 export default {
 	name: 'App',
@@ -256,6 +259,8 @@ export default {
 
 	data() {
 		return {
+			// navigation
+			activeTab: null,
 		    // Map Options
 		    activeLayerId: optionsController.tileLayer,
 			mapBounds: optionsController.bounds,
@@ -652,13 +657,13 @@ export default {
 		// subscribe('nextcloud:unified-search.reset', this.cleanSearch)
 		setTimeout(() => { emit('files:sidebar:closed') }, 1000)
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		// unsubscribe('nextcloud:unified-search.search', this.filter)
 		// unsubscribe('nextcloud:unified-search.reset', this.cleanSearch)
 	},
 	methods: {
 		onActiveSidebarTabChanged(newActive) {
-			window.OCA.Files.Sidebar.setActiveTab(newActive)
+			this.activeTab = newActive
 		},
 		onMainDetailClicked() {
 			this.showSidebar ? this.closeSidebar() : this.openSidebar()
@@ -669,20 +674,20 @@ export default {
 			// Make shure that the active photo suggestions tab stays there if photo suggestions are loaded
 			if (this.showPhotoSuggestions) {
 				this.openSidebar()
-				window.OCA.Files.Sidebar.setActiveTab('photo-suggestion')
+				this.activeTab = 'photo-suggestion'
 			}
 		},
 		closeSidebar() {
 			this.$refs.Sidebar.close()
 			emit('files:sidebar:closed')
-			window.OCA.Files.Sidebar.setActiveTab('')
+			this.activeTab = null
 			this.showSidebar = false
 		},
 		openSidebar(path = null, type = null, title = null) {
 			this.showSidebar = true
 			this.$refs.Sidebar.open(path, type, title)
 			if (!path && this.showPhotoSuggestions) {
-				window.OCA.Files.Sidebar.setActiveTab('photo-suggestion')
+				this.activeTab = 'photo-suggestion'
 			}
 			/*
 			const myMap = path ? this.myMaps.find((m) => m.path === path) : false
@@ -1055,7 +1060,7 @@ export default {
 			if (this.photosEnabled && this.showPhotoSuggestions && this.photoSuggestions.length === 0) {
 				this.getPhotoSuggestions()
 			}
-			window.OCA.Files.Sidebar.setActiveTab('photo-suggestion')
+			this.activeTab = 'photo-suggestion'
 			this.showPhotoSuggestions ? this.openSidebar() : this.closeSidebar()
 		},
 		onPhotoSuggestionSelected(index) {
@@ -1096,7 +1101,7 @@ export default {
 								return t.id === parseInt(isplit[1])
 							})
 							if (track) {
-								this.$set(this.photoSuggestionsTracksAndDevices, i, {
+								this.photoSuggestionsTracksAndDevices[i] = {
 									key: i,
 									enabled: true,
 									visible: true,
@@ -1104,14 +1109,14 @@ export default {
 									name: track.file_name,
 									id: track.id,
 									suggestionCount: v.length,
-								})
+								}
 								photoSuggestions.push(...v)
 							} else {
-								this.$set(this.photoSuggestionsTracksAndDevices, i, {
+								this.photoSuggestionsTracksAndDevices[i] = {
 									key: i,
 									enabled: false,
 									visible: false,
-								})
+								}
 							}
 						} else if (isplit[0] === 'device') {
 							const device = this.devices.find((d) => {
@@ -1119,7 +1124,7 @@ export default {
 							})
 							if (device) {
 								photoSuggestions.push(...v)
-								this.$set(this.photoSuggestionsTracksAndDevices, i, {
+								this.photoSuggestionsTracksAndDevices[i] = {
 									key: i,
 									enabled: true,
 									visible: true,
@@ -1127,13 +1132,13 @@ export default {
 									name: device.user_agent,
 									id: device.id,
 									suggestionCount: v.length,
-								})
+								}
 							} else {
-								this.$set(this.photoSuggestionsTracksAndDevices, i, {
+								this.photoSuggestionsTracksAndDevices[i] = {
 									key: i,
 									enabled: false,
 									visible: false,
-								})
+								}
 							}
 						}
 					}
@@ -1191,7 +1196,7 @@ export default {
 				toSave.forEach((i) => {
 					this.photos.push(this.photoSuggestions[i])
 					this.photoSuggestionsTracksAndDevices[this.photoSuggestions[i].trackOrDeviceId].length -= 1
-					this.$set(this.photoSuggestions, i, null)
+					this.photoSuggestions[i] = null
 				})
 				this.photoSuggestionsSelectedIndices = this.photoSuggestionsSelectedIndices.filter((e) => {
 					return !toSave.includes(e)
@@ -1349,11 +1354,11 @@ export default {
 		buildContactGroups() {
 			this.contactGroups = {}
 			const notGroupedId = '0'
-			this.$set(this.contactGroups, notGroupedId, {
+			this.contactGroups[notGroupedId] = {
 				name: t('maps', 'Not grouped'),
 				counter: 0,
 				enabled: !this.disabledContactGroups.includes(notGroupedId),
-			})
+			}
 			this.contacts.forEach((c) => {
 				c.groupList = []
 				if (c.GROUPS) {
@@ -1365,11 +1370,11 @@ export default {
 								if (this.contactGroups[g]) {
 									this.contactGroups[g].counter++
 								} else {
-									this.$set(this.contactGroups, g, {
+									this.contactGroups[g] = {
 										name: g,
 										counter: 1,
 										enabled: !this.disabledContactGroups.includes(g),
-									})
+									}
 								}
 							})
 						} else {
@@ -1473,7 +1478,7 @@ export default {
 						f.category = t('maps', 'Personal')
 					}
 					f.selected = false
-					this.$set(this.favorites, f.id, f)
+					this.favorites[f.id] = f
 				})
 			}).catch((error) => {
 				console.error(error)
@@ -1489,7 +1494,7 @@ export default {
 							response.data.favorites.forEach((f) => {
 								f.id = s.token + f.id
 								f.selected = false
-								this.$set(this.favorites, f.id, f)
+								this.favorites[f.id] = f
 							})
 						}).catch((error) => {
 							console.error(error)
@@ -1535,7 +1540,7 @@ export default {
 		onFavoriteCategoryShareChange(catid, checked) {
 			if (checked) {
 				network.shareFavoriteCategory(catid, this.myMapId).then((response) => {
-					this.$set(this.favoriteCategoryTokens, catid, response.data.token)
+					this.favoriteCategoryTokens[catid] = response.data.token
 				}).catch((error) => {
 					console.error(error)
 				})
@@ -1576,7 +1581,7 @@ export default {
 			// select
 			this.favorites[f.id].selected = true
 			this.openSidebar(null, 'favorite', f.name)
-			window.OCA.Files.Sidebar.setActiveTab('favorite')
+			this.activeTab = 'favorite'
 			this.selectedFavorite = f
 		},
 		onFavoriteEdit(f, save = true) {
@@ -1746,10 +1751,10 @@ export default {
 						favorite: { ...fav },
 					})
 				}
-				this.$set(this.favorites, fav.id, fav)
+				this.favorites[fav.id] = fav
 				if (openSidebar) {
 					this.selectedFavorite = this.favorites[fav.id]
-					window.OCA.Files.Sidebar.setActiveTab('favorite')
+					this.activeTab = 'favorite'
 					this.openSidebar(null, 'favorite', fav.name)
 				}
 				if (this.sliderEnabled) {
@@ -1999,7 +2004,7 @@ export default {
 			// select
 			track.selected = true
 			this.openSidebar(track.path, 'track', track.name)
-			window.OCA.Files.Sidebar.setActiveTab('maps-track-metadata')
+			this.activeTab = 'maps-track-metadata'
 			this.selectedTrack = track
 		},
 		// devices
@@ -2309,7 +2314,7 @@ export default {
 					callback(map)
 				} else {
 					showInfo(t('maps', 'Folder is not a map'))
-					const fileClient = OC.Files.getClient()
+					const fileClient = getClient()
 					fileClient.getFileInfo(path).then((status, fileInfo) => {
 						const map = {
 							id: fileInfo.id,
@@ -2387,7 +2392,7 @@ export default {
 			})
 		},
 		onShareMyMap(myMap) {
-			window.OCA.Files.Sidebar.setActiveTab('sharing')
+			this.activeTab = 'sharing'
 			this.openSidebar(myMap.path, 'maps', myMap.name)
 		},
 		loadMap(myMap) {
diff --git a/src/views/PublicFavoriteShare.vue b/src/views/PublicFavoriteShare.vue
index 903df4b2a..2ed0e4832 100644
--- a/src/views/PublicFavoriteShare.vue
+++ b/src/views/PublicFavoriteShare.vue
@@ -35,8 +35,7 @@
 </template>
 
 <script>
-import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
-import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
+import { NcContent, NcAppContent } from '@nextcloud/vue'
 import MapContainer from '../components/MapContainer.vue'
 import PublicFavoriteShareSideBar from '../components/PublicFavoriteShareSideBar.vue'
 import { mapActions, mapGetters, mapState } from 'vuex'