diff --git a/src/App.vue b/src/App.vue
index d4ac424d6..c63cf7bf4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,7 +18,7 @@
 import {computed, watch, type Ref} from 'vue'
 import {useRouter} from 'vue-router'
 import {useRouteQuery} from '@vueuse/router'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 import isTouchDevice from 'is-touch-device'
 import {success} from '@/message'
diff --git a/src/components/date/datepickerWithRange.vue b/src/components/date/datepickerWithRange.vue
index 00302eac1..848877c45 100644
--- a/src/components/date/datepickerWithRange.vue
+++ b/src/components/date/datepickerWithRange.vue
@@ -71,7 +71,7 @@
 
 <script lang="ts" setup>
 import {computed, ref, watch} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import flatPickr from 'vue-flatpickr-component'
diff --git a/src/components/home/MenuButton.vue b/src/components/home/MenuButton.vue
index 8d2e0d664..49a252863 100644
--- a/src/components/home/MenuButton.vue
+++ b/src/components/home/MenuButton.vue
@@ -11,7 +11,7 @@
 
 <script setup lang="ts">
 import {computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 
diff --git a/src/components/home/TheNavigation.vue b/src/components/home/TheNavigation.vue
index e8f72952a..22dd35cf8 100644
--- a/src/components/home/TheNavigation.vue
+++ b/src/components/home/TheNavigation.vue
@@ -88,7 +88,7 @@
 
 <script setup lang="ts">
 import {ref, computed, onMounted, nextTick} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRouter} from 'vue-router'
 
 import {QUICK_ACTIONS_ACTIVE} from '@/store/mutation-types'
diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue
index 02c87356c..c4b420153 100644
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@@ -61,7 +61,7 @@
 
 <script lang="ts" setup>
 import {watch, computed, shallowRef, watchEffect, type VNode, h} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import {useEventListener} from '@vueuse/core'
 
diff --git a/src/components/home/contentLinkShare.vue b/src/components/home/contentLinkShare.vue
index f073a7f41..0a02db1d8 100644
--- a/src/components/home/contentLinkShare.vue
+++ b/src/components/home/contentLinkShare.vue
@@ -23,7 +23,7 @@
 
 <script lang="ts" setup>
 import {computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import Logo from '@/components/home/Logo.vue'
 import PoweredByLink from './PoweredByLink.vue'
diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 99dbd0159..9b40b95f0 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -141,7 +141,7 @@
 
 <script setup lang="ts">
 import {ref, computed, onMounted, onBeforeMount} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import draggable from 'zhyswan-vuedraggable'
 import type {SortableEvent} from 'sortablejs'
 
diff --git a/src/components/list/list-settings-dropdown.vue b/src/components/list/list-settings-dropdown.vue
index 180596b2c..611bf8708 100644
--- a/src/components/list/list-settings-dropdown.vue
+++ b/src/components/list/list-settings-dropdown.vue
@@ -77,7 +77,7 @@
 
 <script setup lang="ts">
 import {ref, computed, watchEffect, type PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 import Dropdown from '@/components/misc/dropdown.vue'
diff --git a/src/components/list/partials/list-card.vue b/src/components/list/partials/list-card.vue
index 53317c4a2..0597639d2 100644
--- a/src/components/list/partials/list-card.vue
+++ b/src/components/list/partials/list-card.vue
@@ -37,7 +37,7 @@
 
 <script lang="ts" setup>
 import {type PropType, ref, watch} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import ListService from '@/services/list'
 import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash'
diff --git a/src/components/misc/keyboard-shortcuts/index.vue b/src/components/misc/keyboard-shortcuts/index.vue
index 274c5ff57..781d8a231 100644
--- a/src/components/misc/keyboard-shortcuts/index.vue
+++ b/src/components/misc/keyboard-shortcuts/index.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script lang="ts" setup>
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import Shortcut from '@/components/misc/shortcut.vue'
 import Message from '@/components/misc/message.vue'
diff --git a/src/components/misc/legal.vue b/src/components/misc/legal.vue
index 46e1dfd6b..3adc9a95f 100644
--- a/src/components/misc/legal.vue
+++ b/src/components/misc/legal.vue
@@ -8,7 +8,7 @@
 
 <script lang="ts" setup>
 import {computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 
diff --git a/src/components/misc/no-auth-wrapper.vue b/src/components/misc/no-auth-wrapper.vue
index 2f1239d47..5279c3001 100644
--- a/src/components/misc/no-auth-wrapper.vue
+++ b/src/components/misc/no-auth-wrapper.vue
@@ -30,7 +30,7 @@ import Logo from '@/components/home/Logo.vue'
 import Message from '@/components/misc/message.vue'
 import Legal from '@/components/misc/legal.vue'
 import ApiConfig from '@/components/misc/api-config.vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {computed} from 'vue'
 import {useRoute} from 'vue-router'
 import {useI18n} from 'vue-i18n'
diff --git a/src/components/misc/ready.vue b/src/components/misc/ready.vue
index 8fd3f4fd3..2f3fdbfef 100644
--- a/src/components/misc/ready.vue
+++ b/src/components/misc/ready.vue
@@ -42,7 +42,7 @@
 
 <script lang="ts" setup>
 import {ref, computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import Logo from '@/assets/logo.svg?component'
 import ApiConfig from '@/components/misc/api-config.vue'
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index f004a27d0..308cf9e90 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -54,7 +54,7 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import User from '@/components/misc/user.vue'
 import { NOTIFICATION_NAMES as names, type INotification} from '@/models/notification'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRouter} from 'vue-router'
 import {formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
 
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index b0c2ff218..e40eefa2b 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -177,7 +177,7 @@
 
 <script setup lang="ts">
 import {ref, watch, computed, shallowReactive} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import {RIGHTS} from '@/models/constants/rights'
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index cc1f9b6f0..2c54befa4 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -139,7 +139,7 @@ export default {name: 'userTeamShare'}
 <script setup lang="ts">
 import {ref, reactive, computed, shallowReactive, type ShallowReactive, type Ref} from 'vue'
 import type {PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import UserNamespaceService from '@/services/userNamespace'
diff --git a/src/components/tasks/add-task.vue b/src/components/tasks/add-task.vue
index ef45ca884..60004a928 100644
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@@ -43,7 +43,7 @@
 <script setup lang="ts">
 import {ref, watch, unref, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {tryOnMounted, debouncedWatch, useWindowSize, type MaybeRef} from '@vueuse/core'
 
 import TaskService from '@/services/task'
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index cfd4fe956..653c60b90 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -153,7 +153,7 @@
 
 <script setup lang="ts">
 import {ref, reactive, computed, shallowReactive, watch, nextTick} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import Editor from '@/components/input/AsyncEditor'
diff --git a/src/components/tasks/partials/defer-task.vue b/src/components/tasks/partials/defer-task.vue
index c0309fca7..d57b783a1 100644
--- a/src/components/tasks/partials/defer-task.vue
+++ b/src/components/tasks/partials/defer-task.vue
@@ -39,7 +39,7 @@
 
 <script setup lang="ts">
 import {ref, shallowReactive, computed, watch, onMounted, onBeforeUnmount, type PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 import flatPickr from 'vue-flatpickr-component'
 
diff --git a/src/components/tasks/partials/description.vue b/src/components/tasks/partials/description.vue
index a2adc8c66..c2623c9e7 100644
--- a/src/components/tasks/partials/description.vue
+++ b/src/components/tasks/partials/description.vue
@@ -31,7 +31,7 @@
 
 <script setup lang="ts">
 import {ref,computed, watch, type PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import Editor from '@/components/input/AsyncEditor'
 
diff --git a/src/components/tasks/partials/editAssignees.vue b/src/components/tasks/partials/editAssignees.vue
index eb4aacc14..226e8016d 100644
--- a/src/components/tasks/partials/editAssignees.vue
+++ b/src/components/tasks/partials/editAssignees.vue
@@ -29,7 +29,7 @@
 
 <script setup lang="ts">
 import {ref, shallowReactive, watch, type PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import User from '@/components/misc/user.vue'
diff --git a/src/components/tasks/partials/editLabels.vue b/src/components/tasks/partials/editLabels.vue
index a15df8c42..9a96ed56f 100644
--- a/src/components/tasks/partials/editLabels.vue
+++ b/src/components/tasks/partials/editLabels.vue
@@ -40,7 +40,7 @@
 
 <script setup lang="ts">
 import {type PropType, ref, computed, shallowReactive, watch} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import LabelModel, { type ILabel } from '@/models/label'
diff --git a/src/components/tasks/partials/heading.vue b/src/components/tasks/partials/heading.vue
index b693b814d..c02ceb63a 100644
--- a/src/components/tasks/partials/heading.vue
+++ b/src/components/tasks/partials/heading.vue
@@ -33,7 +33,7 @@
 
 <script setup lang="ts">
 import {ref, computed, type PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 import Done from '@/components/misc/Done.vue'
diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue
index 0b0eda12f..ccfedd79f 100644
--- a/src/components/tasks/partials/listSearch.vue
+++ b/src/components/tasks/partials/listSearch.vue
@@ -19,7 +19,7 @@
 <script lang="ts" setup>
 import {reactive, ref, watch} from 'vue'
 import type {PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 import ListModel, { type IList } from '@/models/list'
 import Multiselect from '@/components/input/multiselect.vue'
diff --git a/src/composables/useNamespaceSearch.ts b/src/composables/useNamespaceSearch.ts
index 35c8b54f7..b2595aaac 100644
--- a/src/composables/useNamespaceSearch.ts
+++ b/src/composables/useNamespaceSearch.ts
@@ -1,5 +1,5 @@
 import {ref, computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 export function useNameSpaceSearch() {
 	const query = ref('')
diff --git a/src/main.ts b/src/main.ts
index b24a216d5..89b7f312c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -14,7 +14,7 @@ import Notifications from '@kyvg/vue3-notification'
 import './registerServiceWorker'
 
 // Vuex
-import {store} from './store'
+import { store, key } from './store'
 // i18n
 import {i18n} from './i18n'
 
@@ -104,7 +104,7 @@ if (window.SENTRY_ENABLED) {
 	import('./sentry').then(sentry => sentry.default(app, router))
 }
 
-app.use(store)
+app.use(store, key) // pass the injection key
 app.use(router)
 app.use(i18n)
 
diff --git a/src/store/index.ts b/src/store/index.ts
index d2df346d6..0033e07e1 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,4 +1,7 @@
-import {createStore} from 'vuex'
+import type {InjectionKey} from 'vue'
+import {createStore, useStore as baseUseStore, Store} from 'vuex'
+
+
 import {getBlobFromBlurHash} from '../helpers/getBlobFromBlurHash'
 import {
 	BACKGROUND,
@@ -25,7 +28,14 @@ import ListModel from '@/models/list'
 import ListService from '../services/list'
 import {checkAndSetApiUrl} from '@/helpers/checkAndSetApiUrl'
 
-import type { RootStoreState } from './types'
+import type { RootStoreState, StoreState } from './types'
+
+export const key: InjectionKey<Store<StoreState>> = Symbol()
+
+// define your own `useStore` composition function
+export function useStore () {
+  return baseUseStore(key)
+}
 
 export const store = createStore<RootStoreState>({
 	strict: import.meta.env.DEV,
diff --git a/src/store/modules/attachments.ts b/src/store/modules/attachments.ts
index 7b85af8a8..208ab4cef 100644
--- a/src/store/modules/attachments.ts
+++ b/src/store/modules/attachments.ts
@@ -1,26 +1,29 @@
+import type { Module } from 'vuex'
 import {findIndexById} from '@/helpers/utils'
 
-import type { AttachmentState } from '@/store/types'
+import type { AttachmentState, RootStoreState } from '@/store/types'
 import type { IAttachment } from '@/models/attachment'
 
-export default {
+const store : Module<AttachmentState, RootStoreState> = {
 	namespaced: true,
-	state: (): AttachmentState => ({
+	state: () => ({
 		attachments: [],
 	}),
 	mutations: {
-		set(state: AttachmentState, attachments: IAttachment[]) {
+		set(state, attachments: IAttachment[]) {
 			console.debug('Set attachments', attachments)
 			state.attachments = attachments
 		},
-		add(state: AttachmentState, attachment: IAttachment) {
+		add(state, attachment: IAttachment) {
 			console.debug('Add attachement', attachment)
 			state.attachments.push(attachment)
 		},
-		removeById(state: AttachmentState, id: IAttachment['id']) {
+		removeById(state, id: IAttachment['id']) {
 			const attachmentIndex = findIndexById<IAttachment>(state.attachments, id)
 			state.attachments.splice(attachmentIndex, 1)
 			console.debug('Remove attachement', id)
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default store
\ No newline at end of file
diff --git a/src/store/modules/auth.ts b/src/store/modules/auth.ts
index fbc9b7e92..81f11ab97 100644
--- a/src/store/modules/auth.ts
+++ b/src/store/modules/auth.ts
@@ -1,4 +1,4 @@
-import type { ActionContext } from 'vuex'
+import type { Module } from 'vuex'
 
 import {HTTPFactory, AuthenticatedHTTPFactory} from '@/http-common'
 import {i18n, getCurrentLanguage, saveLanguage} from '@/i18n'
@@ -22,25 +22,25 @@ const defaultSettings = settings => {
 	return settings
 }
 
-export default {
+const authStore : Module<AuthState, RootStoreState> =  {
 	namespaced: true,
-	state: (): AuthState => ({
+	state: () => ({
 		authenticated: false,
 		isLinkShareAuth: false,
 		info: null,
 		needsTotpPasscode: false,
 		avatarUrl: '',
 		lastUserInfoRefresh: null,
-		settings: {},
+		settings: {}, // should be IUserSettings
 	}),
 	getters: {
-		authUser(state: AuthState) {
+		authUser(state) {
 			return state.authenticated && (
 				state.info &&
 				state.info.type === AUTH_TYPES.USER
 			)
 		},
-		authLinkShare(state: AuthState) {
+		authLinkShare(state) {
 			return state.authenticated && (
 				state.info &&
 				state.info.type === AUTH_TYPES.LINK_SHARE
@@ -48,7 +48,7 @@ export default {
 		},
 	},
 	mutations: {
-		info(state: AuthState, info: Info) {
+		info(state, info: Info) {
 			state.info = info
 			if (info !== null) {
 				state.avatarUrl = info.getAvatarUrl()
@@ -60,32 +60,32 @@ export default {
 				state.isLinkShareAuth = info.id < 0
 			}
 		},
-		setUserSettings(state: AuthState, settings: IUserSettings) {
+		setUserSettings(state, settings: IUserSettings) {
 			state.settings = defaultSettings(settings)
 			const info = state.info !== null ? state.info : {} as Info
 			info.name = settings.name
 			state.info = info
 		},
-		authenticated(state: AuthState, authenticated: boolean) {
+		authenticated(state, authenticated: boolean) {
 			state.authenticated = authenticated
 		},
-		isLinkShareAuth(state: AuthState, isLinkShareAuth: boolean) {
+		isLinkShareAuth(state, isLinkShareAuth: boolean) {
 			state.isLinkShareAuth = isLinkShareAuth
 		},
-		needsTotpPasscode(state: AuthState, needsTotpPasscode: boolean) {
+		needsTotpPasscode(state, needsTotpPasscode: boolean) {
 			state.needsTotpPasscode = needsTotpPasscode
 		},
-		reloadAvatar(state: AuthState) {
+		reloadAvatar(state) {
 			if (!state.info) return
 			state.avatarUrl = `${state.info.getAvatarUrl()}&=${+new Date()}`
 		},
-		lastUserRefresh(state: AuthState) {
+		lastUserRefresh(state) {
 			state.lastUserInfoRefresh = new Date()
 		},
 	},
 	actions: {
 		// Logs a user in with a set of credentials.
-		async login(ctx: ActionContext<AuthState, RootStoreState>, credentials) {
+		async login(ctx, credentials) {
 			const HTTP = HTTPFactory()
 			ctx.commit(LOADING, true, {root: true})
 
@@ -116,7 +116,7 @@ export default {
 
 		// Registers a new user and logs them in.
 		// Not sure if this is the right place to put the logic in, maybe a seperate js component would be better suited.
-		async register(ctx: ActionContext<AuthState, RootStoreState>, credentials) {
+		async register(ctx, credentials) {
 			const HTTP = HTTPFactory()
 			ctx.commit(LOADING, true, {root: true})
 			try {
@@ -133,7 +133,7 @@ export default {
 			}
 		},
 
-		async openIdAuth(ctx: ActionContext<AuthState, RootStoreState>, {provider, code}) {
+		async openIdAuth(ctx, {provider, code}) {
 			const HTTP = HTTPFactory()
 			ctx.commit(LOADING, true, {root: true})
 
@@ -155,7 +155,7 @@ export default {
 			}
 		},
 
-		async linkShareAuth(ctx: ActionContext<AuthState, RootStoreState>, {hash, password}) {
+		async linkShareAuth(ctx, {hash, password}) {
 			const HTTP = HTTPFactory()
 			const response = await HTTP.post('/shares/' + hash + '/auth', {
 				password: password,
@@ -166,7 +166,7 @@ export default {
 		},
 
 		// Populates user information from jwt token saved in local storage in store
-		checkAuth(ctx: ActionContext<AuthState, RootStoreState>) {
+		checkAuth(ctx) {
 
 			// This function can be called from multiple places at the same time and shortly after one another.
 			// To prevent hitting the api too frequently or race conditions, we check at most once per minute.
@@ -198,7 +198,7 @@ export default {
 			}
 		},
 
-		redirectToProviderIfNothingElseIsEnabled({rootState}: ActionContext<AuthState, RootStoreState>) {
+		redirectToProviderIfNothingElseIsEnabled({rootState}) {
 			const {auth} = rootState.config
 			if (
 				auth.local.enabled === false &&
@@ -210,7 +210,7 @@ export default {
 			}
 		},
 
-		async refreshUserInfo({state, commit, dispatch}: ActionContext<AuthState, RootStoreState>) {
+		async refreshUserInfo({state, commit, dispatch}) {
 			const jwt = getToken()
 			if (!jwt) {
 				return
@@ -244,7 +244,7 @@ export default {
 			}
 		},
 
-		async saveUserSettings(ctx: ActionContext<AuthState, RootStoreState>, payload) {
+		async saveUserSettings(ctx, payload) {
 			const {settings} = payload
 			const showMessage = payload.showMessage ?? true
 			const userSettingsService = new UserSettingsService()
@@ -265,7 +265,7 @@ export default {
 		},
 
 		// Renews the api token and saves it to local storage
-		renewToken(ctx: ActionContext<AuthState, RootStoreState>) {
+		renewToken(ctx) {
 			// FIXME: Timeout to avoid race conditions when authenticated as a user (=auth token in localStorage) and as a
 			// link share in another tab. Without the timeout both the token renew and link share auth are executed at
 			// the same time and one might win over the other.
@@ -286,9 +286,11 @@ export default {
 				}
 			}, 5000)
 		},
-		logout(ctx: ActionContext<AuthState, RootStoreState>) {
+		logout(ctx) {
 			removeToken()
 			ctx.dispatch('checkAuth')
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default authStore
\ No newline at end of file
diff --git a/src/store/modules/config.ts b/src/store/modules/config.ts
index 27d61a2ca..fb1ef8aec 100644
--- a/src/store/modules/config.ts
+++ b/src/store/modules/config.ts
@@ -1,4 +1,4 @@
-import type { ActionContext } from 'vuex'
+import type { Module } from 'vuex'
 import {parseURL} from 'ufo'
 
 import {CONFIG} from '../mutation-types'
@@ -6,9 +6,9 @@ import {HTTPFactory} from '@/http-common'
 import {objectToCamelCase} from '@/helpers/case'
 import type { RootStoreState, ConfigState } from '@/store/types'
 
-export default {
+const configStore : Module<ConfigState, RootStoreState> = {
 	namespaced: true,
-	state: (): ConfigState => ({
+	state: () => ({
 		// These are the api defaults.
 		version: '',
 		frontendUrl: '',
@@ -39,23 +39,25 @@ export default {
 		},
 	}),
 	getters: {
-		migratorsEnabled: (state: ConfigState) => state.availableMigrators?.length > 0,
+		migratorsEnabled: (state) => state.availableMigrators?.length > 0,
 		apiBase() {
 			const {host, protocol} = parseURL(window.API_URL)
 			return protocol + '//' + host
 		},
 	},
 	mutations: {
-		[CONFIG](state: ConfigState, config: ConfigState) {
+		[CONFIG](state, config: ConfigState) {
 			Object.assign(state, config)
 		},
 	},
 	actions: {
-		async update(ctx: ActionContext<ConfigState, RootStoreState>) {
+		async update(ctx) {
 			const HTTP = HTTPFactory()
 			const {data: config} = await HTTP.get('info')
 			ctx.commit(CONFIG, objectToCamelCase(config))
 			return config
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default configStore
\ No newline at end of file
diff --git a/src/store/modules/kanban.ts b/src/store/modules/kanban.ts
index 73e73088e..c6e46d58a 100644
--- a/src/store/modules/kanban.ts
+++ b/src/store/modules/kanban.ts
@@ -1,3 +1,4 @@
+import type { Module } from 'vuex'
 import cloneDeep from 'lodash.clonedeep'
 
 import {findById, findIndexById} from '@/helpers/utils'
@@ -7,7 +8,6 @@ import {success} from '@/message'
 import BucketService from '../../services/bucket'
 import {setLoading} from '../helper'
 import TaskCollectionService from '@/services/taskCollection'
-import type { ActionContext } from 'vuex'
 import type { RootStoreState, KanbanState } from '@/store/types'
 import type { ITask } from '@/models/task'
 import type { IList } from '@/models/list'
@@ -38,10 +38,10 @@ const addTaskToBucketAndSort = (state: KanbanState, task: ITask) => {
  * This store is intended to hold the currently active kanban view.
  * It should hold only the current buckets.
  */
-export default {
+const kanbanStore : Module<KanbanState, RootStoreState> = {
 	namespaced: true,
 
-	state: (): KanbanState => ({
+	state: () => ({
 		buckets: [],
 		listId: 0,
 		bucketLoading: {},
@@ -50,11 +50,11 @@ export default {
 	}),
 
 	mutations: {
-		setListId(state: KanbanState, listId: IList['id']) {
+		setListId(state, listId: IList['id']) {
 			state.listId = parseInt(listId)
 		},
 
-		setBuckets(state: KanbanState, buckets: IBucket[]) {
+		setBuckets(state, buckets: IBucket[]) {
 			state.buckets = buckets
 			buckets.forEach(b => {
 				state.taskPagesPerBucket[b.id] = 1
@@ -62,21 +62,21 @@ export default {
 			})
 		},
 
-		addBucket(state: KanbanState, bucket: IBucket) {
+		addBucket(state, bucket: IBucket) {
 			state.buckets.push(bucket)
 		},
 
-		removeBucket(state: KanbanState, bucket: IBucket) {
+		removeBucket(state, bucket: IBucket) {
 			const bucketIndex = findIndexById(state.buckets, bucket.id)
 			state.buckets.splice(bucketIndex, 1)
 		},
 
-		setBucketById(state: KanbanState, bucket: IBucket) {
+		setBucketById(state, bucket: IBucket) {
 			const bucketIndex = findIndexById(state.buckets, bucket.id)
 			state.buckets[bucketIndex] = bucket
 		},
 
-		setBucketByIndex(state: KanbanState, {
+		setBucketByIndex(state, {
 			bucketIndex,
 			bucket,
 		} : {
@@ -86,7 +86,7 @@ export default {
 			state.buckets[bucketIndex] = bucket
 		},
 
-		setTaskInBucketByIndex(state: KanbanState, {
+		setTaskInBucketByIndex(state, {
 			bucketIndex,
 			taskIndex,
 			task,
@@ -100,7 +100,7 @@ export default {
 			state.buckets[bucketIndex] = bucket
 		},
 
-		setTasksInBucketByBucketId(state: KanbanState, {
+		setTasksInBucketByBucketId(state, {
 			bucketId,
 			tasks,
 		} : {
@@ -114,7 +114,7 @@ export default {
 			}
 		},
 		
-		setTaskInBucket(state: KanbanState, task: ITask) {
+		setTaskInBucket(state, task: ITask) {
 			// If this gets invoked without any tasks actually loaded, we can save the hassle of finding the task
 			if (state.buckets.length === 0) {
 				return
@@ -158,7 +158,7 @@ export default {
 			}
 		},
 
-		addTaskToBucket(state: KanbanState, task: ITask) {
+		addTaskToBucket(state, task: ITask) {
 			const bucketIndex = findIndexById(state.buckets, task.bucketId)
 			const oldBucket = state.buckets[bucketIndex]
 			const newBucket = {
@@ -171,7 +171,7 @@ export default {
 			state.buckets[bucketIndex] = newBucket
 		},
 
-		addTasksToBucket(state: KanbanState, {tasks, bucketId}: {
+		addTasksToBucket(state, {tasks, bucketId}: {
 			tasks: ITask[];
 			bucketId: IBucket['id'];
 		}) {
@@ -187,7 +187,7 @@ export default {
 			state.buckets[bucketIndex] = newBucket
 		},
 
-		removeTaskInBucket(state: KanbanState, task: ITask) {
+		removeTaskInBucket(state, task: ITask) {
 			// If this gets invoked without any tasks actually loaded, we can save the hassle of finding the task
 			if (state.buckets.length === 0) {
 				return
@@ -207,7 +207,7 @@ export default {
 			state.buckets[bucketIndex].tasks.splice(taskIndex, 1)
 		},
 
-		setBucketLoading(state: KanbanState, {bucketId, loading}) {
+		setBucketLoading(state, {bucketId, loading}) {
 			state.bucketLoading[bucketId] = loading
 		},
 
@@ -221,11 +221,11 @@ export default {
 	},
 
 	getters: {
-		getBucketById(state: KanbanState) {
+		getBucketById(state) {
 			return (bucketId) => findById(state.buckets, bucketId)
 		},
 
-		getTaskById(state: KanbanState) {
+		getTaskById(state) {
 			return (id) => {
 				const { bucketIndex, taskIndex } = getTaskIndicesById(state, id)
 
@@ -240,7 +240,7 @@ export default {
 	},
 
 	actions: {
-		async loadBucketsForList(ctx: ActionContext<KanbanState, RootStoreState>, {listId, params}) {
+		async loadBucketsForList(ctx, {listId, params}) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			// Clear everything to prevent having old buckets in the list if loading the buckets from this list takes a few moments
@@ -259,7 +259,7 @@ export default {
 			}
 		},
 
-		async loadNextTasksForBucket(ctx: ActionContext<KanbanState, RootStoreState>, {listId, ps = {}, bucketId}) {
+		async loadNextTasksForBucket(ctx, {listId, ps = {}, bucketId}) {
 			const isLoading = ctx.state.bucketLoading[bucketId] ?? false
 			if (isLoading) {
 				return
@@ -314,7 +314,7 @@ export default {
 			}
 		},
 
-		async createBucket(ctx: ActionContext<KanbanState, RootStoreState>, bucket: IBucket) {
+		async createBucket(ctx, bucket: IBucket) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			const bucketService = new BucketService()
@@ -327,7 +327,7 @@ export default {
 			}
 		},
 
-		async deleteBucket(ctx: ActionContext<KanbanState, RootStoreState>, {bucket, params}) {
+		async deleteBucket(ctx, {bucket, params}) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			const bucketService = new BucketService()
@@ -342,7 +342,7 @@ export default {
 			}
 		},
 
-		async updateBucket(ctx: ActionContext<KanbanState, RootStoreState>, updatedBucketData) {
+		async updateBucket(ctx, updatedBucketData) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			const bucketIndex = findIndexById(ctx.state.buckets, updatedBucketData.id)
@@ -370,7 +370,7 @@ export default {
 			}
 		},
 
-		async updateBucketTitle(ctx: ActionContext<KanbanState, RootStoreState>, { id, title }) {
+		async updateBucketTitle(ctx, { id, title }) {
 			const bucket = findById(ctx.state.buckets, id)
 
 			if (bucket?.title === title) {
@@ -387,4 +387,6 @@ export default {
 			success({message: i18n.global.t('list.kanban.bucketTitleSavedSuccess')})
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default kanbanStore
\ No newline at end of file
diff --git a/src/store/modules/labels.ts b/src/store/modules/labels.ts
index 4366c4c53..ce32db6d0 100644
--- a/src/store/modules/labels.ts
+++ b/src/store/modules/labels.ts
@@ -1,4 +1,4 @@
-import type { ActionContext } from 'vuex'
+import type { Module } from 'vuex'
 
 import {i18n} from '@/i18n'
 import {success} from '@/message'
@@ -22,46 +22,46 @@ async function getAllLabels(page = 1): Promise<ILabel[]> {
 	}
 }
 
-export default {
+const LabelStore : Module<LabelState, RootStoreState> = {
 	namespaced: true,
-	state: (): LabelState => ({
+	state: () => ({
 		labels: {},
 		loaded: false,
 	}),
 	mutations: {
-		setLabels(state: LabelState, labels: ILabel[]) {
+		setLabels(state, labels: ILabel[]) {
 			labels.forEach(l => {
 				state.labels[l.id] = l
 				add(l)
 			})
 		},
-		setLabel(state: LabelState, label: ILabel) {
+		setLabel(state, label: ILabel) {
 			state.labels[label.id] = label
 			update(label)
 		},
-		removeLabelById(state: LabelState, label: ILabel) {
+		removeLabelById(state, label: ILabel) {
 			remove(label)
 			delete state.labels[label.id]
 		},
-		setLoaded(state: LabelState, loaded: boolean) {
+		setLoaded(state, loaded: boolean) {
 			state.loaded = loaded
 		},
 	},
 	getters: {
-		getLabelsByIds(state: LabelState) {
+		getLabelsByIds(state) {
 			return (ids: ILabel['id'][]) => getLabelsByIds(state, ids)
 		},
-		filterLabelsByQuery(state: LabelState) {
+		filterLabelsByQuery(state) {
 			return (labelsToHide: ILabel[], query: string) => filterLabelsByQuery(state, labelsToHide, query)
 		},
-		getLabelsByExactTitles(state: LabelState) {
+		getLabelsByExactTitles(state) {
 			return labelTitles => Object
 				.values(state.labels)
 				.filter(({title}) => labelTitles.some(l => l.toLowerCase() === title.toLowerCase()))
 		},
 	},
 	actions: {
-		async loadAllLabels(ctx: ActionContext<LabelState, RootStoreState>, {forceLoad} = {}) {
+		async loadAllLabels(ctx, {forceLoad} = {}) {
 			if (ctx.state.loaded && !forceLoad) {
 				return
 			}
@@ -77,7 +77,7 @@ export default {
 				cancel()
 			}
 		},
-		async deleteLabel(ctx: ActionContext<LabelState, RootStoreState>, label: ILabel) {
+		async deleteLabel(ctx, label: ILabel) {
 			const cancel = setLoading(ctx, 'labels')
 			const labelService = new LabelService()
 
@@ -90,7 +90,7 @@ export default {
 				cancel()
 			}
 		},
-		async updateLabel(ctx: ActionContext<LabelState, RootStoreState>, label: ILabel) {
+		async updateLabel(ctx, label: ILabel) {
 			const cancel = setLoading(ctx, 'labels')
 			const labelService = new LabelService()
 
@@ -103,7 +103,7 @@ export default {
 				cancel()
 			}
 		},
-		async createLabel(ctx: ActionContext<LabelState, RootStoreState>, label: ILabel) {
+		async createLabel(ctx, label: ILabel) {
 			const cancel = setLoading(ctx, 'labels')
 			const labelService = new LabelService()
 
@@ -117,3 +117,5 @@ export default {
 		},
 	},
 }
+
+export default LabelStore
\ No newline at end of file
diff --git a/src/store/modules/lists.ts b/src/store/modules/lists.ts
index e438763ce..0d18a2c04 100644
--- a/src/store/modules/lists.ts
+++ b/src/store/modules/lists.ts
@@ -1,49 +1,50 @@
+import type { Module } from 'vuex'
+
 import ListService from '@/services/list'
 import {setLoading} from '@/store/helper'
 import {removeListFromHistory} from '@/modules/listHistory'
 import {createNewIndexer} from '@/indexes'
 import type {ListState, RootStoreState} from '@/store/types'
-import type {ActionContext} from 'vuex'
 import type {IList} from '@/models/list'
 
 const {add, remove, search, update} = createNewIndexer('lists', ['title', 'description'])
 
 const FavoriteListsNamespace = -2
 
-export default {
+const listsStore : Module<ListState, RootStoreState>= {
 	namespaced: true,
 	// The state is an object which has the list ids as keys.
-	state: (): ListState => ({}),
+	state: () => ({}),
 	mutations: {
-		setList(state: ListState, list: IList) {
+		setList(state, list: IList) {
 			state[list.id] = list
 			update(list)
 		},
-		setLists(state: ListState, lists: IList[]) {
+		setLists(state, lists: IList[]) {
 			lists.forEach(l => {
 				state[l.id] = l
 				add(l)
 			})
 		},
-		removeListById(state: ListState, list: IList) {
+		removeListById(state, list: IList) {
 			remove(list)
 			delete state[list.id]
 		},
 	},
 	getters: {
-		getListById: (state: ListState) => (id: IList['id']) => {
+		getListById: (state) => (id: IList['id']) => {
 			if (typeof state[id] !== 'undefined') {
 				return state[id]
 			}
 			return null
 		},
-		findListByExactname: (state: ListState) => (name: string) => {
+		findListByExactname: (state) => (name: string) => {
 			const list = Object.values(state).find(l => {
 				return l.title.toLowerCase() === name.toLowerCase()
 			})
 			return typeof list === 'undefined' ? null : list
 		},
-		searchList: (state: ListState) => (query: string, includeArchived = false) => {
+		searchList: (state) => (query: string, includeArchived = false) => {
 			return search(query)
 					?.filter(value => value > 0)
 					.map(id => state[id])
@@ -52,14 +53,14 @@ export default {
 		},
 	},
 	actions: {
-		toggleListFavorite(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
+		toggleListFavorite(ctx, list: IList) {
 			return ctx.dispatch('updateList', {
 				...list,
 				isFavorite: !list.isFavorite,
 			})
 		},
 
-		async createList(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
+		async createList(ctx, list: IList) {
 			const cancel = setLoading(ctx, 'lists')
 			const listService = new ListService()
 
@@ -74,7 +75,7 @@ export default {
 			}
 		},
 
-		async updateList(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
+		async updateList(ctx, list: IList) {
 			const cancel = setLoading(ctx, 'lists')
 			const listService = new ListService()
 
@@ -109,7 +110,7 @@ export default {
 			}
 		},
 
-		async deleteList(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
+		async deleteList(ctx, list: IList) {
 			const cancel = setLoading(ctx, 'lists')
 			const listService = new ListService()
 
@@ -124,4 +125,6 @@ export default {
 			}
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default listsStore
\ No newline at end of file
diff --git a/src/store/modules/namespaces.ts b/src/store/modules/namespaces.ts
index 745e9b941..0eccc99bb 100644
--- a/src/store/modules/namespaces.ts
+++ b/src/store/modules/namespaces.ts
@@ -1,4 +1,4 @@
-import type {ActionContext} from 'vuex'
+import type { Module } from 'vuex'
 
 import NamespaceService from '../../services/namespace'
 import {setLoading} from '@/store/helper'
@@ -9,19 +9,19 @@ import type {IList} from '@/models/list'
 
 const {add, remove, search, update} = createNewIndexer('namespaces', ['title', 'description'])
 
-export default {
+const namespacesStore : Module<NamespaceState, RootStoreState> = {
 	namespaced: true,
-	state: (): NamespaceState => ({
+	state: () => ({
 		namespaces: [],
 	}),
 	mutations: {
-		namespaces(state: NamespaceState, namespaces: INamespace[]) {
+		namespaces(state, namespaces: INamespace[]) {
 			state.namespaces = namespaces
 			namespaces.forEach(n => {
 				add(n)
 			})
 		},
-		setNamespaceById(state: NamespaceState, namespace: INamespace) {
+		setNamespaceById(state, namespace: INamespace) {
 			const namespaceIndex = state.namespaces.findIndex(n => n.id === namespace.id)
 
 			if (namespaceIndex === -1) {
@@ -35,7 +35,7 @@ export default {
 			state.namespaces[namespaceIndex] = namespace
 			update(namespace)
 		},
-		setListInNamespaceById(state: NamespaceState, list: IList) {
+		setListInNamespaceById(state, list: IList) {
 			for (const n in state.namespaces) {
 				// We don't have the namespace id on the list which means we need to loop over all lists until we find it.
 				// FIXME: Not ideal at all - we should fix that at the api level.
@@ -51,11 +51,11 @@ export default {
 				}
 			}
 		},
-		addNamespace(state: NamespaceState, namespace: INamespace) {
+		addNamespace(state, namespace: INamespace) {
 			state.namespaces.push(namespace)
 			add(namespace)
 		},
-		removeNamespaceById(state: NamespaceState, namespaceId: INamespace['id']) {
+		removeNamespaceById(state, namespaceId: INamespace['id']) {
 			for (const n in state.namespaces) {
 				if (state.namespaces[n].id === namespaceId) {
 					remove(state.namespaces[n])
@@ -64,7 +64,7 @@ export default {
 				}
 			}
 		},
-		addListToNamespace(state: NamespaceState, list: IList) {
+		addListToNamespace(state, list: IList) {
 			for (const n in state.namespaces) {
 				if (state.namespaces[n].id === list.namespaceId) {
 					state.namespaces[n].lists.push(list)
@@ -72,7 +72,7 @@ export default {
 				}
 			}
 		},
-		removeListFromNamespaceById(state: NamespaceState, list: IList) {
+		removeListFromNamespaceById(state, list: IList) {
 			for (const n in state.namespaces) {
 				// We don't have the namespace id on the list which means we need to loop over all lists until we find it.
 				// FIXME: Not ideal at all - we should fix that at the api level.
@@ -88,7 +88,7 @@ export default {
 		},
 	},
 	getters: {
-		getListAndNamespaceById: (state: NamespaceState) => (listId: IList['id'], ignorePseudoNamespaces = false) => {
+		getListAndNamespaceById: (state) => (listId: IList['id'], ignorePseudoNamespaces = false) => {
 			for (const n in state.namespaces) {
 
 				if (ignorePseudoNamespaces && state.namespaces[n].id < 0) {
@@ -106,10 +106,10 @@ export default {
 			}
 			return null
 		},
-		getNamespaceById: (state: NamespaceState) => (namespaceId: INamespace['id']) => {
+		getNamespaceById: (state) => (namespaceId: INamespace['id']) => {
 			return state.namespaces.find(({id}) => id == namespaceId) || null
 		},
-		searchNamespace: (state: NamespaceState, getters) => (query: string) => {
+		searchNamespace: (state, getters) => (query: string) => {
 			return search(query)
 					?.filter(value => value > 0)
 					.map(getters.getNamespaceById)
@@ -118,7 +118,7 @@ export default {
 		},
 	},
 	actions: {
-		async loadNamespaces(ctx: ActionContext<NamespaceState, RootStoreState>) {
+		async loadNamespaces(ctx) {
 			const cancel = setLoading(ctx, 'namespaces')
 
 			const namespaceService = new NamespaceService()
@@ -138,20 +138,20 @@ export default {
 			}
 		},
 
-		loadNamespacesIfFavoritesDontExist(ctx: ActionContext<NamespaceState, RootStoreState>) {
+		loadNamespacesIfFavoritesDontExist(ctx) {
 			// The first or second namespace should be the one holding all favorites
 			if (ctx.state.namespaces[0].id !== -2 && ctx.state.namespaces[1]?.id !== -2) {
 				return ctx.dispatch('loadNamespaces')
 			}
 		},
 
-		removeFavoritesNamespaceIfEmpty(ctx: ActionContext<NamespaceState, RootStoreState>) {
+		removeFavoritesNamespaceIfEmpty(ctx) {
 			if (ctx.state.namespaces[0].id === -2 && ctx.state.namespaces[0].lists.length === 0) {
 				ctx.state.namespaces.splice(0, 1)
 			}
 		},
 
-		async deleteNamespace(ctx: ActionContext<NamespaceState, RootStoreState>, namespace: INamespace) {
+		async deleteNamespace(ctx, namespace: INamespace) {
 			const cancel = setLoading(ctx, 'namespaces')
 			const namespaceService = new NamespaceService()
 
@@ -164,7 +164,7 @@ export default {
 			}
 		},
 
-		async createNamespace(ctx: ActionContext<NamespaceState, RootStoreState>, namespace: INamespace) {
+		async createNamespace(ctx, namespace: INamespace) {
 			const cancel = setLoading(ctx, 'namespaces')
 			const namespaceService = new NamespaceService()
 
@@ -177,4 +177,6 @@ export default {
 			}
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default namespacesStore
\ No newline at end of file
diff --git a/src/store/modules/tasks.ts b/src/store/modules/tasks.ts
index 242afc01f..bb459b790 100644
--- a/src/store/modules/tasks.ts
+++ b/src/store/modules/tasks.ts
@@ -1,5 +1,5 @@
+import type { Module } from 'vuex'
 import router from '@/router'
-import type { ActionContext } from 'vuex'
 import {formatISO} from 'date-fns'
 
 import TaskService from '@/services/task'
@@ -65,11 +65,11 @@ async function findAssignees(parsedTaskAssignees) {
 }
 
 
-export default {
+const tasksStore : Module<TaskState, RootStoreState>= {
 	namespaced: true,
-	state: (): TaskState => ({}),
+	state: () => ({}),
 	actions: {
-		async loadTasks(ctx: ActionContext<TaskState, RootStoreState>, params) {
+		async loadTasks(ctx, params) {
 			const taskService = new TaskService()
 
 			const cancel = setLoading(ctx, 'tasks')
@@ -82,7 +82,7 @@ export default {
 			}
 		},
 
-		async update(ctx: ActionContext<TaskState, RootStoreState>, task: ITask) {
+		async update(ctx, task: ITask) {
 			const cancel = setLoading(ctx, 'tasks')
 
 			const taskService = new TaskService()
@@ -95,7 +95,7 @@ export default {
 			}
 		},
 
-		async delete(ctx: ActionContext<TaskState, RootStoreState>, task: ITask) {
+		async delete(ctx, task: ITask) {
 			const taskService = new TaskService()
 			const response = await taskService.delete(task)
 			ctx.commit('kanban/removeTaskInBucket', task, {root: true})
@@ -104,7 +104,7 @@ export default {
 
 		// Adds a task attachment in store.
 		// This is an action to be able to commit other mutations
-		addTaskAttachment(ctx: ActionContext<TaskState, RootStoreState>, {
+		addTaskAttachment(ctx, {
 			taskId,
 			attachment,
 		}: {
@@ -130,7 +130,7 @@ export default {
 			ctx.commit('attachments/add', attachment, {root: true})
 		},
 
-		async addAssignee(ctx: ActionContext<TaskState, RootStoreState>, {
+		async addAssignee(ctx, {
 			user,
 			taskId,
 		}: {
@@ -165,7 +165,7 @@ export default {
 			return r
 		},
 
-		async removeAssignee(ctx: ActionContext<TaskState, RootStoreState>, {
+		async removeAssignee(ctx, {
 			user,
 			taskId,
 		}: {
@@ -198,7 +198,7 @@ export default {
 
 		},
 
-		async addLabel(ctx: ActionContext<TaskState, RootStoreState>, {
+		async addLabel(ctx, {
 			label,
 			taskId,
 		} : {
@@ -234,7 +234,7 @@ export default {
 			return r
 		},
 
-		async removeLabel(ctx: ActionContext<TaskState, RootStoreState>, {label, taskId}) {
+		async removeLabel(ctx, {label, taskId}) {
 			const labelTask = new LabelTaskModel({taskId, labelId: label.id})
 
 			const labelTaskService = new LabelTaskService()
@@ -263,7 +263,7 @@ export default {
 		},
 
 		// Do everything that is involved in finding, creating and adding the label to the task
-		async addLabelsToTask({rootState, dispatch}: ActionContext<TaskState, RootStoreState>, {
+		async addLabelsToTask({rootState, dispatch}, {
 			task,
 			parsedLabels,
 		}) {
@@ -289,7 +289,7 @@ export default {
 			return task
 		},
 
-		findListId({ rootGetters }: ActionContext<TaskState, RootStoreState>, { list: listName, listId }: {
+		findListId({ rootGetters }, { list: listName, listId }: {
 			list: string,
 			listId: IList['id']
 		}) {
@@ -320,7 +320,7 @@ export default {
 			return foundListId
 		},
 
-		async createNewTask({dispatch, commit}: ActionContext<TaskState, RootStoreState>, { 
+		async createNewTask({dispatch, commit}, { 
 			title,
 			bucketId,
 			listId,
@@ -366,4 +366,6 @@ export default {
 			return result
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default tasksStore
\ No newline at end of file
diff --git a/src/store/types.ts b/src/store/types.ts
index 95aa82d6b..96f061dca 100644
--- a/src/store/types.ts
+++ b/src/store/types.ts
@@ -15,16 +15,6 @@ export interface RootStoreState {
 	menuActive: boolean,
 	keyboardShortcutsActive: boolean,
 	quickActionsActive: boolean,
-
-	// modules
-	attachments: AttachmentState,
-	auth: AuthState,
-	config: ConfigState,
-	kanban: KanbanState,
-	labels: LabelState,
-	lists: ListState,
-	namespaces: NamespaceState,
-	tasks: TaskState, 
 }
 
 export interface AttachmentState {
@@ -114,3 +104,15 @@ export interface NamespaceState {
 }
 
 export interface TaskState {}
+
+
+export type StoreState = RootStoreState & {
+	config: ConfigState,
+	auth: AuthState,
+	namespaces: NamespaceState,
+	kanban: KanbanState,
+	tasks: TaskState,
+	lists: ListState,
+	attachments: AttachmentState,
+	labels: LabelState,
+}
\ No newline at end of file
diff --git a/src/types/shims-vue.d.ts b/src/types/shims-vue.d.ts
index af426f99c..e073434c9 100644
--- a/src/types/shims-vue.d.ts
+++ b/src/types/shims-vue.d.ts
@@ -1,13 +1,30 @@
 // https://next.vuex.vuejs.org/guide/migrating-to-4-0-from-3-x.html#typescript-support
 import { Store } from 'vuex'
 
+import type {
+	RootStoreState,
+	AttachmentState,
+	AuthState,
+	ConfigState,
+	KanbanState,
+	LabelState,
+	ListState,
+	NamespaceState,
+	TaskState,
+} from '@/store/types'
+
 declare module '@vue/runtime-core' {
-  // Declare your own store states.
-  interface State {
-    count: number
-  }
 
   interface ComponentCustomProperties {
-    $store: Store<State>
+    $store: Store<RootStoreState & {
+			config: ConfigState,
+			auth: AuthState,
+			namespaces: NamespaceState,
+			kanban: KanbanState,
+			tasks: TaskState,
+			lists: ListState,
+			attachments: AttachmentState,
+			labels: LabelState,
+		}>
   }
 }
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 92110b66e..b8cf712d1 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -60,7 +60,7 @@
 
 <script lang="ts" setup>
 import {ref, computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import Message from '@/components/misc/message.vue'
 import ShowTasks from '@/views/tasks/ShowTasks.vue'
diff --git a/src/views/list/ListGantt.vue b/src/views/list/ListGantt.vue
index 3373e4950..f4dc88829 100644
--- a/src/views/list/ListGantt.vue
+++ b/src/views/list/ListGantt.vue
@@ -69,7 +69,7 @@ import {ref, computed} from 'vue'
 import flatPickr from 'vue-flatpickr-component'
 
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import ListWrapper from './ListWrapper.vue'
 import GanttChart from '@/components/tasks/gantt-component.vue'
diff --git a/src/views/list/ListWrapper.vue b/src/views/list/ListWrapper.vue
index 82315566b..cbe50fc85 100644
--- a/src/views/list/ListWrapper.vue
+++ b/src/views/list/ListWrapper.vue
@@ -60,7 +60,7 @@ import {BACKGROUND, BLUR_HASH, CURRENT_LIST} from '@/store/mutation-types'
 import {getListTitle} from '@/helpers/getListTitle'
 import {saveListToHistory} from '@/modules/listHistory'
 import {useTitle} from '@/composables/useTitle'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 const props = defineProps({
 	listId: {
diff --git a/src/views/list/NewList.vue b/src/views/list/NewList.vue
index 28ec71d49..47af4178d 100644
--- a/src/views/list/NewList.vue
+++ b/src/views/list/NewList.vue
@@ -35,7 +35,7 @@
 import {ref, reactive, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
 import {useRouter, useRoute} from 'vue-router'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import ListService from '@/services/list'
 import ListModel from '@/models/list'
diff --git a/src/views/list/settings/archive.vue b/src/views/list/settings/archive.vue
index 2251fa374..922f83007 100644
--- a/src/views/list/settings/archive.vue
+++ b/src/views/list/settings/archive.vue
@@ -17,7 +17,7 @@ export default {name: 'list-setting-archive'}
 
 <script setup lang="ts">
 import {computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRouter, useRoute} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 
diff --git a/src/views/list/settings/delete.vue b/src/views/list/settings/delete.vue
index 6ddb2b4ab..a455dcf65 100644
--- a/src/views/list/settings/delete.vue
+++ b/src/views/list/settings/delete.vue
@@ -30,7 +30,7 @@
 import {computed, ref, watchEffect} from 'vue'
 import {useTitle} from '@/composables/useTitle'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import {success} from '@/message'
 import TaskCollectionService from '@/services/taskCollection'
diff --git a/src/views/list/settings/duplicate.vue b/src/views/list/settings/duplicate.vue
index deb3769cc..2cfe5c52a 100644
--- a/src/views/list/settings/duplicate.vue
+++ b/src/views/list/settings/duplicate.vue
@@ -22,7 +22,7 @@
 <script setup lang="ts">
 import {ref, shallowReactive} from 'vue'
 import {useRoute, useRouter} from 'vue-router'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import ListDuplicateService from '@/services/listDuplicateService'
diff --git a/src/views/list/settings/share.vue b/src/views/list/settings/share.vue
index b2dcca1ea..07c43cae0 100644
--- a/src/views/list/settings/share.vue
+++ b/src/views/list/settings/share.vue
@@ -28,7 +28,7 @@ export default {name: 'list-setting-share'}
 
 <script lang="ts" setup>
 import {ref, computed, watchEffect} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 import {useTitle} from '@vueuse/core'
diff --git a/src/views/migrator/Migrate.vue b/src/views/migrator/Migrate.vue
index 450276aab..f9995df56 100644
--- a/src/views/migrator/Migrate.vue
+++ b/src/views/migrator/Migrate.vue
@@ -23,7 +23,7 @@
 <script setup lang="ts">
 import {computed} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import {MIGRATORS} from './migrators'
 import {useTitle} from '@/composables/useTitle'
diff --git a/src/views/namespaces/settings/edit.vue b/src/views/namespaces/settings/edit.vue
index 69a939570..28534cdd2 100644
--- a/src/views/namespaces/settings/edit.vue
+++ b/src/views/namespaces/settings/edit.vue
@@ -57,7 +57,7 @@
 
 <script lang="ts" setup>
 import {nextTick, ref, watch} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {success} from '@/message'
 import router from '@/router'
 
diff --git a/src/views/namespaces/settings/share.vue b/src/views/namespaces/settings/share.vue
index 6d01137b3..25f212db9 100644
--- a/src/views/namespaces/settings/share.vue
+++ b/src/views/namespaces/settings/share.vue
@@ -26,7 +26,7 @@ export default { name: 'namespace-setting-share' }
 
 <script lang="ts" setup>
 import {ref, computed, watchEffect} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 import {useTitle} from '@vueuse/core'
diff --git a/src/views/sharing/LinkSharingAuth.vue b/src/views/sharing/LinkSharingAuth.vue
index 7dd2a8e11..5041418e2 100644
--- a/src/views/sharing/LinkSharingAuth.vue
+++ b/src/views/sharing/LinkSharingAuth.vue
@@ -34,7 +34,7 @@
 
 <script lang="ts" setup>
 import {ref, computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 import {useTitle} from '@vueuse/core'
diff --git a/src/views/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue
index 1db62ac5c..38784cd07 100644
--- a/src/views/tasks/ShowTasks.vue
+++ b/src/views/tasks/ShowTasks.vue
@@ -45,7 +45,7 @@
 
 <script setup lang="ts">
 import {computed, ref, watchEffect} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index a5b6e8801..dfcdf0620 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -165,7 +165,7 @@ import {computed, ref} from 'vue'
 import {useI18n} from 'vue-i18n'
 
 import Editor from '@/components/input/AsyncEditor'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import TeamService from '@/services/team'
 import TeamMemberService from '@/services/teamMember'
diff --git a/src/views/user/OpenIdAuth.vue b/src/views/user/OpenIdAuth.vue
index fc68c0b07..29429fcde 100644
--- a/src/views/user/OpenIdAuth.vue
+++ b/src/views/user/OpenIdAuth.vue
@@ -15,7 +15,7 @@ export default { name: 'Auth' }
 
 <script setup lang="ts">
 import {ref, computed, onMounted} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 
diff --git a/src/views/user/settings/Avatar.vue b/src/views/user/settings/Avatar.vue
index 8ebd5ff51..4993f9e2e 100644
--- a/src/views/user/settings/Avatar.vue
+++ b/src/views/user/settings/Avatar.vue
@@ -64,7 +64,7 @@ export default { name: 'user-settings-avatar' }
 <script setup lang="ts">
 import {computed, ref, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {Cropper} from 'vue-advanced-cropper'
 import 'vue-advanced-cropper/dist/style.css'
 
diff --git a/src/views/user/settings/Caldav.vue b/src/views/user/settings/Caldav.vue
index 5d8cec387..151d97082 100644
--- a/src/views/user/settings/Caldav.vue
+++ b/src/views/user/settings/Caldav.vue
@@ -68,7 +68,7 @@
 <script lang="ts" setup>
 import {computed, ref, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import {CALDAV_DOCS} from '@/urls'
 import {useTitle} from '@/composables/useTitle'
diff --git a/src/views/user/settings/DataExport.vue b/src/views/user/settings/DataExport.vue
index b395d9349..29aeb8523 100644
--- a/src/views/user/settings/DataExport.vue
+++ b/src/views/user/settings/DataExport.vue
@@ -44,7 +44,7 @@ export default {name: 'user-settings-data-export'}
 
 <script setup lang="ts">
 import {ref, computed, shallowReactive} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import DataExportService from '@/services/dataExport'
diff --git a/src/views/user/settings/Deletion.vue b/src/views/user/settings/Deletion.vue
index 5a1fb4a3f..5a101c85d 100644
--- a/src/views/user/settings/Deletion.vue
+++ b/src/views/user/settings/Deletion.vue
@@ -88,7 +88,7 @@ export default { name: 'user-settings-deletion' }
 
 <script setup lang="ts">
 import {ref, shallowReactive, computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import AccountDeleteService from '@/services/accountDelete'
diff --git a/src/views/user/settings/EmailUpdate.vue b/src/views/user/settings/EmailUpdate.vue
index fec0da18f..ef8a3e423 100644
--- a/src/views/user/settings/EmailUpdate.vue
+++ b/src/views/user/settings/EmailUpdate.vue
@@ -43,7 +43,7 @@ export default { name: 'user-settings-update-email' }
 <script setup lang="ts">
 import {reactive, computed, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import EmailUpdateService from '@/services/emailUpdate'
 import EmailUpdateModel from '@/models/emailUpdate'
diff --git a/src/views/user/settings/General.vue b/src/views/user/settings/General.vue
index dec9c8260..d72febe29 100644
--- a/src/views/user/settings/General.vue
+++ b/src/views/user/settings/General.vue
@@ -157,7 +157,7 @@ export default defineComponent({
 <script setup lang="ts">
 import {computed, watch, ref} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import {PrefixMode} from '@/modules/parseTaskText'
 
diff --git a/src/views/user/settings/PasswordUpdate.vue b/src/views/user/settings/PasswordUpdate.vue
index 6c802b6cc..96b7c431e 100644
--- a/src/views/user/settings/PasswordUpdate.vue
+++ b/src/views/user/settings/PasswordUpdate.vue
@@ -58,7 +58,7 @@ export default {name: 'user-settings-password-update'}
 <script setup lang="ts">
 import {ref, reactive, shallowReactive, computed} from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useStore } from 'vuex'
+import {useStore} from '@/store'
 
 import PasswordUpdateService from '@/services/passwordUpdateService'
 import PasswordUpdateModel from '@/models/passwordUpdate'
diff --git a/src/views/user/settings/TOTP.vue b/src/views/user/settings/TOTP.vue
index 15bd27c49..ff5b0ee7d 100644
--- a/src/views/user/settings/TOTP.vue
+++ b/src/views/user/settings/TOTP.vue
@@ -70,7 +70,7 @@ export default { name: 'user-settings-totp' }
 
 <script lang="ts" setup>
 import {computed, ref, shallowReactive} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import TotpService from '@/services/totp'