diff --git a/package.json b/package.json
index a860f8d3..38d19388 100644
--- a/package.json
+++ b/package.json
@@ -32,10 +32,10 @@
     "@vueuse/core": "9.2.0",
     "@vueuse/router": "9.2.0",
     "axios": "0.27.2",
-    "blurhash": "1.1.5",
+    "blurhash": "2.0.0",
     "bulma-css-variables": "0.9.33",
     "camel-case": "4.1.2",
-    "date-fns": "2.29.2",
+    "date-fns": "2.29.3",
     "dompurify": "2.4.0",
     "easymde": "2.17.0",
     "flatpickr": "4.6.13",
@@ -66,33 +66,33 @@
     "@cypress/vue": "4.2.0",
     "@faker-js/faker": "7.5.0",
     "@types/flexsearch": "0.7.3",
-    "@typescript-eslint/eslint-plugin": "5.36.2",
-    "@typescript-eslint/parser": "5.36.2",
+    "@typescript-eslint/eslint-plugin": "5.37.0",
+    "@typescript-eslint/parser": "5.37.0",
     "@vitejs/plugin-legacy": "2.1.0",
     "@vitejs/plugin-vue": "3.1.0",
     "@vue/eslint-config-typescript": "11.0.1",
     "@vue/test-utils": "2.0.2",
     "@vue/tsconfig": "0.1.3",
-    "autoprefixer": "10.4.8",
+    "autoprefixer": "10.4.10",
     "browserslist": "4.21.3",
-    "caniuse-lite": "1.0.30001390",
+    "caniuse-lite": "1.0.30001397",
     "cypress": "10.7.0",
     "esbuild": "0.15.7",
-    "eslint": "8.23.0",
+    "eslint": "8.23.1",
     "eslint-plugin-vue": "9.4.0",
     "express": "4.18.1",
     "happy-dom": "6.0.4",
-    "netlify-cli": "11.5.1",
+    "netlify-cli": "11.7.1",
     "postcss": "8.4.16",
     "postcss-preset-env": "7.8.1",
     "rollup": "2.79.0",
     "rollup-plugin-visualizer": "5.8.1",
     "sass": "1.54.9",
-    "typescript": "4.8.2",
+    "typescript": "4.8.3",
     "vite": "3.1.0",
     "vite-plugin-pwa": "0.12.7",
     "vite-svg-loader": "3.6.0",
-    "vitest": "0.23.1",
+    "vitest": "0.23.2",
     "vue-tsc": "0.40.13",
     "wait-on": "6.0.1",
     "workbox-cli": "6.5.4"
diff --git a/src/components/date/datepickerWithRange.vue b/src/components/date/datepickerWithRange.vue
index 848877c4..e27acf7a 100644
--- a/src/components/date/datepickerWithRange.vue
+++ b/src/components/date/datepickerWithRange.vue
@@ -85,7 +85,7 @@ import DatemathHelp from '@/components/date/datemathHelp.vue'
 const store = useStore()
 const {t} = useI18n({useScope: 'global'})
 
-const emit = defineEmits(['dateChanged', 'update:modelValue'])
+const emit = defineEmits(['update:modelValue'])
 const props = defineProps({
 	modelValue: {
 		required: false,
@@ -127,7 +127,6 @@ function emitChanged() {
 		dateFrom: from.value === '' ? null : from.value,
 		dateTo: to.value === '' ? null : to.value,
 	}
-	emit('dateChanged', args)
 	emit('update:modelValue', args)
 }
 
diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 33cbf62f..dc09c5d7 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -156,8 +156,8 @@ import {calculateItemPosition} from '@/helpers/calculateItemPosition'
 import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
 import {getListTitle} from '@/helpers/getListTitle'
 import {useEventListener} from '@vueuse/core'
-import type { IList } from '@/models/list'
-import type { INamespace } from '@/models/namespace'
+import type {IList} from '@/modelTypes/IList'
+import type {INamespace} from '@/modelTypes/INamespace'
 
 const drag = ref(false)
 const dragOptions = {
diff --git a/src/components/input/colorPicker.vue b/src/components/input/colorPicker.vue
index 335afce3..1cb0c58e 100644
--- a/src/components/input/colorPicker.vue
+++ b/src/components/input/colorPicker.vue
@@ -68,7 +68,7 @@ export default defineComponent({
 			default: 'top',
 		},
 	},
-	emits: ['update:modelValue', 'change'],
+	emits: ['update:modelValue'],
 	watch: {
 		modelValue: {
 			handler(modelValue) {
@@ -98,7 +98,6 @@ export default defineComponent({
 
 			this.lastChangeTimeout = setTimeout(() => {
 				this.$emit('update:modelValue', this.color)
-				this.$emit('change')
 			}, 500)
 		},
 		reset() {
diff --git a/src/components/input/datepicker.vue b/src/components/input/datepicker.vue
index d5e35e33..733a9fab 100644
--- a/src/components/input/datepicker.vue
+++ b/src/components/input/datepicker.vue
@@ -131,7 +131,7 @@ export default defineComponent({
 			default: false,
 		},
 	},
-	emits: ['update:modelValue', 'change', 'close', 'close-on-change'],
+	emits: ['update:modelValue', 'close', 'close-on-change'],
 	mounted() {
 		document.addEventListener('click', this.hideDatePopup)
 	},
@@ -186,7 +186,6 @@ export default defineComponent({
 		updateData() {
 			this.changed = true
 			this.$emit('update:modelValue', this.date)
-			this.$emit('change', this.date)
 		},
 		toggleDatePopup() {
 			if (this.disabled) {
diff --git a/src/components/input/editor.vue b/src/components/input/editor.vue
index e2ec5d66..839df338 100644
--- a/src/components/input/editor.vue
+++ b/src/components/input/editor.vue
@@ -136,7 +136,7 @@ export default defineComponent({
 			default: '',
 		},
 	},
-	emits: ['update:modelValue', 'change'],
+	emits: ['update:modelValue'],
 	computed: {
 		showPreviewText() {
 			return this.isPreviewActive && this.text === '' && this.emptyText !== ''
@@ -212,7 +212,6 @@ export default defineComponent({
 
 			this.changeTimeout = setTimeout(() => {
 				this.$emit('update:modelValue', this.text)
-				this.$emit('change', this.text)
 			}, timeout)
 		},
 		replaceAt(str, index, replacement) {
diff --git a/src/components/list/list-settings-dropdown.vue b/src/components/list/list-settings-dropdown.vue
index 611bf870..c32078a2 100644
--- a/src/components/list/list-settings-dropdown.vue
+++ b/src/components/list/list-settings-dropdown.vue
@@ -60,8 +60,8 @@
 				:is-button="false"
 				entity="list"
 				:entity-id="list.id"
-				:subscription="list.subscription"
-				@change="sub => subscription = sub"
+				:model-value="list.subscription"
+				@update:model-value="sub => subscription = sub"
 				type="dropdown"
 			/>
 			<dropdown-item
@@ -83,8 +83,8 @@ import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 import Dropdown from '@/components/misc/dropdown.vue'
 import DropdownItem from '@/components/misc/dropdown-item.vue'
 import TaskSubscription from '@/components/misc/subscription.vue'
-import type {IList} from '@/models/list'
-import type { ISubscription } from '@/models/subscription'
+import type {IList} from '@/modelTypes/IList'
+import type {ISubscription} from '@/modelTypes/ISubscription'
 
 const props = defineProps({
 	list: {
diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 939d1a89..8dc6926a 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -38,7 +38,7 @@
 				<priority-select
 					:disabled="!filters.usePriority || undefined"
 					v-model.number="filters.priority"
-					@change="setPriority"
+					@update:model-value="setPriority"
 				/>
 				<fancycheckbox
 					v-model="filters.usePriority"
@@ -53,7 +53,7 @@
 			<div class="control single-value-control">
 				<percent-done-select
 					v-model.number="filters.percentDone"
-					@change="setPercentDoneFilter"
+					@update:model-value="setPercentDoneFilter"
 					:disabled="!filters.usePercentDone || undefined"
 				/>
 				<fancycheckbox
@@ -68,8 +68,9 @@
 			<label class="label">{{ $t('task.attributes.dueDate') }}</label>
 			<div class="control">
 				<datepicker-with-range
-					@dateChanged="values => setDateFilter('due_date', values)"
-					v-model="filters.dueDate">
+					v-model="filters.dueDate"
+					@update:model-value="values => setDateFilter('due_date', values)"
+				>
 					<template #trigger="{toggle, buttonText}">
 						<x-button @click.prevent.stop="toggle()" variant="secondary" :shadow="false" class="mb-2">
 							{{ buttonText }}
@@ -82,8 +83,9 @@
 			<label class="label">{{ $t('task.attributes.startDate') }}</label>
 			<div class="control">
 				<datepicker-with-range
-					@dateChanged="values => setDateFilter('start_date', values)"
-					v-model="filters.startDate">
+					v-model="filters.startDate"
+					@update:model-value="values => setDateFilter('start_date', values)"
+				>
 					<template #trigger="{toggle, buttonText}">
 						<x-button @click.prevent.stop="toggle()" variant="secondary" :shadow="false" class="mb-2">
 							{{ buttonText }}
@@ -96,8 +98,9 @@
 			<label class="label">{{ $t('task.attributes.endDate') }}</label>
 			<div class="control">
 				<datepicker-with-range
-					@dateChanged="values => setDateFilter('end_date', values)"
-					v-model="filters.endDate">
+					v-model="filters.endDate"
+					@update:model-value="values => setDateFilter('end_date', values)"
+				>
 					<template #trigger="{toggle, buttonText}">
 						<x-button @click.prevent.stop="toggle()" variant="secondary" :shadow="false" class="mb-2">
 							{{ buttonText }}
@@ -110,8 +113,9 @@
 			<label class="label">{{ $t('task.attributes.reminders') }}</label>
 			<div class="control">
 				<datepicker-with-range
-					@dateChanged="values => setDateFilter('reminders', values)"
-					v-model="filters.reminders">
+					v-model="filters.reminders"
+					@update:model-value="values => setDateFilter('reminders', values)"
+				>
 					<template #trigger="{toggle, buttonText}">
 						<x-button @click.prevent.stop="toggle()" variant="secondary" :shadow="false" class="mb-2">
 							{{ buttonText }}
@@ -141,7 +145,7 @@
 		<div class="field">
 			<label class="label">{{ $t('task.attributes.labels') }}</label>
 			<div class="control labels-list">
-				<edit-labels v-model="labels" @change="changeLabelFilter"/>
+				<edit-labels v-model="labels" @update:model-value="changeLabelFilter"/>
 			</div>
 		</div>
 
@@ -278,7 +282,7 @@ export default defineComponent({
 			default: false,
 		},
 	},
-	emits: ['update:modelValue', 'change'],
+	emits: ['update:modelValue'],
 	watch: {
 		modelValue: {
 			handler(value) {
@@ -312,7 +316,6 @@ export default defineComponent({
 			const params = {...this.params}
 			params.filter_value = params.filter_value.map(v => v instanceof Date ? v.toISOString() : v)
 			this.$emit('update:modelValue', params)
-			this.$emit('change', params)
 		},
 		prepareFilters() {
 			this.prepareDone()
diff --git a/src/components/list/partials/list-card.vue b/src/components/list/partials/list-card.vue
index 0597639d..f2a8b4eb 100644
--- a/src/components/list/partials/list-card.vue
+++ b/src/components/list/partials/list-card.vue
@@ -45,7 +45,7 @@ import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash'
 import {colorIsDark} from '@/helpers/color/colorIsDark'
 
 import BaseButton from '@/components/base/BaseButton.vue'
-import type { IList } from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 
 const background = ref<string | null>(null)
 const backgroundLoading = ref(false)
diff --git a/src/components/misc/subscription.vue b/src/components/misc/subscription.vue
index 07047688..ba0f79ef 100644
--- a/src/components/misc/subscription.vue
+++ b/src/components/misc/subscription.vue
@@ -5,7 +5,7 @@
 		:icon="iconName"
 		v-tooltip="tooltipText"
 		@click="changeSubscription"
-		:disabled="disabled || undefined"
+		:disabled="disabled"
 	>
 		{{ buttonText }}
 	</x-button>
@@ -23,6 +23,7 @@
 		v-tooltip="tooltipText"
 		@click="changeSubscription"
 		:class="{'is-disabled': disabled}"
+		:disabled="disabled"
 	>
 		<span class="icon">
 			<icon :icon="iconName"/>
@@ -39,7 +40,8 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import DropdownItem from '@/components/misc/dropdown-item.vue'
 
 import SubscriptionService from '@/services/subscription'
-import SubscriptionModel, { type ISubscription } from '@/models/subscription'
+import SubscriptionModel from '@/models/subscription'
+import type {ISubscription} from '@/modelTypes/ISubscription'
 
 import {success} from '@/message'
 
@@ -50,7 +52,7 @@ const props = defineProps({
 		type: Boolean,
 		default: true,
 	},
-	subscription: {
+	modelValue: {
 		type: Object as PropType<ISubscription>,
 		default: null,
 	},
@@ -60,9 +62,9 @@ const props = defineProps({
 	},
 })
 
-const subscriptionEntity = computed<string | null>(() => props.subscription?.entity ?? null)
+const subscriptionEntity = computed<string | null>(() => props.modelValue?.entity ?? null)
 
-const emit = defineEmits(['change'])
+const emit = defineEmits(['update:modelValue'])
 
 const subscriptionService = shallowRef(new SubscriptionService())
 
@@ -75,27 +77,21 @@ const tooltipText = computed(() => {
 		})
 	}
 
-	return props.subscription !== null ?
+	return props.modelValue !== null ?
 		t('task.subscription.subscribed', {entity: props.entity}) :
 		t('task.subscription.notSubscribed', {entity: props.entity})
 })
 
-const buttonText = computed(() => props.subscription !== null ? t('task.subscription.unsubscribe') : t('task.subscription.subscribe'))
-const iconName = computed(() => props.subscription !== null ? ['far', 'bell-slash'] : 'bell')
-const disabled = computed(() => {
-	if (props.subscription === null) {
-		return false
-	}
-
-	return subscriptionEntity.value !== props.entity
-})
+const buttonText = computed(() => props.modelValue ? t('task.subscription.unsubscribe') : t('task.subscription.subscribe'))
+const iconName = computed(() => props.modelValue ? ['far', 'bell-slash'] : 'bell')
+const disabled = computed(() => props.modelValue && subscriptionEntity.value !== props.entity)
 
 function changeSubscription() {
 	if (disabled.value) {
 		return
 	}
 
-	if (props.subscription === null) {
+	if (props.modelValue === null) {
 		subscribe()
 	} else {
 		unsubscribe()
@@ -108,7 +104,7 @@ async function subscribe() {
 		entityId: props.entityId,
 	})
 	await subscriptionService.value.create(subscription)
-	emit('change', subscription)
+	emit('update:modelValue', subscription)
 	success({message: t('task.subscription.subscribeSuccess', {entity: props.entity})})
 }
 
@@ -118,7 +114,7 @@ async function unsubscribe() {
 		entityId: props.entityId,
 	})
 	await subscriptionService.value.delete(subscription)
-	emit('change', null)
+	emit('update:modelValue', null)
 	success({message: t('task.subscription.unsubscribeSuccess', {entity: props.entity})})
 }
 </script>
diff --git a/src/components/namespace/namespace-settings-dropdown.vue b/src/components/namespace/namespace-settings-dropdown.vue
index d80d563d..77861621 100644
--- a/src/components/namespace/namespace-settings-dropdown.vue
+++ b/src/components/namespace/namespace-settings-dropdown.vue
@@ -34,12 +34,13 @@
 				{{ $t('menu.archive') }}
 			</dropdown-item>
 			<task-subscription
+				v-if="subscription"
 				class="has-no-shadow"
 				:is-button="false"
 				entity="namespace"
 				:entity-id="namespace.id"
-				:subscription="subscription"
-				@change="sub => subscription = sub"
+				:model-value="subscription"
+				@update:model-value="sub => subscription = sub"
 				type="dropdown"
 			/>
 			<dropdown-item
@@ -59,7 +60,8 @@ import {ref, onMounted, type PropType} from 'vue'
 import Dropdown from '@/components/misc/dropdown.vue'
 import DropdownItem from '@/components/misc/dropdown-item.vue'
 import TaskSubscription from '@/components/misc/subscription.vue'
-import type { INamespace } from '@/models/namespace'
+import type {INamespace} from '@/modelTypes/INamespace'
+import type {ISubscription} from '@/modelTypes/ISubscription'
 
 const props = defineProps({
 	namespace: {
@@ -68,7 +70,7 @@ const props = defineProps({
 	},
 })
 
-const subscription = ref(null)
+const subscription = ref<ISubscription | null>(null)
 onMounted(() => {
 	subscription.value = props.namespace.subscription
 })
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index 47ef4968..f6ee0d26 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -196,13 +196,14 @@ import {useI18n} from 'vue-i18n'
 
 import {RIGHTS} from '@/constants/rights'
 import LinkShareModel from '@/models/linkShare'
+
 import type {ILinkShare} from '@/modelTypes/ILinkShare'
+import type {IList} from '@/modelTypes/IList'
 
 import LinkShareService from '@/services/linkShare'
 
 import {useCopyToClipboard} from '@/composables/useCopyToClipboard'
 import {success} from '@/message'
-import type {IList} from '@/modelTypes/IList'
 import type {ListView} from '@/types/ListView'
 import {LIST_VIEWS} from '@/types/ListView'
 
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index 84a212cc..d961d382 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -143,22 +143,29 @@ import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import UserNamespaceService from '@/services/userNamespace'
-import UserNamespaceModel, { type IUserNamespace } from '@/models/userNamespace'
+import UserNamespaceModel from '@/models/userNamespace'
+import type {IUserNamespace} from '@/modelTypes/IUserNamespace'
 
 import UserListService from '@/services/userList'
-import UserListModel, { type IUserList } from '@/models/userList'
+import UserListModel from '@/models/userList'
+import type {IUserList} from '@/modelTypes/IUserList'
 
 import UserService from '@/services/user'
-import UserModel, { type IUser } from '@/models/user'
+import UserModel from '@/models/user'
+import type {IUser} from '@/modelTypes/IUser'
 
 import TeamNamespaceService from '@/services/teamNamespace'
-import TeamNamespaceModel, { type ITeamNamespace } from '@/models/teamNamespace'
+import TeamNamespaceModel from '@/models/teamNamespace'
+import type { ITeamNamespace } from '@/modelTypes/ITeamNamespace'
 
 import TeamListService from '@/services/teamList'
-import TeamListModel, { type ITeamList } from '@/models/teamList'
+import TeamListModel from '@/models/teamList'
+import type { ITeamList } from '@/modelTypes/ITeamList'
 
 import TeamService from '@/services/team'
-import TeamModel, { type ITeam } from '@/models/team'
+import TeamModel from '@/models/team'
+import type {ITeam} from '@/modelTypes/ITeam'
+
 
 import {RIGHTS} from '@/constants/rights'
 import Multiselect from '@/components/input/multiselect.vue'
diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue
index a067f403..c233903e 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -36,8 +36,8 @@
 
 		<strong>{{ $t('task.attributes.reminders') }}</strong>
 		<reminders
-			@change="editTaskSubmit()"
 			v-model="taskEditTask.reminderDates"
+			@update:model-value="editTaskSubmit()"
 		/>
 
 		<div class="field">
@@ -83,7 +83,8 @@ import {useI18n} from 'vue-i18n'
 import Editor from '@/components/input/AsyncEditor'
 
 import TaskService from '@/services/task'
-import TaskModel, { type ITask } from '@/models/task'
+import TaskModel from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 import EditLabels from './partials/editLabels.vue'
 import Reminders from './partials/reminders.vue'
 import ColorPicker from '../input/colorPicker.vue'
diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue
index 70d6e5b1..d8676d31 100644
--- a/src/components/tasks/partials/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -147,7 +147,8 @@
 import {defineComponent} from 'vue'
 
 import AttachmentService from '../../../services/attachment'
-import AttachmentModel, { type IAttachment } from '@/models/attachment'
+import AttachmentModel from '@/models/attachment'
+import type {IAttachment} from '@/modelTypes/IAttachment'
 import User from '@/components/misc/user.vue'
 import {mapState} from 'vuex'
 
@@ -155,8 +156,8 @@ import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import { uploadFiles, generateAttachmentUrl } from '@/helpers/attachments'
 import {formatDate, formatDateSince, formatDateLong} from '@/helpers/time/formatDate'
 
-import BaseButton from '@/components/base/BaseButton'
-import type { IFile } from '@/models/file'
+import BaseButton from '@/components/base/BaseButton.vue'
+import type { IFile } from '@/modelTypes/IFile'
 import { getHumanSize } from '@/helpers/getHumanSize'
 
 export default defineComponent({
diff --git a/src/components/tasks/partials/checklist-summary.vue b/src/components/tasks/partials/checklist-summary.vue
index 6e17d140..69f1dd2e 100644
--- a/src/components/tasks/partials/checklist-summary.vue
+++ b/src/components/tasks/partials/checklist-summary.vue
@@ -14,7 +14,7 @@ import {computed, type PropType} from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import {getChecklistStatistics} from '@/helpers/checklistFromText'
-import type {ITask} from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 const props = defineProps({
 	task: {
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index 653c60b9..16385255 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -70,13 +70,13 @@
 						:is-edit-enabled="canWrite && c.author.id === currentUserId"
 						:upload-callback="attachmentUpload"
 						:upload-enabled="true"
-						@change="
+						v-model="c.comment"
+						@update:model-value="
 							() => {
 								toggleEdit(c)
 								editComment()
 							}
 						"
-						v-model="c.comment"
 						:bottom-actions="actions[c.id]"
 						:show-save="true"
 					/>
@@ -159,12 +159,15 @@ import {useI18n} from 'vue-i18n'
 import Editor from '@/components/input/AsyncEditor'
 
 import TaskCommentService from '@/services/taskComment'
-import TaskCommentModel, { type ITaskComment } from '@/models/taskComment'
+import TaskCommentModel from '@/models/taskComment'
+
+import type {ITaskComment} from '@/modelTypes/ITaskComment'
+import type {ITask} from '@/modelTypes/ITask'
+
 import {uploadFile} from '@/helpers/attachments'
 import {success} from '@/message'
 import {formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
 
-import type { ITask } from '@/models/task'
 const props = defineProps({
 	taskId: {
 		type: Number,
diff --git a/src/components/tasks/partials/createdUpdated.vue b/src/components/tasks/partials/createdUpdated.vue
index 3d839e5f..d615fdfb 100644
--- a/src/components/tasks/partials/createdUpdated.vue
+++ b/src/components/tasks/partials/createdUpdated.vue
@@ -28,7 +28,7 @@
 
 <script lang="ts" setup>
 import {computed, toRefs, type PropType} from 'vue'
-import type { ITask } from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 import {formatISO, formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
 
 const props = defineProps({
diff --git a/src/components/tasks/partials/defer-task.vue b/src/components/tasks/partials/defer-task.vue
index d57b783a..4cd2b10a 100644
--- a/src/components/tasks/partials/defer-task.vue
+++ b/src/components/tasks/partials/defer-task.vue
@@ -44,7 +44,7 @@ import {useI18n} from 'vue-i18n'
 import flatPickr from 'vue-flatpickr-component'
 
 import TaskService from '@/services/task'
-import { type ITask } from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 const props = defineProps({
 	modelValue: {
diff --git a/src/components/tasks/partials/description.vue b/src/components/tasks/partials/description.vue
index 7eca6931..5e34b84c 100644
--- a/src/components/tasks/partials/description.vue
+++ b/src/components/tasks/partials/description.vue
@@ -20,12 +20,12 @@
 			:is-edit-enabled="canWrite"
 			:upload-callback="attachmentUpload"
 			:upload-enabled="true"
-			@change="save"
 			:placeholder="$t('task.description.placeholder')"
 			:empty-text="$t('task.description.empty')"
 			:show-save="true"
 			edit-shortcut="e"
 			v-model="task.description"
+			@update:model-value="save"
 		/>
 	</div>
 </template>
@@ -36,7 +36,7 @@ import {useStore} from '@/store'
 
 import Editor from '@/components/input/AsyncEditor'
 
-import type { ITask } from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 
 const props = defineProps({
diff --git a/src/components/tasks/partials/editLabels.vue b/src/components/tasks/partials/editLabels.vue
index ae99693f..a7792a79 100644
--- a/src/components/tasks/partials/editLabels.vue
+++ b/src/components/tasks/partials/editLabels.vue
@@ -66,7 +66,7 @@ const props = defineProps({
 	},
 })
 
-const emit = defineEmits(['update:modelValue', 'change'])
+const emit = defineEmits(['update:modelValue'])
 
 const store = useStore()
 const {t} = useI18n({useScope: 'global'})
@@ -96,7 +96,6 @@ function findLabel(newQuery: string) {
 async function addLabel(label: ILabel, showNotification = true) {
 	const bubble = () => {
 		emit('update:modelValue', labels.value)
-		emit('change', labels.value)
 	}
 	
 	if (props.taskId === 0) {
@@ -122,7 +121,6 @@ async function removeLabel(label: ILabel) {
 		}
 	}
 	emit('update:modelValue', labels.value)
-	emit('change', labels.value)
 	success({message: t('task.label.removeSuccess')})
 }
 
diff --git a/src/components/tasks/partials/heading.vue b/src/components/tasks/partials/heading.vue
index c02ceb63..9b57c2ad 100644
--- a/src/components/tasks/partials/heading.vue
+++ b/src/components/tasks/partials/heading.vue
@@ -34,12 +34,14 @@
 <script setup lang="ts">
 import {ref, computed, type PropType} from 'vue'
 import {useStore} from '@/store'
+import {useRouter} from 'vue-router'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 import Done from '@/components/misc/Done.vue'
-import type {ITask} from '@/models/task'
-import { useRouter } from 'vue-router'
-import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
+
+import {useCopyToClipboard} from '@/composables/useCopyToClipboard'
+
+import type {ITask} from '@/modelTypes/ITask'
 
 const props = defineProps({
 	task: {
diff --git a/src/components/tasks/partials/kanban-card.vue b/src/components/tasks/partials/kanban-card.vue
index 73abace1..4ab004d1 100644
--- a/src/components/tasks/partials/kanban-card.vue
+++ b/src/components/tasks/partials/kanban-card.vue
@@ -74,7 +74,8 @@ import User from '../../../components/misc/user.vue'
 import Done from '@/components/misc/Done.vue'
 import Labels from '../../../components/tasks/partials/labels.vue'
 import ChecklistSummary from './checklist-summary.vue'
-import {TASK_DEFAULT_COLOR, type ITask} from '@/models/task'
+import {TASK_DEFAULT_COLOR} from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 import {formatDateLong, formatISO, formatDateSince} from '@/helpers/time/formatDate'
 import {colorIsDark} from '@/helpers/color/colorIsDark'
diff --git a/src/components/tasks/partials/labels.vue b/src/components/tasks/partials/labels.vue
index 2b640a35..8727695a 100644
--- a/src/components/tasks/partials/labels.vue
+++ b/src/components/tasks/partials/labels.vue
@@ -11,8 +11,8 @@
 </template>
 
 <script setup lang="ts">
-import type { PropType } from 'vue'
-import type { ILabel } from '@/models/label'
+import type {PropType} from 'vue'
+import type {ILabel} from '@/modelTypes/ILabel'
 
 defineProps({
 	labels: {
diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue
index 2b48f716..8386695f 100644
--- a/src/components/tasks/partials/listSearch.vue
+++ b/src/components/tasks/partials/listSearch.vue
@@ -21,7 +21,8 @@ import {reactive, ref, watch} from 'vue'
 import type {PropType} from 'vue'
 import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
-import ListModel, { type IList } from '@/models/list'
+import ListModel from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 import Multiselect from '@/components/input/multiselect.vue'
 
 const props = defineProps({
diff --git a/src/components/tasks/partials/percentDoneSelect.vue b/src/components/tasks/partials/percentDoneSelect.vue
index abf67ce0..0913840d 100644
--- a/src/components/tasks/partials/percentDoneSelect.vue
+++ b/src/components/tasks/partials/percentDoneSelect.vue
@@ -32,13 +32,12 @@ const props = defineProps({
 	},
 })
 
-const emit = defineEmits(['update:modelValue', 'change'])
+const emit = defineEmits(['update:modelValue'])
 
 const percentDone = computed({
 	get: () => props.modelValue,
 	set(percentDone) {
 		emit('update:modelValue', percentDone)
-		emit('change')
 	},
 })
 </script>
diff --git a/src/components/tasks/partials/prioritySelect.vue b/src/components/tasks/partials/prioritySelect.vue
index 30a52892..eb4c395a 100644
--- a/src/components/tasks/partials/prioritySelect.vue
+++ b/src/components/tasks/partials/prioritySelect.vue
@@ -19,19 +19,19 @@
 import {ref, watch} from 'vue'
 import {PRIORITIES} from '@/constants/priorities'
 
-const priority = ref(0)
-
 const props = defineProps({
 	modelValue: {
-		default: 0,
 		type: Number,
+		default: 0,
 	},
 	disabled: {
 		default: false,
 	},
 })
 
-const emit = defineEmits(['update:modelValue', 'change'])
+const emit = defineEmits(['update:modelValue'])
+
+const priority = ref(0)
 
 // FIXME: store value outside
 // Set the priority to the :value every time it changes from the outside
@@ -45,6 +45,5 @@ watch(
 
 function updateData() {
 	emit('update:modelValue', priority.value)
-	emit('change')
 }
 </script>
diff --git a/src/components/tasks/partials/reminders.vue b/src/components/tasks/partials/reminders.vue
index 0f771aa4..47c84295 100644
--- a/src/components/tasks/partials/reminders.vue
+++ b/src/components/tasks/partials/reminders.vue
@@ -63,7 +63,7 @@ const props = defineProps({
 	},
 })
 
-const emit = defineEmits(['update:modelValue', 'change'])
+const emit = defineEmits(['update:modelValue'])
 
 const reminders = ref<Reminder[]>([])
 
@@ -86,7 +86,6 @@ watch(
 
 function updateData() {
 	emit('update:modelValue', reminders.value)
-	emit('change')
 }
 
 const newReminder = ref(null)
diff --git a/src/components/tasks/partials/repeatAfter.vue b/src/components/tasks/partials/repeatAfter.vue
index bf50384d..e416e2a6 100644
--- a/src/components/tasks/partials/repeatAfter.vue
+++ b/src/components/tasks/partials/repeatAfter.vue
@@ -85,7 +85,7 @@ const props = defineProps({
 
 const {t} = useI18n({useScope: 'global'})
 
-const emit = defineEmits(['update:modelValue', 'change'])
+const emit = defineEmits(['update:modelValue'])
 
 const task = ref<ITask>()
 const repeatAfter = reactive({
@@ -116,7 +116,6 @@ function updateData() {
 
 	Object.assign(task.value.repeatAfter, repeatAfter)
 	emit('update:modelValue', task.value)
-	emit('change')
 }
 
 function setRepeatAfter(amount: number, type: IRepeatAfter['type']) {
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index 5c466e42..2794de16 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -98,7 +98,8 @@
 <script lang="ts">
 import {defineComponent, type PropType} from 'vue'
 
-import TaskModel, { type ITask } from '../../../models/task'
+import TaskModel from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 import PriorityLabel from './priorityLabel.vue'
 import TaskService from '../../../services/task'
 import Labels from '@/components/tasks/partials/labels.vue'
diff --git a/src/composables/useCopyToClipboard.ts b/src/composables/useCopyToClipboard.ts
index 30ea3745..69fa1914 100644
--- a/src/composables/useCopyToClipboard.ts
+++ b/src/composables/useCopyToClipboard.ts
@@ -3,11 +3,42 @@ import {useI18n} from 'vue-i18n'
 
 export function useCopyToClipboard() {
 	const {t} = useI18n({useScope: 'global'})
-
+	
+	function fallbackCopyTextToClipboard(text: string) {
+		const textArea = document.createElement('textarea')
+		textArea.value = text
+		
+		// Avoid scrolling to bottom
+		textArea.style.top = '0'
+		textArea.style.left = '0'
+		textArea.style.position = 'fixed'
+	
+		document.body.appendChild(textArea)
+		textArea.focus()
+		textArea.select()
+	
+		try {
+			// NOTE: the execCommand is deprecated but as of 2022_09
+			// widely supported and works without https
+			const successful = document.execCommand('copy')
+			if (!successful) {
+				throw new Error()
+			}
+		} catch (err) {
+			error(t('misc.copyError'))
+		}
+	
+		document.body.removeChild(textArea)
+	}
+	
 	return async (text: string) => {
+		if (!navigator.clipboard) {
+			fallbackCopyTextToClipboard(text)
+			return
+		}
 		try {
 			await navigator.clipboard.writeText(text)
-		} catch {
+		} catch(e) {
 			error(t('misc.copyError'))
 		}
 	}
diff --git a/src/helpers/attachments.ts b/src/helpers/attachments.ts
index 51556c68..1c9e9e73 100644
--- a/src/helpers/attachments.ts
+++ b/src/helpers/attachments.ts
@@ -1,5 +1,6 @@
-import AttachmentModel, { type IAttachment } from '@/models/attachment'
-import type {IFile} from '@/models/file'
+import AttachmentModel from '@/models/attachment'
+import type {IAttachment} from '@/modelTypes/IAttachment'
+import type {IFile} from '@/modelTypes/IFile'
 
 import AttachmentService from '@/services/attachment'
 import { store } from '@/store'
diff --git a/src/helpers/getListTitle.ts b/src/helpers/getListTitle.ts
index 3d262e9b..e0e9c22d 100644
--- a/src/helpers/getListTitle.ts
+++ b/src/helpers/getListTitle.ts
@@ -1,5 +1,5 @@
 import {i18n} from '@/i18n'
-import type { IList } from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 
 export function getListTitle(l: IList) {
 	if (l.id === -1) {
diff --git a/src/helpers/getNamespaceTitle.ts b/src/helpers/getNamespaceTitle.ts
index 54f5a7c0..0e31647a 100644
--- a/src/helpers/getNamespaceTitle.ts
+++ b/src/helpers/getNamespaceTitle.ts
@@ -1,5 +1,5 @@
 import {i18n} from '@/i18n'
-import type {INamespace} from '@/models/namespace'
+import type {INamespace} from '@/modelTypes/INamespace'
 
 export const getNamespaceTitle = (n: INamespace) => {
 	if (n.id === -1) {
diff --git a/src/helpers/labels.ts b/src/helpers/labels.ts
index be2f688b..e54be9ed 100644
--- a/src/helpers/labels.ts
+++ b/src/helpers/labels.ts
@@ -1,7 +1,7 @@
 import {createNewIndexer} from '../indexes'
 
 import type {LabelState} from '@/store/types'
-import type {ILabel} from '@/models/label'
+import type {ILabel} from '@/modelTypes/ILabel'
 
 const {search} = createNewIndexer('labels', ['title', 'description'])
 
diff --git a/src/helpers/saveCollapsedBucketState.ts b/src/helpers/saveCollapsedBucketState.ts
index 781e94fa..f784a919 100644
--- a/src/helpers/saveCollapsedBucketState.ts
+++ b/src/helpers/saveCollapsedBucketState.ts
@@ -1,4 +1,4 @@
-import type {IList} from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 
 const key = 'collapsedBuckets'
 
diff --git a/src/helpers/savedFilter.ts b/src/helpers/savedFilter.ts
index d059a07c..3ad23f08 100644
--- a/src/helpers/savedFilter.ts
+++ b/src/helpers/savedFilter.ts
@@ -1,4 +1,4 @@
-import type {IList} from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 
 export function getSavedFilterIdFromListId(listId: IList['id']) {
 	let filterId = listId * -1 - 1
diff --git a/src/i18n/lang/ca-ES.json b/src/i18n/lang/ca-ES.json
index 6862cf75..250f90d6 100644
--- a/src/i18n/lang/ca-ES.json
+++ b/src/i18n/lang/ca-ES.json
@@ -870,7 +870,8 @@
       "related": "Modify related tasks of this task",
       "color": "Change the color of this task",
       "move": "Move this task to another list",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "List Views",
diff --git a/src/i18n/lang/cs-CZ.json b/src/i18n/lang/cs-CZ.json
index b61efb83..8caa713d 100644
--- a/src/i18n/lang/cs-CZ.json
+++ b/src/i18n/lang/cs-CZ.json
@@ -870,7 +870,8 @@
       "related": "Upravit související úkoly tohoto úkolu",
       "color": "Změnit barvu tohoto úkolu",
       "move": "Přesunout tento úkol do jiného seznamu",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "Zobrazení seznamů",
diff --git a/src/i18n/lang/de-DE.json b/src/i18n/lang/de-DE.json
index d33a1b1e..871eef43 100644
--- a/src/i18n/lang/de-DE.json
+++ b/src/i18n/lang/de-DE.json
@@ -870,7 +870,8 @@
       "related": "Ändere die Abhängigen Aufgaben dieser Aufgabe",
       "color": "Die Farbe dieser Aufgabe ändern",
       "move": "Diese Aufgabe in eine andere Liste verschieben",
-      "reminder": "Erinnerungen für diese Aufgabe verwalten"
+      "reminder": "Erinnerungen für diese Aufgabe verwalten",
+      "description": "Aufgabenbeschreibung bearbeiten"
     },
     "list": {
       "title": "Listenansicht",
diff --git a/src/i18n/lang/de-swiss.json b/src/i18n/lang/de-swiss.json
index 9559ce09..e0306483 100644
--- a/src/i18n/lang/de-swiss.json
+++ b/src/i18n/lang/de-swiss.json
@@ -870,7 +870,8 @@
       "related": "Beziehige vo dere Uufgab bearbeite",
       "color": "Die Farbe dieser Aufgabe ändern",
       "move": "Diese Aufgabe in eine andere Liste verschieben",
-      "reminder": "Erinnerungen für diese Aufgabe verwalten"
+      "reminder": "Erinnerungen für diese Aufgabe verwalten",
+      "description": "Aufgabenbeschreibung bearbeiten"
     },
     "list": {
       "title": "Listenansicht",
diff --git a/src/i18n/lang/es-ES.json b/src/i18n/lang/es-ES.json
index 6862cf75..250f90d6 100644
--- a/src/i18n/lang/es-ES.json
+++ b/src/i18n/lang/es-ES.json
@@ -870,7 +870,8 @@
       "related": "Modify related tasks of this task",
       "color": "Change the color of this task",
       "move": "Move this task to another list",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "List Views",
diff --git a/src/i18n/lang/fr-FR.json b/src/i18n/lang/fr-FR.json
index 7a9b0c49..e52f1fee 100644
--- a/src/i18n/lang/fr-FR.json
+++ b/src/i18n/lang/fr-FR.json
@@ -870,7 +870,8 @@
       "related": "Modifier les tâches connexes de cette tâche",
       "color": "Changer la couleur de cette tâche",
       "move": "Déplacer cette tâche dans une autre liste",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "Vues en liste",
diff --git a/src/i18n/lang/it-IT.json b/src/i18n/lang/it-IT.json
index ad858ea3..4f89f040 100644
--- a/src/i18n/lang/it-IT.json
+++ b/src/i18n/lang/it-IT.json
@@ -87,7 +87,7 @@
         "language": "Lingua",
         "defaultList": "Lista predefinita",
         "timezone": "Fuso Orario",
-        "overdueTasksRemindersTime": "Orario email del promemoria attività in ritardo"
+        "overdueTasksRemindersTime": "Orario email attività in scadute"
       },
       "totp": {
         "title": "Autenticazione a due fattori",
@@ -562,12 +562,12 @@
       }
     },
     "datemathHelp": {
-      "canuse": "You can use date math to filter for relative dates.",
+      "canuse": "Puoi usare le date calcolate per filtrare per date relative.",
       "learnhow": "Scopri come funziona",
-      "title": "Date Math",
-      "intro": "Date Math allows you to specify relative dates which are resolved on the fly by Vikunja when applying the filter.",
-      "expression": "Each Date Math expression starts with an anchor date, which can either be {0}, or a date string ending with {1}. This anchor date can optionally be followed by one or more maths expressions.",
-      "similar": "These expressions are similar to the ones provided by {0} and {1}.",
+      "title": "Date Calcolate",
+      "intro": "Le Date Calcolate ti permettono di specificare date relative che vengono calcolate al volo da Vikunja quando viene applicato il filtro.",
+      "expression": "Ogni Data Calcolata inizia con una data base, che può essere {0}, o una data con {1} alla fine. Questa data base può essere seguita da una o più espressioni matematiche.",
+      "similar": "Queste espressioni sono simili a quelle fornite da {0} e {1}.",
       "add1Day": "Aggiungi un giorno",
       "minus1Day": "Sottrai un giorno",
       "roundDay": "Arrotonda per difetto al giorno più vicino",
@@ -781,7 +781,7 @@
       "weeks": "Settimane",
       "months": "Mesi",
       "years": "Anni",
-      "invalidAmount": "Please enter more than 0."
+      "invalidAmount": "Inserisci più di 0."
     },
     "quickAddMagic": {
       "hint": "Puoi usare l'Aggiunta Rapida Magica",
@@ -791,15 +791,15 @@
       "multiple": "Puoi usarlo più volte.",
       "label1": "Per aggiungere un'etichetta, basta aggiungere il nome dell'etichetta preceduto da {prefix}.",
       "label2": "Vikunja controllerà prima se l'etichetta esiste già e nel caso la creerà.",
-      "label3": "To use spaces, simply add a \" or ' around the label name.",
+      "label3": "Per usare gli spazi, basta aggiungere un \" o ' prima e dopo il nome dell'etichetta.",
       "label4": "Per esempio: {prefix}\"Etichetta con spazi\".",
       "priority1": "Per impostare la priorità di un'attività, aggiungi un numero 1-5, preceduto da {prefix}.",
       "priority2": "Più alto è il numero, più alta è la priorità.",
       "assignees": "Per assegnare direttamente l'attività a un utente, aggiungere il suo nome utente preceduto da {prefix} all'attività.",
       "list1": "Per impostare una lista di appartenenza all'attività, inserisci il suo nome prefisso con {prefix}.",
       "list2": "Ciò restituirà un errore se la lista non esiste.",
-      "list3": "To use spaces, simply add a \" or ' around the list name.",
-      "list4": "For example: {prefix}\"List with spaces\".",
+      "list3": "Per usare gli spazi, basta aggiungere un \" o ' prima e dopo il nome della lista.",
+      "list4": "Per esempio: {prefix}\"Etichetta con spazi\".",
       "dateAndTime": "Data e ora",
       "date": "Qualsiasi data verrà utilizzata come data di scadenza della nuova attività. È possibile utilizzare le date in uno qualsiasi di questi formati:",
       "dateWeekday": "qualsiasi giorno della settimana, userà la data più vicina",
@@ -870,7 +870,8 @@
       "related": "Modifica le attività collegate a questa",
       "color": "Cambia il colore di questa attività",
       "move": "Sposta questa attività in un altro elenco",
-      "reminder": "Gestisci i promemoria di questa attività"
+      "reminder": "Gestisci i promemoria di questa attività",
+      "description": "Attiva/Disattiva modifica della descrizione dell'attività"
     },
     "list": {
       "title": "Viste Liste",
diff --git a/src/i18n/lang/nl-NL.json b/src/i18n/lang/nl-NL.json
index 2cab9e4c..0354cc78 100644
--- a/src/i18n/lang/nl-NL.json
+++ b/src/i18n/lang/nl-NL.json
@@ -870,7 +870,8 @@
       "related": "Modify related tasks of this task",
       "color": "Change the color of this task",
       "move": "Move this task to another list",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "List Views",
diff --git a/src/i18n/lang/pl-PL.json b/src/i18n/lang/pl-PL.json
index a8e14528..d4778c03 100644
--- a/src/i18n/lang/pl-PL.json
+++ b/src/i18n/lang/pl-PL.json
@@ -870,7 +870,8 @@
       "related": "Zmodyfikuj zadania powiązane z tym zadaniem",
       "color": "Zmień kolor tego zadania",
       "move": "Przenieś to zadanie do innej listy",
-      "reminder": "Zarządzaj przypomnieniami o tym zadaniu"
+      "reminder": "Zarządzaj przypomnieniami o tym zadaniu",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "Widoki listy",
diff --git a/src/i18n/lang/pt-BR.json b/src/i18n/lang/pt-BR.json
index 6862cf75..250f90d6 100644
--- a/src/i18n/lang/pt-BR.json
+++ b/src/i18n/lang/pt-BR.json
@@ -870,7 +870,8 @@
       "related": "Modify related tasks of this task",
       "color": "Change the color of this task",
       "move": "Move this task to another list",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "List Views",
diff --git a/src/i18n/lang/pt-PT.json b/src/i18n/lang/pt-PT.json
index 35ea1b11..27c1044c 100644
--- a/src/i18n/lang/pt-PT.json
+++ b/src/i18n/lang/pt-PT.json
@@ -870,7 +870,8 @@
       "related": "Modificar as tarefas relacionadas desta tarefa",
       "color": "Alterar a cor desta tarefa",
       "move": "Mover esta tarefa para outra lista",
-      "reminder": "Gerir lembretes desta tarefa"
+      "reminder": "Gerir lembretes desta tarefa",
+      "description": "Alternar edição da descrição da tarefa"
     },
     "list": {
       "title": "Visualização em Lista",
diff --git a/src/i18n/lang/ro-RO.json b/src/i18n/lang/ro-RO.json
index 6862cf75..250f90d6 100644
--- a/src/i18n/lang/ro-RO.json
+++ b/src/i18n/lang/ro-RO.json
@@ -870,7 +870,8 @@
       "related": "Modify related tasks of this task",
       "color": "Change the color of this task",
       "move": "Move this task to another list",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "List Views",
diff --git a/src/i18n/lang/ru-RU.json b/src/i18n/lang/ru-RU.json
index bc929b96..e42bb802 100644
--- a/src/i18n/lang/ru-RU.json
+++ b/src/i18n/lang/ru-RU.json
@@ -870,7 +870,8 @@
       "related": "Изменить связанные задачи",
       "color": "Change the color of this task",
       "move": "Move this task to another list",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "List Views",
diff --git a/src/i18n/lang/sk-SK.json b/src/i18n/lang/sk-SK.json
index 6862cf75..250f90d6 100644
--- a/src/i18n/lang/sk-SK.json
+++ b/src/i18n/lang/sk-SK.json
@@ -870,7 +870,8 @@
       "related": "Modify related tasks of this task",
       "color": "Change the color of this task",
       "move": "Move this task to another list",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "List Views",
diff --git a/src/i18n/lang/sv-SE.json b/src/i18n/lang/sv-SE.json
index 6862cf75..250f90d6 100644
--- a/src/i18n/lang/sv-SE.json
+++ b/src/i18n/lang/sv-SE.json
@@ -870,7 +870,8 @@
       "related": "Modify related tasks of this task",
       "color": "Change the color of this task",
       "move": "Move this task to another list",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "List Views",
diff --git a/src/i18n/lang/tr-TR.json b/src/i18n/lang/tr-TR.json
index 6862cf75..250f90d6 100644
--- a/src/i18n/lang/tr-TR.json
+++ b/src/i18n/lang/tr-TR.json
@@ -870,7 +870,8 @@
       "related": "Modify related tasks of this task",
       "color": "Change the color of this task",
       "move": "Move this task to another list",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "List Views",
diff --git a/src/i18n/lang/vi-VN.json b/src/i18n/lang/vi-VN.json
index d7eb1f45..ccca88d6 100644
--- a/src/i18n/lang/vi-VN.json
+++ b/src/i18n/lang/vi-VN.json
@@ -870,7 +870,8 @@
       "related": "Sửa đổi các công việc liên kết",
       "color": "Thay đổi màu công việc này",
       "move": "Dời công việc này sang danh sách khác",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "Xem danh sách",
diff --git a/src/i18n/lang/zh-CN.json b/src/i18n/lang/zh-CN.json
index 6862cf75..250f90d6 100644
--- a/src/i18n/lang/zh-CN.json
+++ b/src/i18n/lang/zh-CN.json
@@ -870,7 +870,8 @@
       "related": "Modify related tasks of this task",
       "color": "Change the color of this task",
       "move": "Move this task to another list",
-      "reminder": "Manage reminders of this task"
+      "reminder": "Manage reminders of this task",
+      "description": "Toggle editing of the task description"
     },
     "list": {
       "title": "List Views",
diff --git a/src/models/attachment.ts b/src/models/attachment.ts
index 69460972..29862b49 100644
--- a/src/models/attachment.ts
+++ b/src/models/attachment.ts
@@ -5,7 +5,7 @@ import type { IUser } from '@/modelTypes/IUser'
 import type { IFile } from '@/modelTypes/IFile'
 import type { IAttachment } from '@/modelTypes/IAttachment'
 
-export default class AttachmentModel extends AbstractModel implements IAttachment {
+export default class AttachmentModel extends AbstractModel<IAttachment> implements IAttachment {
 	id = 0
 	taskId = 0
 	createdBy: IUser = UserModel
diff --git a/src/models/avatar.ts b/src/models/avatar.ts
index 06f484fc..c9b2253c 100644
--- a/src/models/avatar.ts
+++ b/src/models/avatar.ts
@@ -1,7 +1,7 @@
 import AbstractModel from './abstractModel'
 import type { IAvatar } from '@/modelTypes/IAvatar'
 
-export default class AvatarModel extends AbstractModel implements IAvatar {
+export default class AvatarModel extends AbstractModel<IAvatar> implements IAvatar {
 	avatarProvider: IAvatar['avatarProvider'] = 'default'
 
 	constructor(data: Partial<IAvatar>) {
diff --git a/src/models/backgroundImage.ts b/src/models/backgroundImage.ts
index 8c1a2134..181a4297 100644
--- a/src/models/backgroundImage.ts
+++ b/src/models/backgroundImage.ts
@@ -1,7 +1,7 @@
 import AbstractModel from './abstractModel'
 import type {IBackgroundImage} from '@/modelTypes/IBackgroundImage'
 
-export default class BackgroundImageModel extends AbstractModel implements IBackgroundImage {
+export default class BackgroundImageModel extends AbstractModel<IBackgroundImage> implements IBackgroundImage {
 	id = 0
 	url = ''
 	thumb = ''
diff --git a/src/models/bucket.ts b/src/models/bucket.ts
index 3394583c..2e055249 100644
--- a/src/models/bucket.ts
+++ b/src/models/bucket.ts
@@ -6,14 +6,14 @@ import type {IBucket} from '@/modelTypes/IBucket'
 import type {ITask} from '@/modelTypes/ITask'
 import type {IUser} from '@/modelTypes/IUser'
 
-export default class BucketModel extends AbstractModel implements IBucket {
+export default class BucketModel extends AbstractModel<IBucket> implements IBucket {
 	id = 0
 	title = ''
 	listId = ''
 	limit = 0
 	tasks: ITask[] = []
-	isDoneBucket: false
-	position: 0
+	isDoneBucket = false
+	position = 0
 	
 	createdBy: IUser = null
 	created: Date = null
diff --git a/src/models/caldavToken.ts b/src/models/caldavToken.ts
index bc904c47..dc5016f8 100644
--- a/src/models/caldavToken.ts
+++ b/src/models/caldavToken.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 
 import type {ICaldavToken} from '@/modelTypes/ICaldavToken'
 
-export default class CaldavTokenModel extends AbstractModel implements ICaldavToken {
+export default class CaldavTokenModel extends AbstractModel<ICaldavToken> implements ICaldavToken {
 	id: number
 	created: Date
 
diff --git a/src/models/emailUpdate.ts b/src/models/emailUpdate.ts
index aece407f..2f50da40 100644
--- a/src/models/emailUpdate.ts
+++ b/src/models/emailUpdate.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 
 import type {IEmailUpdate} from '@/modelTypes/IEmailUpdate'
 
-export default class EmailUpdateModel extends AbstractModel implements IEmailUpdate {
+export default class EmailUpdateModel extends AbstractModel<IEmailUpdate> implements IEmailUpdate {
 	newEmail = ''
 	password = ''
 
diff --git a/src/models/file.ts b/src/models/file.ts
index cb17d515..4c32f17e 100644
--- a/src/models/file.ts
+++ b/src/models/file.ts
@@ -1,7 +1,7 @@
 import AbstractModel from './abstractModel'
 import type {IFile} from '@/modelTypes/IFile'
 
-export default class FileModel extends AbstractModel implements IFile {
+export default class FileModel extends AbstractModel<IFile> implements IFile {
 	id = 0
 	mime = ''
 	name = ''
diff --git a/src/models/label.ts b/src/models/label.ts
index 1e14cf82..d151260b 100644
--- a/src/models/label.ts
+++ b/src/models/label.ts
@@ -8,7 +8,7 @@ import {colorIsDark} from '@/helpers/color/colorIsDark'
 
 const DEFAULT_LABEL_BACKGROUND_COLOR = 'e8e8e8'
 
-export default class LabelModel extends AbstractModel implements ILabel {
+export default class LabelModel extends AbstractModel<ILabel> implements ILabel {
 	id = 0
 	title = ''
 	// FIXME: this should be empty and be definied in the client.
diff --git a/src/models/labelTask.ts b/src/models/labelTask.ts
index b1e06822..5b6c3c3c 100644
--- a/src/models/labelTask.ts
+++ b/src/models/labelTask.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 
 import type { ILabelTask } from '@/modelTypes/ILabelTask'
 
-export default class LabelTask extends AbstractModel implements ILabelTask {
+export default class LabelTask extends AbstractModel<ILabelTask> implements ILabelTask {
 	id = 0
 	taskId = 0
 	labelId = 0
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index 24aa8779..241f58ad 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -5,7 +5,7 @@ import {RIGHTS, type Right} from '@/constants/rights'
 import type {ILinkShare} from '@/modelTypes/ILinkShare'
 import type {IUser} from '@/modelTypes/IUser'
 
-export default class LinkShareModel extends AbstractModel implements ILinkShare {
+export default class LinkShareModel extends AbstractModel<ILinkShare> implements ILinkShare {
 	id = 0
 	hash = ''
 	right: Right = RIGHTS.READ
diff --git a/src/models/list.ts b/src/models/list.ts
index 02387f18..b041694e 100644
--- a/src/models/list.ts
+++ b/src/models/list.ts
@@ -11,7 +11,7 @@ import type {ISubscription} from '@/modelTypes/ISubscription'
 
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 
-export default class ListModel extends AbstractModel implements IList {
+export default class ListModel extends AbstractModel<IList> implements IList {
 	id = 0
 	title = ''
 	description = ''
@@ -30,7 +30,7 @@ export default class ListModel extends AbstractModel implements IList {
 	created: Date = null
 	updated: Date = null
 
-	constructor(data: Partial<IList>) {
+	constructor(data: Partial<IList> = {}) {
 		super()
 		this.assignData(data)
 
diff --git a/src/models/listDuplicateModel.ts b/src/models/listDuplicateModel.ts
index 8ed2ae74..9a5607ea 100644
--- a/src/models/listDuplicateModel.ts
+++ b/src/models/listDuplicateModel.ts
@@ -5,7 +5,7 @@ import type {IListDuplicate} from '@/modelTypes/IListDuplicate'
 import type {INamespace} from '@/modelTypes/INamespace'
 import type {IList} from '@/modelTypes/IList'
 
-export default class ListDuplicateModel extends AbstractModel implements IListDuplicate {
+export default class ListDuplicateModel extends AbstractModel<IListDuplicate> implements IListDuplicate {
 	listId = 0
 	namespaceId: INamespace['id'] = 0
 	list: IList = ListModel
diff --git a/src/models/namespace.ts b/src/models/namespace.ts
index dade605e..d92c484c 100644
--- a/src/models/namespace.ts
+++ b/src/models/namespace.ts
@@ -8,7 +8,7 @@ import type {IUser} from '@/modelTypes/IUser'
 import type {IList} from '@/modelTypes/IList'
 import type {ISubscription} from '@/modelTypes/ISubscription'
 
-export default class NamespaceModel extends AbstractModel implements INamespace {
+export default class NamespaceModel extends AbstractModel<INamespace> implements INamespace {
 	id = 0
 	title = ''
 	description = ''
@@ -21,7 +21,7 @@ export default class NamespaceModel extends AbstractModel implements INamespace
 	created: Date = null
 	updated: Date = null
 
-	constructor(data: Partial<INamespace>) {
+	constructor(data: Partial<INamespace> = {}) {
 		super()
 		this.assignData(data)
 
diff --git a/src/models/notification.ts b/src/models/notification.ts
index a1fc44ad..911c49e7 100644
--- a/src/models/notification.ts
+++ b/src/models/notification.ts
@@ -8,7 +8,7 @@ import TeamModel from '@/models/team'
 
 import {NOTIFICATION_NAMES, type INotification} from '@/modelTypes/INotification'
 
-export default class NotificationModel extends AbstractModel implements INotification {
+export default class NotificationModel extends AbstractModel<INotification> implements INotification {
 	id = 0
 	name = ''
 	notification: INotification['notification'] = null
diff --git a/src/models/passwordReset.ts b/src/models/passwordReset.ts
index 5140063f..0c2d3cd8 100644
--- a/src/models/passwordReset.ts
+++ b/src/models/passwordReset.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 
 import type {IPasswordReset} from '@/modelTypes/IPasswordReset'
 
-export default class PasswordResetModel extends AbstractModel implements IPasswordReset {
+export default class PasswordResetModel extends AbstractModel<IPasswordReset> implements IPasswordReset {
 	token = ''
 	newPassword = ''
 	email = ''
diff --git a/src/models/passwordUpdate.ts b/src/models/passwordUpdate.ts
index 702fcd50..a52c9e10 100644
--- a/src/models/passwordUpdate.ts
+++ b/src/models/passwordUpdate.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 
 import type {IPasswordUpdate} from '@/modelTypes/IPasswordUpdate'
 
-export default class PasswordUpdateModel extends AbstractModel implements IPasswordUpdate {
+export default class PasswordUpdateModel extends AbstractModel<IPasswordUpdate> implements IPasswordUpdate {
 	newPassword = ''
 	oldPassword = ''
 
diff --git a/src/models/savedFilter.ts b/src/models/savedFilter.ts
index c432014f..179268a2 100644
--- a/src/models/savedFilter.ts
+++ b/src/models/savedFilter.ts
@@ -4,7 +4,7 @@ import UserModel from '@/models/user'
 import type {ISavedFilter} from '@/modelTypes/ISavedFilter'
 import type {IUser} from '@/modelTypes/IUser'
 
-export default class SavedFilterModel extends AbstractModel implements ISavedFilter {
+export default class SavedFilterModel extends AbstractModel<ISavedFilter> implements ISavedFilter {
 	id = 0
 	title = ''
 	description = ''
diff --git a/src/models/subscription.ts b/src/models/subscription.ts
index 77ae3dec..08f0e766 100644
--- a/src/models/subscription.ts
+++ b/src/models/subscription.ts
@@ -4,7 +4,7 @@ import UserModel from '@/models/user'
 import type {ISubscription} from '@/modelTypes/ISubscription'
 import type {IUser} from '@/modelTypes/IUser'
 
-export default class SubscriptionModel extends AbstractModel implements ISubscription {
+export default class SubscriptionModel extends AbstractModel<ISubscription> implements ISubscription {
 	id = 0
 	entity = ''
 	entityId = 0
diff --git a/src/models/task.ts b/src/models/task.ts
index e8dafdf1..d5e698fb 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -32,7 +32,7 @@ export function	getHexColor(hexColor: string) {
 	return hexColor
 }
 
-export default class TaskModel extends AbstractModel implements ITask {
+export default class TaskModel extends AbstractModel<ITask> implements ITask {
 	id = 0
 	title = ''
 	description = ''
diff --git a/src/models/taskAssignee.ts b/src/models/taskAssignee.ts
index 5777e5b2..40fffce6 100644
--- a/src/models/taskAssignee.ts
+++ b/src/models/taskAssignee.ts
@@ -4,7 +4,7 @@ import type {ITaskAssignee} from '@/modelTypes/ITaskAssignee'
 import type {IUser} from '@/modelTypes/IUser'
 import type {ITask} from '@/modelTypes/ITask'
 
-export default class TaskAssigneeModel extends AbstractModel implements ITaskAssignee {
+export default class TaskAssigneeModel extends AbstractModel<ITaskAssignee> implements ITaskAssignee {
 	created: Date = null
 	userId: IUser['id'] = 0
 	taskId: ITask['id'] = 0
diff --git a/src/models/taskComment.ts b/src/models/taskComment.ts
index 6c76e822..7c117a3d 100644
--- a/src/models/taskComment.ts
+++ b/src/models/taskComment.ts
@@ -5,7 +5,7 @@ import type {ITaskComment} from '@/modelTypes/ITaskComment'
 import type {ITask} from '@/modelTypes/ITask'
 import type {IUser} from '@/modelTypes/IUser'
 
-export default class TaskCommentModel extends AbstractModel implements ITaskComment {
+export default class TaskCommentModel extends AbstractModel<ITaskComment> implements ITaskComment {
 	id = 0
 	taskId: ITask['id'] = 0
 	comment = ''
diff --git a/src/models/taskRelation.ts b/src/models/taskRelation.ts
index e22eddb9..0dfdac81 100644
--- a/src/models/taskRelation.ts
+++ b/src/models/taskRelation.ts
@@ -6,7 +6,7 @@ import type {ITask} from '@/modelTypes/ITask'
 import type {IUser} from '@/modelTypes/IUser'
 
 import type {IRelationKind} from '@/types/IRelationKind'
-export default class TaskRelationModel extends AbstractModel implements ITaskRelation {
+export default class TaskRelationModel extends AbstractModel<ITaskRelation> implements ITaskRelation {
 	id = 0
 	otherTaskId: ITask['id'] = 0
 	taskId: ITask['id'] = 0
diff --git a/src/models/team.ts b/src/models/team.ts
index 5e3bd27e..1953a8f1 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -7,7 +7,7 @@ import type {ITeam} from '@/modelTypes/ITeam'
 import type {ITeamMember} from '@/modelTypes/ITeamMember'
 import type {IUser} from '@/modelTypes/IUser'
 
-export default class TeamModel extends AbstractModel implements ITeam {
+export default class TeamModel extends AbstractModel<ITeam> implements ITeam {
 	id = 0
 	name = ''
 	description = ''
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index c7eb23c7..3b743de7 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -8,7 +8,7 @@ import type {ITeam} from '@/modelTypes/ITeam'
  * This class is a base class for common team sharing model.
  * It is extended in a way so it can be used for namespaces as well for lists.
  */
-export default class TeamShareBaseModel extends AbstractModel implements ITeamShareBase {
+export default class TeamShareBaseModel extends AbstractModel<ITeamShareBase> implements ITeamShareBase {
 	teamId: ITeam['id'] = 0
 	right: Right = RIGHTS.READ
 
diff --git a/src/models/totp.ts b/src/models/totp.ts
index 5e094392..a8b6fdf0 100644
--- a/src/models/totp.ts
+++ b/src/models/totp.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 
 import type {ITotp} from '@/modelTypes/ITotp'
 
-export default class TotpModel extends AbstractModel implements ITotp {
+export default class TotpModel extends AbstractModel<ITotp> implements ITotp {
 	secret = ''
 	enabled = false
 	url = ''
diff --git a/src/models/user.ts b/src/models/user.ts
index 41509c17..a946b4a2 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -4,7 +4,7 @@ import UserSettingsModel from '@/models/userSettings'
 import type { IUser } from '@/modelTypes/IUser'
 import type { IUserSettings } from '@/modelTypes/IUserSettings'
 
-export default class UserModel extends AbstractModel implements IUser {
+export default class UserModel extends AbstractModel<IUser> implements IUser {
 	id = 0
 	email = ''
 	username = ''
diff --git a/src/models/userSettings.ts b/src/models/userSettings.ts
index 6b5bd7ca..308c72d8 100644
--- a/src/models/userSettings.ts
+++ b/src/models/userSettings.ts
@@ -4,7 +4,7 @@ import AbstractModel from './abstractModel'
 import type {IUserSettings} from '@/modelTypes/IUserSettings'
 import type {IList} from '@/modelTypes/IList'
 
-export default class UserSettingsModel extends AbstractModel implements IUserSettings {
+export default class UserSettingsModel extends AbstractModel<IUserSettings> implements IUserSettings {
 	name = ''
 	emailRemindersEnabled = true
 	discoverableByName = false
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index e21998d9..39e1f2c7 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -4,7 +4,7 @@ import {RIGHTS, type Right} from '@/constants/rights'
 import type {IUserShareBase} from '@/modelTypes/IUserShareBase'
 import type {IUser} from '@/modelTypes/IUser'
 
-export default class UserShareBaseModel extends AbstractModel implements IUserShareBase {
+export default class UserShareBaseModel extends AbstractModel<IUserShareBase> implements IUserShareBase {
 	userId: IUser['id'] = ''
 	right: Right = RIGHTS.READ
 
diff --git a/src/modules/parseTaskText.test.ts b/src/modules/parseTaskText.test.ts
index 2851a440..01dcd880 100644
--- a/src/modules/parseTaskText.test.ts
+++ b/src/modules/parseTaskText.test.ts
@@ -1,6 +1,6 @@
 import {beforeEach, afterEach, describe, it, expect, vi} from 'vitest'
 
-import {parseTaskText} from './parseTaskText'
+import {parseTaskText, PrefixMode} from './parseTaskText'
 import {getDateFromText, getDateFromTextIn} from '../helpers/time/parseDate'
 import {calculateDayInterval} from '../helpers/time/calculateDayInterval'
 import {PRIORITIES} from '@/constants/priorities'
@@ -20,13 +20,13 @@ describe('Parse Task Text', () => {
 
 	it('should not parse text when disabled', () => {
 		const text = 'Lorem Ipsum today *label +list !2 @user'
-		const result = parseTaskText(text, 'disabled')
+		const result = parseTaskText(text, PrefixMode.Disabled)
 
 		expect(result.text).toBe(text)
 	})
 
 	it('should parse text in todoist mode when configured', () => {
-		const result = parseTaskText('Lorem Ipsum today @label #list !2 +user', 'todoist')
+		const result = parseTaskText('Lorem Ipsum today @label #list !2 +user', PrefixMode.Todoist)
 
 		expect(result.text).toBe('Lorem Ipsum')
 		const now = new Date()
@@ -84,7 +84,7 @@ describe('Parse Task Text', () => {
 				'at 3am': '3:0',
 				'at 3:12 am': '3:12',
 				'at 3:12 pm': '15:12',
-			}
+			} as const
 
 			for (const c in cases) {
 				it(`should recognize today with a time ${c}`, () => {
@@ -95,7 +95,7 @@ describe('Parse Task Text', () => {
 					expect(result.date.getFullYear()).toBe(now.getFullYear())
 					expect(result.date.getMonth()).toBe(now.getMonth())
 					expect(result.date.getDate()).toBe(now.getDate())
-					expect(`${result.date.getHours()}:${result.date.getMinutes()}`).toBe(cases[c])
+					expect(`${result.date.getHours()}:${result.date.getMinutes()}`).toBe(cases[c as keyof typeof cases])
 					expect(result.date.getSeconds()).toBe(0)
 				})
 			}
diff --git a/src/services/abstractService.ts b/src/services/abstractService.ts
index 8f97bb37..11aede34 100644
--- a/src/services/abstractService.ts
+++ b/src/services/abstractService.ts
@@ -4,7 +4,7 @@ import type {Method} from 'axios'
 import {objectToSnakeCase} from '@/helpers/case'
 import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 import type { Right } from '@/constants/rights'
-import type { IFile } from '@/models/file'
+import type {IFile} from '@/modelTypes/IFile'
 
 interface Paths {
 	create : string
diff --git a/src/services/attachment.ts b/src/services/attachment.ts
index c76a2e47..85ad204a 100644
--- a/src/services/attachment.ts
+++ b/src/services/attachment.ts
@@ -1,8 +1,12 @@
-import AbstractService from './abstractService'
-import AttachmentModel, { type IAttachment } from '../models/attachment'
 import {formatISO} from 'date-fns'
+
+import AbstractService from './abstractService'
+import AttachmentModel from '../models/attachment'
+
+import type { IAttachment } from '@/modelTypes/IAttachment'
+import type { IFile } from '@/modelTypes/IFile'
+
 import {downloadBlob} from '@/helpers/downloadBlob'
-import type { IFile } from '@/models/file'
 
 export default class AttachmentService extends AbstractService<AttachmentModel> {
 	constructor() {
@@ -22,7 +26,7 @@ export default class AttachmentService extends AbstractService<AttachmentModel>
 		return false
 	}
 
-	modelFactory(data) {
+	modelFactory(data: Partial<IAttachment>) {
 		return new AttachmentModel(data)
 	}
 
diff --git a/src/services/avatar.ts b/src/services/avatar.ts
index becbc43b..692ab5a3 100644
--- a/src/services/avatar.ts
+++ b/src/services/avatar.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import AvatarModel, { type IAvatar } from '../models/avatar'
+import AvatarModel from '@/models/avatar'
+import type { IAvatar } from '@/modelTypes/IAvatar'
 
 export default class AvatarService extends AbstractService<IAvatar> {
 	constructor() {
@@ -10,7 +11,7 @@ export default class AvatarService extends AbstractService<IAvatar> {
 		})
 	}
 
-	modelFactory(data) {
+	modelFactory(data: Partial<IAvatar>) {
 		return new AvatarModel(data)
 	}
 
diff --git a/src/services/backgroundUnsplash.ts b/src/services/backgroundUnsplash.ts
index 3e3b40cc..a39e7963 100644
--- a/src/services/backgroundUnsplash.ts
+++ b/src/services/backgroundUnsplash.ts
@@ -1,6 +1,7 @@
 import AbstractService from './abstractService'
-import BackgroundImageModel, { type IBackgroundImage } from '../models/backgroundImage'
+import BackgroundImageModel from '../models/backgroundImage'
 import ListModel from '@/models/list'
+import type { IBackgroundImage } from '@/modelTypes/IBackgroundImage'
 
 export default class BackgroundUnsplashService extends AbstractService<IBackgroundImage> {
 	constructor() {
@@ -10,7 +11,7 @@ export default class BackgroundUnsplashService extends AbstractService<IBackgrou
 		})
 	}
 
-	modelFactory(data) {
+	modelFactory(data: Partial<IBackgroundImage>) {
 		return new BackgroundImageModel(data)
 	}
 
diff --git a/src/services/backgroundUpload.ts b/src/services/backgroundUpload.ts
index 079eac29..2d1ec54c 100644
--- a/src/services/backgroundUpload.ts
+++ b/src/services/backgroundUpload.ts
@@ -1,6 +1,8 @@
 import AbstractService from './abstractService'
-import ListModel, { type IList } from '../models/list'
-import type { IFile } from '@/models/file'
+import ListModel from '@/models/list'
+
+import type { IList } from '@/modelTypes/IList'
+import type { IFile } from '@/modelTypes/IFile'
 
 export default class BackgroundUploadService extends AbstractService {
 	constructor() {
@@ -13,14 +15,12 @@ export default class BackgroundUploadService extends AbstractService {
 		return false
 	}
 
-	modelCreateFactory(data) {
+	modelCreateFactory(data: Partial<IList>) {
 		return new ListModel(data)
 	}
 
 	/**
 	 * Uploads a file to the server
-	 * @param file
-	 * @returns {Promise<any|never>}
 	 */
 	create(listId: IList['id'], file: IFile) {
 		return this.uploadFile(
diff --git a/src/services/bucket.ts b/src/services/bucket.ts
index 36f3c741..2d23f462 100644
--- a/src/services/bucket.ts
+++ b/src/services/bucket.ts
@@ -1,6 +1,7 @@
 import AbstractService from './abstractService'
-import BucketModel, { type IBucket } from '../models/bucket'
+import BucketModel from '../models/bucket'
 import TaskService from '@/services/task'
+import type { IBucket } from '@/modelTypes/IBucket'
 
 export default class BucketService extends AbstractService<IBucket> {
 	constructor() {
@@ -12,7 +13,7 @@ export default class BucketService extends AbstractService<IBucket> {
 		})
 	}
 
-	modelFactory(data) {
+	modelFactory(data: Partial<IBucket>) {
 		return new BucketModel(data)
 	}
 
diff --git a/src/services/caldavToken.ts b/src/services/caldavToken.ts
index 736bf3b1..8025ba18 100644
--- a/src/services/caldavToken.ts
+++ b/src/services/caldavToken.ts
@@ -1,5 +1,6 @@
 import {formatISO} from 'date-fns'
-import CaldavTokenModel, {type ICaldavToken} from '../models/caldavToken'
+import CaldavTokenModel from '@/models/caldavToken'
+import type {ICaldavToken} from '@/modelTypes/ICaldavToken'
 import AbstractService from './abstractService'
 
 export default class CaldavTokenService extends AbstractService<ICaldavToken> {
diff --git a/src/services/label.ts b/src/services/label.ts
index 5d3f33c3..eeecacbf 100644
--- a/src/services/label.ts
+++ b/src/services/label.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import LabelModel, { type ILabel } from '@/models/label'
+import LabelModel from '@/models/label'
+import type {ILabel} from '@/modelTypes/ILabel'
 import {formatISO} from 'date-fns'
 import {colorFromHex} from '@/helpers/color/colorFromHex'
 
diff --git a/src/services/labelTask.ts b/src/services/labelTask.ts
index cabc2c40..3e674052 100644
--- a/src/services/labelTask.ts
+++ b/src/services/labelTask.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import LabelTask, {type ILabelTask} from '@/models/labelTask'
+import LabelTask from '@/models/labelTask'
+import type {ILabelTask} from '@/modelTypes/ILabelTask'
 
 export default class LabelTaskService extends AbstractService<ILabelTask> {
 	constructor() {
diff --git a/src/services/linkShare.ts b/src/services/linkShare.ts
index 61220d48..62739f62 100644
--- a/src/services/linkShare.ts
+++ b/src/services/linkShare.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import LinkShareModel, { type ILinkShare } from '@/models/linkShare'
+import LinkShareModel from '@/models/linkShare'
+import type {ILinkShare} from '@/modelTypes/ILinkShare'
 import {formatISO} from 'date-fns'
 
 export default class LinkShareService extends AbstractService<ILinkShare> {
diff --git a/src/services/list.ts b/src/services/list.ts
index 2f05e4aa..f271a47f 100644
--- a/src/services/list.ts
+++ b/src/services/list.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import ListModel, { type IList } from '@/models/list'
+import ListModel from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 import TaskService from './task'
 import {formatISO} from 'date-fns'
 import {colorFromHex} from '@/helpers/color/colorFromHex'
diff --git a/src/services/listDuplicateService.ts b/src/services/listDuplicateService.ts
index b860c7c7..ae9dc43f 100644
--- a/src/services/listDuplicateService.ts
+++ b/src/services/listDuplicateService.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import listDuplicateModel, {type IListDuplicate} from '../models/listDuplicateModel'
+import listDuplicateModel from '@/models/listDuplicateModel'
+import type {IListDuplicate} from '@/modelTypes/IListDuplicate'
 
 export default class ListDuplicateService extends AbstractService<IListDuplicate> {
 	constructor() {
diff --git a/src/services/migrator/abstractMigrationFile.ts b/src/services/migrator/abstractMigrationFile.ts
index dba20937..3ba0ded7 100644
--- a/src/services/migrator/abstractMigrationFile.ts
+++ b/src/services/migrator/abstractMigrationFile.ts
@@ -1,3 +1,4 @@
+import type {IFile} from '@/modelTypes/IFile'
 import AbstractService from '../abstractService'
 
 // This service builds on top of the abstract service and basically just hides away method names.
@@ -5,7 +6,7 @@ import AbstractService from '../abstractService'
 export default class AbstractMigrationFileService extends AbstractService {
 	serviceUrlKey = ''
 
-	constructor(serviceUrlKey) {
+	constructor(serviceUrlKey: '') {
 		super({
 			create: '/migration/' + serviceUrlKey + '/migrate',
 		})
@@ -20,7 +21,7 @@ export default class AbstractMigrationFileService extends AbstractService {
 		return false
 	}
 
-	migrate(file) {
+	migrate(file: IFile) {
 		console.log(file)
 		return this.uploadFile(
 			this.paths.create,
diff --git a/src/services/namespace.ts b/src/services/namespace.ts
index ce9c48c0..23ce1fd8 100644
--- a/src/services/namespace.ts
+++ b/src/services/namespace.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import NamespaceModel, { type INamespace } from '../models/namespace'
+import NamespaceModel from '../models/namespace'
+import type {INamespace} from '@/modelTypes/INamespace'
 import {formatISO} from 'date-fns'
 import {colorFromHex} from '@/helpers/color/colorFromHex'
 
diff --git a/src/services/notification.ts b/src/services/notification.ts
index 2d6f36aa..51832abb 100644
--- a/src/services/notification.ts
+++ b/src/services/notification.ts
@@ -1,6 +1,7 @@
 import AbstractService from '@/services/abstractService'
 import {formatISO} from 'date-fns'
-import NotificationModel, { type INotification } from '@/models/notification'
+import NotificationModel from '@/models/notification'
+import type {INotification} from '@/modelTypes/INotification'
 
 export default class NotificationService extends AbstractService<INotification> {
 	constructor() {
diff --git a/src/services/passwordReset.ts b/src/services/passwordReset.ts
index c43381c5..688dfb63 100644
--- a/src/services/passwordReset.ts
+++ b/src/services/passwordReset.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import PasswordResetModel, { type IPasswordReset } from '../models/passwordReset'
+import PasswordResetModel from '@/models/passwordReset'
+import type {IPasswordReset} from '@/modelTypes/IPasswordReset'
 
 export default class PasswordResetService extends AbstractService<IPasswordReset> {
 
diff --git a/src/services/passwordUpdateService.ts b/src/services/passwordUpdateService.ts
index 03306af1..fa202afa 100644
--- a/src/services/passwordUpdateService.ts
+++ b/src/services/passwordUpdateService.ts
@@ -1,5 +1,5 @@
-import type { IPasswordUpdate } from '@/models/passwordUpdate'
 import AbstractService from './abstractService'
+import type {IPasswordUpdate} from '@/modelTypes/IPasswordUpdate'
 
 export default class PasswordUpdateService extends AbstractService<IPasswordUpdate> {
 	constructor() {
diff --git a/src/services/savedFilter.ts b/src/services/savedFilter.ts
index 61ae569d..b7107516 100644
--- a/src/services/savedFilter.ts
+++ b/src/services/savedFilter.ts
@@ -1,5 +1,6 @@
 import AbstractService from '@/services/abstractService'
-import SavedFilterModel, { type ISavedFilter } from '@/models/savedFilter'
+import SavedFilterModel from '@/models/savedFilter'
+import type {ISavedFilter} from '@/modelTypes/ISavedFilter'
 import {objectToCamelCase} from '@/helpers/case'
 
 export default class SavedFilterService extends AbstractService<ISavedFilter> {
diff --git a/src/services/subscription.ts b/src/services/subscription.ts
index 2c41d6ec..96e83532 100644
--- a/src/services/subscription.ts
+++ b/src/services/subscription.ts
@@ -1,5 +1,6 @@
 import AbstractService from '@/services/abstractService'
-import SubscriptionModel, { type ISubscription } from '@/models/subscription'
+import SubscriptionModel from '@/models/subscription'
+import type {ISubscription} from '@/modelTypes/ISubscription'
 
 export default class SubscriptionService extends AbstractService<ISubscription> {
 	constructor() {
diff --git a/src/services/task.ts b/src/services/task.ts
index 9c4ba6fc..bb41b685 100644
--- a/src/services/task.ts
+++ b/src/services/task.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TaskModel, { type ITask } from '../models/task'
+import TaskModel from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 import AttachmentService from './attachment'
 import LabelService from './label'
 
diff --git a/src/services/taskAssignee.ts b/src/services/taskAssignee.ts
index e76921da..b36dcc40 100644
--- a/src/services/taskAssignee.ts
+++ b/src/services/taskAssignee.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TaskAssigneeModel, { type ITaskAssignee } from '../models/taskAssignee'
+import TaskAssigneeModel from '@/models/taskAssignee'
+import type {ITaskAssignee} from '@/modelTypes/ITaskAssignee'
 import {formatISO} from 'date-fns'
 
 export default class TaskAssigneeService extends AbstractService<ITaskAssignee> {
diff --git a/src/services/taskComment.ts b/src/services/taskComment.ts
index b4be337d..bb781b87 100644
--- a/src/services/taskComment.ts
+++ b/src/services/taskComment.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TaskCommentModel, { type ITaskComment } from '../models/taskComment'
+import TaskCommentModel from '@/models/taskComment'
+import type {ITaskComment} from '@/modelTypes/ITaskComment'
 import {formatISO} from 'date-fns'
 
 export default class TaskCommentService extends AbstractService<ITaskComment> {
diff --git a/src/services/taskRelation.ts b/src/services/taskRelation.ts
index e5efdd71..5b6f34c1 100644
--- a/src/services/taskRelation.ts
+++ b/src/services/taskRelation.ts
@@ -1,7 +1,8 @@
 import {formatISO} from 'date-fns'
 
 import AbstractService from './abstractService'
-import TaskRelationModel, {type ITaskRelation} from '@/models/taskRelation'
+import TaskRelationModel from '@/models/taskRelation'
+import type {ITaskRelation} from '@/modelTypes/ITaskRelation'
 
 export default class TaskRelationService extends AbstractService<ITaskRelation> {
 	constructor() {
diff --git a/src/services/team.ts b/src/services/team.ts
index d4602e13..20b4842e 100644
--- a/src/services/team.ts
+++ b/src/services/team.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TeamModel, { type ITeam } from '../models/team'
+import TeamModel from '@/models/team'
+import type { ITeam } from '@/modelTypes/ITeam'
 import {formatISO} from 'date-fns'
 
 export default class TeamService extends AbstractService<ITeam> {
diff --git a/src/services/teamList.ts b/src/services/teamList.ts
index 841b717a..6bc91c6f 100644
--- a/src/services/teamList.ts
+++ b/src/services/teamList.ts
@@ -1,6 +1,7 @@
 import AbstractService from './abstractService'
-import TeamListModel, { type ITeamList } from '../models/teamList'
-import TeamModel from '../models/team'
+import TeamListModel from '@/models/teamList'
+import type {ITeamList} from '@/modelTypes/ITeamList'
+import TeamModel from '@/models/team'
 import {formatISO} from 'date-fns'
 
 export default class TeamListService extends AbstractService<ITeamList> {
diff --git a/src/services/teamMember.ts b/src/services/teamMember.ts
index 617180aa..c3151da7 100644
--- a/src/services/teamMember.ts
+++ b/src/services/teamMember.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TeamMemberModel, { type ITeamMember } from '../models/teamMember'
+import TeamMemberModel from '@/models/teamMember'
+import type {ITeamMember} from '@/modelTypes/ITeamMember'
 import {formatISO} from 'date-fns'
 
 export default class TeamMemberService extends AbstractService<ITeamMember> {
diff --git a/src/services/teamNamespace.ts b/src/services/teamNamespace.ts
index bbde8516..95d21f82 100644
--- a/src/services/teamNamespace.ts
+++ b/src/services/teamNamespace.ts
@@ -1,6 +1,7 @@
 import AbstractService from './abstractService'
-import TeamNamespaceModel, { type ITeamNamespace } from '../models/teamNamespace'
-import TeamModel from '../models/team'
+import TeamNamespaceModel from '@/models/teamNamespace'
+import type {ITeamNamespace} from '@/modelTypes/ITeamNamespace'
+import TeamModel from '@/models/team'
 import {formatISO} from 'date-fns'
 
 export default class TeamNamespaceService extends AbstractService<ITeamNamespace> {
diff --git a/src/services/totp.ts b/src/services/totp.ts
index cd4a1a37..531b9f8a 100644
--- a/src/services/totp.ts
+++ b/src/services/totp.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TotpModel, { type ITotp } from '@/models/totp'
+import TotpModel from '@/models/totp'
+import type {ITotp} from '@/modelTypes/ITotp'
 
 export default class TotpService extends AbstractService<ITotp> {
 	urlPrefix = '/user/settings/totp'
diff --git a/src/services/user.ts b/src/services/user.ts
index 1db5ae9c..7c3067d8 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import UserModel, { type IUser } from '../models/user'
+import UserModel from '@/models/user'
+import type {IUser} from '@/modelTypes/IUser'
 import {formatISO} from 'date-fns'
 
 export default class UserService extends AbstractService<IUser> {
diff --git a/src/services/userList.ts b/src/services/userList.ts
index 40b823b2..dc154b9d 100644
--- a/src/services/userList.ts
+++ b/src/services/userList.ts
@@ -1,8 +1,10 @@
-import AbstractService from './abstractService'
-import UserListModel, { type IUserList } from '../models/userList'
-import UserModel from '../models/user'
 import {formatISO} from 'date-fns'
 
+import AbstractService from './abstractService'
+import UserListModel from '@/models/userList'
+import type {IUserList} from '@/modelTypes/IUserList'
+import UserModel from '@/models/user'
+
 export default class UserListService extends AbstractService<IUserList> {
 	constructor() {
 		super({
diff --git a/src/services/userNamespace.ts b/src/services/userNamespace.ts
index b3ede973..1b40bba9 100644
--- a/src/services/userNamespace.ts
+++ b/src/services/userNamespace.ts
@@ -1,8 +1,10 @@
-import AbstractService from './abstractService'
-import UserNamespaceModel, { type IUserNamespace } from '../models/userNamespace'
-import UserModel from '../models/user'
 import {formatISO} from 'date-fns'
 
+import AbstractService from './abstractService'
+import UserNamespaceModel from '@/models/userNamespace'
+import type {IUserNamespace} from '@/modelTypes/IUserNamespace'
+import UserModel from '@/models/user'
+
 export default class UserNamespaceService extends AbstractService<IUserNamespace> {
 	constructor() {
 		super({
diff --git a/src/services/userSettings.ts b/src/services/userSettings.ts
index 03497f6b..6628f43b 100644
--- a/src/services/userSettings.ts
+++ b/src/services/userSettings.ts
@@ -1,5 +1,4 @@
-
-import type { IUserSettings } from '@/models/userSettings'
+import type {IUserSettings} from '@/modelTypes/IUserSettings'
 import AbstractService from './abstractService'
 
 export default class UserSettingsService extends AbstractService<IUserSettings> {
diff --git a/src/views/filters/FilterEdit.vue b/src/views/filters/FilterEdit.vue
index 7a64a92d..eaea7c2d 100644
--- a/src/views/filters/FilterEdit.vue
+++ b/src/views/filters/FilterEdit.vue
@@ -68,7 +68,7 @@ import SavedFilterService from '@/services/savedFilter'
 
 import {objectToSnakeCase} from '@/helpers/case'
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
-import type { IList } from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 
 const {t} = useI18n({useScope: 'global'})
 
diff --git a/src/views/labels/ListLabels.vue b/src/views/labels/ListLabels.vue
index b2970ada..37a4648d 100644
--- a/src/views/labels/ListLabels.vue
+++ b/src/views/labels/ListLabels.vue
@@ -113,7 +113,8 @@
 import {defineComponent} from 'vue'
 import {mapState} from 'vuex'
 
-import LabelModel, { type ILabel } from '../../models/label'
+import LabelModel from '@/models/label'
+import type {ILabel} from '@/modelTypes/ILabel'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 
 import BaseButton from '@/components/base/BaseButton.vue'
diff --git a/src/views/list/ListList.vue b/src/views/list/ListList.vue
index b5ef4aa5..30662480 100644
--- a/src/views/list/ListList.vue
+++ b/src/views/list/ListList.vue
@@ -153,7 +153,7 @@ import {ALPHABETICAL_SORT} from '@/components/list/partials/filters.vue'
 
 import draggable from 'zhyswan-vuedraggable'
 import {calculateItemPosition} from '../../helpers/calculateItemPosition'
-import type { ITask } from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 function sortTasks(tasks: ITask[]) {
 	if (tasks === null || Array.isArray(tasks) && tasks.length === 0) {
diff --git a/src/views/list/ListTable.vue b/src/views/list/ListTable.vue
index 7d83da8b..ff388dc2 100644
--- a/src/views/list/ListTable.vue
+++ b/src/views/list/ListTable.vue
@@ -197,7 +197,7 @@ import Pagination from '@/components/misc/pagination.vue'
 import Popup from '@/components/misc/popup.vue'
 
 import {useTaskList} from '@/composables/taskList'
-import type { ITask } from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 const ACTIVE_COLUMNS_DEFAULT = {
 	id: true,
diff --git a/src/views/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue
index 38784cd0..a90b69a5 100644
--- a/src/views/tasks/ShowTasks.vue
+++ b/src/views/tasks/ShowTasks.vue
@@ -4,7 +4,7 @@
 			{{ pageTitle }}
 		</h3>
 		<p v-if="!showAll" class="show-tasks-options">
-			<datepicker-with-range @dateChanged="setDate">
+			<datepicker-with-range @update:model-value="setDate">
 				<template #trigger="{toggle}">
 					<x-button @click.prevent.stop="toggle()" variant="primary" :shadow="false" class="mb-2">
 						{{ $t('task.show.select') }}
@@ -58,7 +58,7 @@ import DatepickerWithRange from '@/components/date/datepickerWithRange.vue'
 import {DATE_RANGES} from '@/components/date/dateRanges'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 import LlamaCool from '@/assets/llama-cool.svg?component'
-import type { ITask } from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 const store = useStore()
 const route = useRoute()
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 903ca84d..a584aeb6 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -39,7 +39,7 @@
 								</div>
 								<priority-select
 									:disabled="!canWrite"
-									@change="saveTask"
+									@update:model-value="saveTask"
 									ref="priority"
 									v-model="task.priority"/>
 							</div>
@@ -79,7 +79,7 @@
 								</div>
 								<percent-done-select
 									:disabled="!canWrite"
-									@change="saveTask"
+									@update:model-value="saveTask"
 									ref="percentDone"
 									v-model="task.percentDone"/>
 							</div>
@@ -146,9 +146,10 @@
 								</div>
 								<reminders
 									:disabled="!canWrite"
-									@change="saveTask"
 									ref="reminders"
-									v-model="task.reminderDates"/>
+									v-model="task.reminderDates"
+									@update:model-value="saveTask"
+								/>
 							</div>
 						</transition>
 						<transition name="flash-background" appear>
@@ -170,9 +171,10 @@
 								</div>
 								<repeat-after
 									:disabled="!canWrite"
-									@change="saveTask"
 									ref="repeatAfter"
-									v-model="task"/>
+									v-model="task"
+									@update:model-value="saveTask"
+								/>
 							</div>
 						</transition>
 						<transition name="flash-background" appear>
@@ -183,10 +185,11 @@
 									{{ $t('task.attributes.color') }}
 								</div>
 								<color-picker
-									@change="saveTask"
 									menu-position="bottom"
 									ref="color"
-									v-model="taskColor"/>
+									v-model="taskColor"
+									@update:model-value="saveTask"
+								/>
 							</div>
 						</transition>
 					</div>
@@ -276,8 +279,8 @@
 						<task-subscription
 							entity="task"
 							:entity-id="task.id"
-							:subscription="task.subscription"
-							@change="sub => task.subscription = sub"
+							:model-value="task.subscription"
+							@update:model-value="sub => task.subscription = sub"
 						/>
 						<x-button
 							@click="setFieldActive('assignees')"
@@ -426,7 +429,8 @@ import {defineComponent} from 'vue'
 import cloneDeep from 'lodash.clonedeep'
 
 import TaskService from '../../services/task'
-import TaskModel, { type ITask } from '@/models/task'
+import TaskModel from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 import { PRIORITIES as priorites } from '@/constants/priorities'
 import {RIGHTS as rights} from '@/constants/rights'
@@ -456,7 +460,7 @@ import CreatedUpdated from '@/components/tasks/partials/createdUpdated.vue'
 import { setTitle } from '@/helpers/setTitle'
 import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
 import {getListTitle} from '@/helpers/getListTitle'
-import type { IList } from '@/models/list'
+import type { IList } from '@/modelTypes/IList'
 
 function scrollIntoView(el) {
 	if (!el) {
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index 08a6c402..1d951e8e 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -177,9 +177,9 @@ import Multiselect from '@/components/input/multiselect.vue'
 import {useRoute, useRouter} from 'vue-router'
 import {useTitle} from '@/composables/useTitle'
 import {success} from '@/message'
-import type { ITeam } from '@/models/team'
-import type { IUser } from '@/models/user'
-import type { ITeamMember } from '@/models/teamMember'
+import type {ITeam} from '@/modelTypes/ITeam'
+import type {IUser} from '@/modelTypes/IUser'
+import type {ITeamMember} from '@/modelTypes/ITeamMember'
 
 const store = useStore()
 const route = useRoute()
diff --git a/src/views/user/settings/Caldav.vue b/src/views/user/settings/Caldav.vue
index 151d9708..88cba511 100644
--- a/src/views/user/settings/Caldav.vue
+++ b/src/views/user/settings/Caldav.vue
@@ -78,7 +78,7 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import Message from '@/components/misc/message.vue'
 import CaldavTokenService from '@/services/caldavToken'
 import { formatDateShort } from '@/helpers/time/formatDate'
-import type { ICaldavToken } from '@/models/caldavToken'
+import type {ICaldavToken} from '@/modelTypes/ICaldavToken'
 
 const copy = useCopyToClipboard()
 
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 2d5644c2..68a1c762 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -16,5 +16,8 @@
     "paths": {
       "@/*": ["./src/*"]
     }
+  },
+  "vueCompilerOptions": {
+    "strictTemplates": true
   }
 }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index a70c2b43..41f0e16b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1147,10 +1147,10 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.7.tgz#1ec4af4a16c554cbd402cc557ccdd874e3f7be53"
   integrity sha512-IKznSJOsVUuyt7cDzzSZyqBEcZe+7WlBqTVXiF1OXP/4Nm387ToaXZ0fyLwI1iBlI/bzpxVq411QE2/Bt2XWWw==
 
-"@eslint/eslintrc@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d"
-  integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==
+"@eslint/eslintrc@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.2.tgz#58b69582f3b7271d8fa67fe5251767a5b38ea356"
+  integrity sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -1349,20 +1349,20 @@
   resolved "https://registry.yarnpkg.com/@netlify/binary-info/-/binary-info-1.0.0.tgz#cd0d86fb783fb03e52067f0cd284865e57be86c8"
   integrity sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw==
 
-"@netlify/build@^27.16.1":
-  version "27.16.1"
-  resolved "https://registry.yarnpkg.com/@netlify/build/-/build-27.16.1.tgz#32c9580717f5318053ed7fee18d471106238f61d"
-  integrity sha512-hXOivv/zCd/xPSL7XaqHvnn6GpXUSkztis9QfawLa39W6X01gDj2bXfQBW+cPxTT6S/UaGz70rwthPW9431pOQ==
+"@netlify/build@^27.17.2":
+  version "27.17.2"
+  resolved "https://registry.yarnpkg.com/@netlify/build/-/build-27.17.2.tgz#6f642f184697de8dd0d46a64a8bc99560ea399f4"
+  integrity sha512-JoLGa+JkHvsHel91F+zRhOrClkGFYzWprVPKIcRAGqJYl3c0g+t4c8xDpbFfrYSuaU+0bjB7QRh/VCmpPLIkBQ==
   dependencies:
     "@bugsnag/js" "^7.0.0"
     "@netlify/cache-utils" "^4.0.0"
     "@netlify/config" "^18.2.3"
     "@netlify/edge-bundler" "^1.14.1"
-    "@netlify/functions-utils" "^4.2.5"
+    "@netlify/functions-utils" "^4.2.8"
     "@netlify/git-utils" "^4.0.0"
-    "@netlify/plugins-list" "^6.41.0"
+    "@netlify/plugins-list" "^6.42.0"
     "@netlify/run-utils" "^4.0.0"
-    "@netlify/zip-it-and-ship-it" "^6.0.0"
+    "@netlify/zip-it-and-ship-it" "^7.1.1"
     "@sindresorhus/slugify" "^2.0.0"
     "@types/node" "^16.0.0"
     ajv "^8.11.0"
@@ -1615,12 +1615,12 @@
     read-pkg-up "^9.0.0"
     semver "^7.3.4"
 
-"@netlify/functions-utils@^4.2.5":
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/@netlify/functions-utils/-/functions-utils-4.2.5.tgz#5e9b8603fdfa2523720e26703e659029372f9c1f"
-  integrity sha512-sa8TAD35xO/6q3YSpqlObOSfC25n0JT6DV+j3WaZ5NCSXAdlZJD+pT02pudputwstfMPJtw7GJg3buIiTyGulQ==
+"@netlify/functions-utils@^4.2.8":
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/@netlify/functions-utils/-/functions-utils-4.2.8.tgz#7df5d8a0a224ca2b6ddd94284f61f1ad4d952825"
+  integrity sha512-2wU/UOR2pViPkolITf3bvFTb+f+kR+NfZb7dWOU9IZnxKsB4qTioXupT6Rt1aI5p0kDRMCWuI5pBBxjlueO0Ew==
   dependencies:
-    "@netlify/zip-it-and-ship-it" "^6.0.0"
+    "@netlify/zip-it-and-ship-it" "^7.1.1"
     cpy "^8.1.0"
     path-exists "^5.0.0"
 
@@ -1718,10 +1718,10 @@
   resolved "https://registry.yarnpkg.com/@netlify/open-api/-/open-api-2.12.0.tgz#62e467c0c6be7bcae9349dc681e71eb393c21b2a"
   integrity sha512-1n9VvO/9qM7cRB5f7NgSNqeUrovM7j9WVAY7ZQ4LtQuXSquFmO9Fku7WrV3zAUC6v2Y62fxGyJ0fRllYz5uXLw==
 
-"@netlify/plugins-list@^6.41.0":
-  version "6.41.0"
-  resolved "https://registry.yarnpkg.com/@netlify/plugins-list/-/plugins-list-6.41.0.tgz#f80f3c8ad93f0cbab916795bd2662f6ff309ab76"
-  integrity sha512-WUXn1kk1oDumzYKQVAf3Z5xQkVuHyR6k+LGt2qq6rFlxILmFA3gWMSf+AwVfT2bYK8gHWcdz2I9MSo5hbp1ohQ==
+"@netlify/plugins-list@^6.42.0":
+  version "6.44.0"
+  resolved "https://registry.yarnpkg.com/@netlify/plugins-list/-/plugins-list-6.44.0.tgz#e4d5da305530fc9aad01fd3ee5e356b99623b424"
+  integrity sha512-yl4A0WzHg7PhQoefJKnjD3f31EMErIdbAQNis97x3tNoPcKeTW6dV79qttKn3PQbb3WyiFxfKlsi3xMQO6l8Nw==
 
 "@netlify/run-utils@^4.0.0":
   version "4.0.0"
@@ -1730,15 +1730,15 @@
   dependencies:
     execa "^5.1.1"
 
-"@netlify/zip-it-and-ship-it@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-6.0.0.tgz#63a0fc0e9eeb023b4edae94f3e86d3458e2e2ef8"
-  integrity sha512-5nxAeUwQ6ftlnlRShRa7oY+RPiYBRH2qMmTR6RwsBYzUBUzoTgdb+X8tOnO4FFAKndXzzjJrO/ubp+YMeOKSbg==
+"@netlify/zip-it-and-ship-it@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-7.1.1.tgz#88500313b909df8f55653ca448b9c75c63a94377"
+  integrity sha512-drvt9Snr+dpCsdn26MkR5YApPH+GJGGQURfF57PQy9AdL0CvEXKpx8WjS0NgF0lrj4E0ZKZLPaveZwMgvYxknw==
   dependencies:
     "@babel/parser" "7.16.8"
     "@netlify/binary-info" "^1.0.0"
     "@netlify/esbuild" "0.14.25"
-    "@vercel/nft" "^0.21.0"
+    "@vercel/nft" "^0.22.0"
     archiver "^5.3.0"
     common-path-prefix "^3.0.0"
     cp-file "^9.0.0"
@@ -2422,14 +2422,14 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz#6df092a20e0f9ec748b27f293a12cb39d0c1fe4d"
-  integrity sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==
+"@typescript-eslint/eslint-plugin@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.37.0.tgz#5ccdd5d9004120f28fc6e717fb4b5c9bddcfbc04"
+  integrity sha512-Fde6W0IafXktz1UlnhGkrrmnnGpAo1kyX7dnyHHVrmwJOn72Oqm3eYtddrpOwwel2W8PAK9F3pIL5S+lfoM0og==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.36.2"
-    "@typescript-eslint/type-utils" "5.36.2"
-    "@typescript-eslint/utils" "5.36.2"
+    "@typescript-eslint/scope-manager" "5.37.0"
+    "@typescript-eslint/type-utils" "5.37.0"
+    "@typescript-eslint/utils" "5.37.0"
     debug "^4.3.4"
     functional-red-black-tree "^1.0.1"
     ignore "^5.2.0"
@@ -2463,14 +2463,14 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.36.2.tgz#3ddf323d3ac85a25295a55fcb9c7a49ab4680ddd"
-  integrity sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==
+"@typescript-eslint/parser@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.37.0.tgz#c382077973f3a4ede7453fb14cadcad3970cbf3b"
+  integrity sha512-01VzI/ipYKuaG5PkE5+qyJ6m02fVALmMPY3Qq5BHflDx3y4VobbLdHQkSMg9VPRS4KdNt4oYTMaomFoHonBGAw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.36.2"
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/typescript-estree" "5.36.2"
+    "@typescript-eslint/scope-manager" "5.37.0"
+    "@typescript-eslint/types" "5.37.0"
+    "@typescript-eslint/typescript-estree" "5.37.0"
     debug "^4.3.4"
 
 "@typescript-eslint/parser@^5.0.0":
@@ -2483,13 +2483,13 @@
     "@typescript-eslint/typescript-estree" "5.8.0"
     debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz#a75eb588a3879ae659514780831370642505d1cd"
-  integrity sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==
+"@typescript-eslint/scope-manager@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.37.0.tgz#044980e4f1516a774a418dafe701a483a6c9f9ca"
+  integrity sha512-F67MqrmSXGd/eZnujjtkPgBQzgespu/iCZ+54Ok9X5tALb9L2v3G+QBSoWkXG0p3lcTJsL+iXz5eLUEdSiJU9Q==
   dependencies:
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/visitor-keys" "5.36.2"
+    "@typescript-eslint/types" "5.37.0"
+    "@typescript-eslint/visitor-keys" "5.37.0"
 
 "@typescript-eslint/scope-manager@5.8.0":
   version "5.8.0"
@@ -2499,13 +2499,13 @@
     "@typescript-eslint/types" "5.8.0"
     "@typescript-eslint/visitor-keys" "5.8.0"
 
-"@typescript-eslint/type-utils@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.36.2.tgz#752373f4babf05e993adf2cd543a763632826391"
-  integrity sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==
+"@typescript-eslint/type-utils@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.37.0.tgz#43ed2f567ada49d7e33a6e4b6f9babd060445fe5"
+  integrity sha512-BSx/O0Z0SXOF5tY0bNTBcDEKz2Ec20GVYvq/H/XNKiUorUFilH7NPbFUuiiyzWaSdN3PA8JV0OvYx0gH/5aFAQ==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.36.2"
-    "@typescript-eslint/utils" "5.36.2"
+    "@typescript-eslint/typescript-estree" "5.37.0"
+    "@typescript-eslint/utils" "5.37.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
@@ -2514,23 +2514,23 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.30.6.tgz#86369d0a7af8c67024115ac1da3e8fb2d38907e1"
   integrity sha512-HdnP8HioL1F7CwVmT4RaaMX57RrfqsOMclZc08wGMiDYJBsLGBM7JwXM4cZJmbWLzIR/pXg1kkrBBVpxTOwfUg==
 
-"@typescript-eslint/types@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.2.tgz#a5066e500ebcfcee36694186ccc57b955c05faf9"
-  integrity sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==
+"@typescript-eslint/types@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.37.0.tgz#09e4870a5f3af7af3f84e08d792644a87d232261"
+  integrity sha512-3frIJiTa5+tCb2iqR/bf7XwU20lnU05r/sgPJnRpwvfZaqCJBrl8Q/mw9vr3NrNdB/XtVyMA0eppRMMBqdJ1bA==
 
 "@typescript-eslint/types@5.8.0":
   version "5.8.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.8.0.tgz#e7fa74ec35d9dbe3560d039d3d8734986c3971e0"
   integrity sha512-LdCYOqeqZWqCMOmwFnum6YfW9F3nKuxJiR84CdIRN5nfHJ7gyvGpXWqL/AaW0k3Po0+wm93ARAsOdzlZDPCcXg==
 
-"@typescript-eslint/typescript-estree@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz#0c93418b36c53ba0bc34c61fe9405c4d1d8fe560"
-  integrity sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==
+"@typescript-eslint/typescript-estree@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.37.0.tgz#956dcf5c98363bcb97bdd5463a0a86072ff79355"
+  integrity sha512-JkFoFIt/cx59iqEDSgIGnQpCTRv96MQnXCYvJi7QhBC24uyuzbD8wVbajMB1b9x4I0octYFJ3OwjAwNqk1AjDA==
   dependencies:
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/visitor-keys" "5.36.2"
+    "@typescript-eslint/types" "5.37.0"
+    "@typescript-eslint/visitor-keys" "5.37.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -2563,15 +2563,15 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.36.2.tgz#b01a76f0ab244404c7aefc340c5015d5ce6da74c"
-  integrity sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==
+"@typescript-eslint/utils@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.37.0.tgz#7784cb8e91390c4f90ccaffd24a0cf9874df81b2"
+  integrity sha512-jUEJoQrWbZhmikbcWSMDuUSxEE7ID2W/QCV/uz10WtQqfOuKZUqFGjqLJ+qhDd17rjgp+QJPqTdPIBWwoob2NQ==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.36.2"
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/typescript-estree" "5.36.2"
+    "@typescript-eslint/scope-manager" "5.37.0"
+    "@typescript-eslint/types" "5.37.0"
+    "@typescript-eslint/typescript-estree" "5.37.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
@@ -2583,12 +2583,12 @@
     "@typescript-eslint/types" "5.30.6"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz#2f8f78da0a3bad3320d2ac24965791ac39dace5a"
-  integrity sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==
+"@typescript-eslint/visitor-keys@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.37.0.tgz#7b72dd343295ea11e89b624995abc7103c554eee"
+  integrity sha512-Hp7rT4cENBPIzMwrlehLW/28EVCOcE9U1Z1BQTc8EA8v5qpr7GRGuG+U58V5tTY48zvUOA3KHvw3rA8tY9fbdA==
   dependencies:
-    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/types" "5.37.0"
     eslint-visitor-keys "^3.3.0"
 
 "@typescript-eslint/visitor-keys@5.8.0":
@@ -2599,10 +2599,10 @@
     "@typescript-eslint/types" "5.8.0"
     eslint-visitor-keys "^3.0.0"
 
-"@vercel/nft@^0.21.0":
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.21.0.tgz#e0715b1997cd7021a7c7c48b584ef2295fd4b810"
-  integrity sha512-hFCAETfI5cG8l5iAiLhMC2bReC5K7SIybzrxGorv+eGspIbIFsVw7Vg85GovXm/LxA08pIDrAlrhR6GN36XB/Q==
+"@vercel/nft@^0.22.0":
+  version "0.22.1"
+  resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.22.1.tgz#0d91d2a21e3a7f0b23ce1550da9870eac4942828"
+  integrity sha512-lYYZIoxRurqDOSoVIdBicGnpUIpfyaS5qVjdPq+EfI285WqtZK3NK/dyCkiyBul+X2U2OEhRyeMdXPCHGJbohw==
   dependencies:
     "@mapbox/node-pre-gyp" "^1.0.5"
     acorn "^8.6.0"
@@ -3398,7 +3398,19 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@10.4.8, autoprefixer@^10.4.8:
+autoprefixer@10.4.10:
+  version "10.4.10"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.10.tgz#a1d8891d1516155eb13a772b1289efdc61de14ef"
+  integrity sha512-nMaiDARyp1e74c8IeAXkr+BmFKa8By4Zak7tyaNPF09Iu39WFpNXOWrVirmXjKr+5cOyERwvtbMOLYz6iBJYgQ==
+  dependencies:
+    browserslist "^4.21.3"
+    caniuse-lite "^1.0.30001399"
+    fraction.js "^4.2.0"
+    normalize-range "^0.1.2"
+    picocolors "^1.0.0"
+    postcss-value-parser "^4.2.0"
+
+autoprefixer@^10.4.8:
   version "10.4.8"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.8.tgz#92c7a0199e1cfb2ad5d9427bd585a3d75895b9e5"
   integrity sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==
@@ -3559,10 +3571,10 @@ blueimp-md5@^2.10.0:
   resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0"
   integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==
 
-blurhash@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.5.tgz#3034104cd5dce5a3e5caa871ae2f0f1f2d0ab566"
-  integrity sha512-a+LO3A2DfxTaTztsmkbLYmUzUeApi0LZuKalwbNmqAHR6HhJGMt1qSV/R3wc+w4DL28holjqO3Bg74aUGavGjg==
+blurhash@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.0.tgz#c2e6392043d5355241cf9ddaec9359023ea57a40"
+  integrity sha512-fdEZnyJZ5E5s9neCfZUMSMkKfMtdKz1fG53t/iYvMjUFUsDnyZ1YnRRayKBK/B8cilNwe5gaIrPF8QlLrukEZQ==
 
 body-parser@1.19.0:
   version "1.19.0"
@@ -3880,10 +3892,10 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@1.0.30001390:
-  version "1.0.30001390"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz#158a43011e7068ef7fc73590e9fd91a7cece5e7f"
-  integrity sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g==
+caniuse-lite@1.0.30001397:
+  version "1.0.30001397"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001397.tgz#010d9d56e3b8abcd8df261d0a94b22426271a15f"
+  integrity sha512-SW9N2TbCdLf0eiNDRrrQXx2sOkaakNZbCjgNpPyMJJbiOrU5QzMIrXOVMRM1myBXTD5iTkdrtU/EguCrBocHlA==
 
 caniuse-lite@^1.0.30001219:
   version "1.0.30001286"
@@ -3895,6 +3907,11 @@ caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001373:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001373.tgz#2dc3bc3bfcb5d5a929bec11300883040d7b4b4be"
   integrity sha512-pJYArGHrPp3TUqQzFYRmP/lwJlj8RCbVe3Gd3eJQkAV8SAC6b19XS9BjMvRdvaS8RMkaTN8ZhoHP6S1y8zzwEQ==
 
+caniuse-lite@^1.0.30001399:
+  version "1.0.30001399"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001399.tgz#1bf994ca375d7f33f8d01ce03b7d5139e8587873"
+  integrity sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==
+
 caseless@^0.12.0, caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -4684,10 +4701,10 @@ data-uri-to-buffer@^4.0.0:
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b"
   integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==
 
-date-fns@2.29.2:
-  version "2.29.2"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.2.tgz#0d4b3d0f3dff0f920820a070920f0d9662c51931"
-  integrity sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA==
+date-fns@2.29.3:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
+  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
 
 date-fns@^1.27.2:
   version "1.30.1"
@@ -5714,12 +5731,12 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@8.23.0:
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040"
-  integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==
+eslint@8.23.1:
+  version "8.23.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.1.tgz#cfd7b3f7fdd07db8d16b4ac0516a29c8d8dca5dc"
+  integrity sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==
   dependencies:
-    "@eslint/eslintrc" "^1.3.1"
+    "@eslint/eslintrc" "^1.3.2"
     "@humanwhocodes/config-array" "^0.10.4"
     "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
     "@humanwhocodes/module-importer" "^1.0.1"
@@ -5738,7 +5755,6 @@ eslint@8.23.0:
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     find-up "^5.0.0"
-    functional-red-black-tree "^1.0.1"
     glob-parent "^6.0.1"
     globals "^13.15.0"
     globby "^11.1.0"
@@ -5747,6 +5763,7 @@ eslint@8.23.0:
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
@@ -7950,6 +7967,11 @@ joi@^17.6.0:
     "@sideway/formula" "^3.0.0"
     "@sideway/pinpoint" "^2.0.0"
 
+js-sdsl@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.4.tgz#78793c90f80e8430b7d8dc94515b6c77d98a26a6"
+  integrity sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==
+
 js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -8966,18 +8988,18 @@ nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0:
   resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61"
   integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==
 
-netlify-cli@11.5.1:
-  version "11.5.1"
-  resolved "https://registry.yarnpkg.com/netlify-cli/-/netlify-cli-11.5.1.tgz#1c2f4b5332d3ae5dcaaf9543977995165300e262"
-  integrity sha512-UVWUNa4F/WcqD2wpj41uxCf5LeWAcSRluQJao8XDQKH16nCp+wVgth4hQBePEPfj7+KAiFf1H3sjHbQ9drv11Q==
+netlify-cli@11.7.1:
+  version "11.7.1"
+  resolved "https://registry.yarnpkg.com/netlify-cli/-/netlify-cli-11.7.1.tgz#0f29c2b684f45e37dd344ce77da3315aecc4c91e"
+  integrity sha512-rotVCdA0we7+x8YhBPpZKTYqYGuaRFc36v+C0odNBi9zZH/Bp7ickWmX3v47TdMLZGL/hZimX+XCG5bMtJzYSw==
   dependencies:
-    "@netlify/build" "^27.16.1"
+    "@netlify/build" "^27.17.2"
     "@netlify/config" "^18.2.3"
     "@netlify/edge-bundler" "^1.14.1"
     "@netlify/framework-info" "^9.2.0"
     "@netlify/local-functions-proxy" "^1.1.1"
-    "@netlify/plugins-list" "^6.41.0"
-    "@netlify/zip-it-and-ship-it" "^6.0.0"
+    "@netlify/plugins-list" "^6.42.0"
+    "@netlify/zip-it-and-ship-it" "^7.1.1"
     "@octokit/rest" "^18.0.0"
     "@sindresorhus/slugify" "^1.1.0"
     ansi-escapes "^5.0.0"
@@ -11941,15 +11963,15 @@ timed-out@^4.0.1:
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
   integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
 
-tinybench@^2.1.3:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.1.4.tgz#07121795c6a15fcbdcf02ab0d2ce329b1b6145a3"
-  integrity sha512-NFWIw2Gg7EUPdeE8nL1Dc7AMVlk7sOr2PmSNKVuQrZ0YwTOFoshPQ+hcLrgnhK8dTP3FWMCJaf4N+/hXp6lKPw==
+tinybench@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.1.5.tgz#6864341415ff0f912ed160cfd90b7f833ece674c"
+  integrity sha512-ak+PZZEuH3mw6CCFOgf5S90YH0MARnZNhxjhjguAmoJimEMAJuNip/rJRd6/wyylHItomVpKTzZk9zrhTrQCoQ==
 
-tinypool@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.2.4.tgz#4d2598c4689d1a2ce267ddf3360a9c6b3925a20c"
-  integrity sha512-Vs3rhkUH6Qq1t5bqtb816oT+HeJTXfwt2cbPH17sWHIYKTotQIFPk3tf2fgqRrVyMDVOc1EnPgzIxfIulXVzwQ==
+tinypool@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.3.0.tgz#c405d8b743509fc28ea4ca358433190be654f819"
+  integrity sha512-NX5KeqHOBZU6Bc0xj9Vr5Szbb1j8tUHIeD18s41aDJaPeC5QTdEhK0SpdpUrZlj2nv5cctNcSjaKNanXlfcVEQ==
 
 tinyspy@^1.0.2:
   version "1.0.2"
@@ -12223,10 +12245,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.8.2:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
-  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
+typescript@4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
+  integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
 
 typescript@^4.5.4:
   version "4.5.5"
@@ -12535,10 +12557,10 @@ vite@3.1.0:
   optionalDependencies:
     fsevents "~2.3.2"
 
-vitest@0.23.1:
-  version "0.23.1"
-  resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.23.1.tgz#da3f79a88a6570e4d8c1fe8cf5e2d997be2dc3bd"
-  integrity sha512-kn9pG+h6VA3yj/xRvwgLKEd33rOlzMqJEg3tl5HSm3WUPlkY1Lr1FK8RN1uIqVKvFxmz6HGU3EQW+xW2kazRkQ==
+vitest@0.23.2:
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.23.2.tgz#f978de0f2ada1b7c5ff8dc479ce75b976957ff19"
+  integrity sha512-kTBKp3ROPDkYC+x2zWt4znkDtnT08W1FQ6ngRFuqxpBGNuNVS+eWZKfffr8y2JGvEzZ9EzMAOcNaiqMj/FZqMw==
   dependencies:
     "@types/chai" "^4.3.3"
     "@types/chai-subset" "^1.3.3"
@@ -12547,8 +12569,8 @@ vitest@0.23.1:
     debug "^4.3.4"
     local-pkg "^0.4.2"
     strip-literal "^0.4.0"
-    tinybench "^2.1.3"
-    tinypool "^0.2.4"
+    tinybench "^2.1.5"
+    tinypool "^0.3.0"
     tinyspy "^1.0.2"
     vite "^2.9.12 || ^3.0.0-0"