diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 0000000..209e3ef
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+20
diff --git a/bun.lockb b/bun.lockb
index 8e35ddb..7075468 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/components/HeaderTag.vue b/components/HeaderTag.vue
index 12aa2a3..e73907f 100644
--- a/components/HeaderTag.vue
+++ b/components/HeaderTag.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script setup lang="ts">
-import { ViewMode } from '../composables/view'
+import type { ViewMode } from '../composables/view'
 
 const globalHeaderHeight = useGlobalHeaderHeight()
 const viewMode = useViewMode()
diff --git a/components/popups/Layer.vue b/components/popups/Layer.vue
index 5fedbb2..4194151 100644
--- a/components/popups/Layer.vue
+++ b/components/popups/Layer.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script setup lang="ts">
-import { PopupInternally } from '../../utils/popups'
+import type { PopupInternally } from '../../utils/popups'
 import PopupsWrapperMobile from './WrapperMobile.vue'
 import PopupsWrapperDesktop from './WrapperDesktop.vue'
 
diff --git a/components/popups/WrapperDesktop.vue b/components/popups/WrapperDesktop.vue
index 2d1a151..3869d68 100644
--- a/components/popups/WrapperDesktop.vue
+++ b/components/popups/WrapperDesktop.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script setup lang="ts">
-import { PopupInternally } from '../../utils/popups'
+import type { PopupInternally } from '../../utils/popups'
 
 const { data } = defineProps<{
   data: PopupInternally
diff --git a/components/utils/RelativeDateSelect.vue b/components/utils/RelativeDateSelect.vue
index 9b21ba5..9308cc1 100644
--- a/components/utils/RelativeDateSelect.vue
+++ b/components/utils/RelativeDateSelect.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup lang="ts">
-import { TabData } from '../utils/HorizontalTabs.vue'
+import type { TabData } from '../utils/HorizontalTabs.vue'
 
 const props = defineProps<{
   modelValue?: number | null
diff --git a/components/utils/SettingsMenu.vue b/components/utils/SettingsMenu.vue
index 58ef90b..491c014 100644
--- a/components/utils/SettingsMenu.vue
+++ b/components/utils/SettingsMenu.vue
@@ -96,7 +96,7 @@
 </template>
 
 <script setup lang="ts">
-import { LocaleObject } from '@nuxtjs/i18n/dist/runtime/composables'
+import type { LocaleObject } from '@nuxtjs/i18n'
 import { useThemes } from '../../utils/themes'
 
 const popups = usePopups()
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 7e89c60..32f78fc 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,8 +1,8 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
   modules: [
-    'nuxt-icon',
-    '@maanex/nuxt-apollo-upload',
+    '@nuxt/icon',
+    '@nuxtjs/apollo',
     '@nuxtjs/i18n',
     '@vite-pwa/nuxt',
     '@vueuse/nuxt',
@@ -128,24 +128,21 @@ export default defineNuxtConfig({
   },
 
   i18n: {
-    legacy: false,
+    restructureDir: '.', // the langDir is resolved relative to a default i18n directory
     langDir: 'lang',
     defaultLocale: 'de',
-    fallbackLocale: 'de',
-    jsTsFormatResource: true,
-    lazy: true,
     // ↓ remove strategy to get mensatt.de/en/about like urls. Downside: PWA entry point url is static -> language gets overwritten on startup. For now we'll rely on cookies only for language persistence.
     strategy: 'no_prefix',
     locales: [
       {
         code: 'de',
-        iso: 'de',
+        language: 'de',
         file: 'de.js',
         name: 'Deutsch'
       },
       {
         code: 'en',
-        iso: 'en',
+        language: 'en',
         file: 'en.js',
         name: 'English'
       },
diff --git a/package.json b/package.json
index 44e43e5..4784999 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,24 @@
 {
   "name": "mensatt-nuxt",
   "version": "2.2.0",
+  "devDependencies": {
+    "@nuxtjs/apollo": "^5.0.0-alpha.15",
+    "@nuxtjs/i18n": "^10.2.1",
+    "@types/node": "^24.10.1",
+    "@typescript-eslint/parser": "^8.47.0",
+    "@vite-pwa/nuxt": "^1.0.7",
+    "@vueuse/core": "^14.0.0",
+    "@vueuse/nuxt": "^14.0.0",
+    "dayjs": "^1.11.19",
+    "eslint": "^9.39.1",
+    "eslint-config-maanex": "^1.3.3",
+    "eslint-plugin-vue": "^10.5.1",
+    "nuxt": "^4.2.1",
+    "sass": "^1.94.2",
+    "sass-loader": "^16.0.6",
+    "vaul-vue": "^0.4.1",
+    "vue-eslint-parser": "^10.2.0"
+  },
   "private": true,
   "scripts": {
     "build": "nuxt build",
@@ -12,25 +30,7 @@
     "lint-fix": "eslint --ext .ts,.vue --ignore-pattern .gitignore --fix --quiet .",
     "postinstall": "nuxt prepare"
   },
-  "devDependencies": {
-    "@maanex/nuxt-apollo-upload": "^5.0.0",
-    "@nuxtjs/i18n": "^8.0.0-beta.13",
-    "@types/node": "^18",
-    "@typescript-eslint/parser": "^6.9.1",
-    "@vite-pwa/nuxt": "^0.1.0",
-    "@vueuse/core": "^10.2.0",
-    "@vueuse/nuxt": "^10.2.0",
-    "dayjs": "^1.11.10",
-    "eslint": "^8.52.0",
-    "eslint-config-maanex": "^1.3.3",
-    "eslint-plugin-vue": "^9.18.1",
-    "nuxt": "^3.7.4",
-    "sass": "^1.62.1",
-    "sass-loader": "^13.3.1",
-    "vaul-vue": "^0.1.0",
-    "vue-eslint-parser": "^9.3.2"
-  },
   "dependencies": {
-    "nuxt-icon": "^0.6.10"
+    "@nuxt/icon": "^2.1.0"
   }
 }
diff --git a/pages/calendar.vue b/pages/calendar.vue
index cda5a39..6e9f448 100644
--- a/pages/calendar.vue
+++ b/pages/calendar.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script setup lang="ts">
-import { TabData } from '../components/utils/HorizontalTabs.vue'
+import type { TabData } from '../components/utils/HorizontalTabs.vue'
 
 const viewMode = useViewMode()
 const i18n = useI18n()
diff --git a/utils/api.ts b/utils/api.ts
index ef70212..03c2401 100644
--- a/utils/api.ts
+++ b/utils/api.ts
@@ -50,11 +50,11 @@ async function getOccurrence(occurrenceId: string): Promise<GqlResponse> {
 
 /** @returns a list of all found locations or null if network error */
 async function getLocations(): Promise<EntityLocation.Location[] | null> {
-  const res = await useAsyncQuery<{ locations: EntityLocation.Location[] }>(
-    EntityLocation.queryAll,
-    getClient()
-  )
-  return res.data?.value.locations ?? null
+  const res = await useLazyAsyncQuery<{ locations: EntityLocation.Location[] }>({
+    query: EntityLocation.queryAll,
+    clientId: getClient()
+  })
+  return res.data?.value?.locations ?? null
 }
 
 /** @returns true if successful */