diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 33cbf62f8..dc09c5d72 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/list/list-settings-dropdown.vue b/src/components/list/list-settings-dropdown.vue
index 611bf8708..8e6cbe3a9 100644
--- a/src/components/list/list-settings-dropdown.vue
+++ b/src/components/list/list-settings-dropdown.vue
@@ -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/list-card.vue b/src/components/list/partials/list-card.vue
index 0597639d2..f2a8b4eb4 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 070476888..6987e6858 100644
--- a/src/components/misc/subscription.vue
+++ b/src/components/misc/subscription.vue
@@ -39,7 +39,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'
 
diff --git a/src/components/namespace/namespace-settings-dropdown.vue b/src/components/namespace/namespace-settings-dropdown.vue
index d80d563d6..a94d1eeb3 100644
--- a/src/components/namespace/namespace-settings-dropdown.vue
+++ b/src/components/namespace/namespace-settings-dropdown.vue
@@ -59,7 +59,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 +69,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 c36b3ddcf..51f3b34f6 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -181,13 +181,15 @@ import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import {RIGHTS} from '@/constants/rights'
-import LinkShareModel, { type ILinkShare } from '@/models/linkShare'
+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 '@/models/list'
 
 const props = defineProps({
 	listId: {
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index 84a212cc2..d961d382c 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 a067f4036..5c5115f09 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -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 70d6e5b1e..d8676d319 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 6e17d140a..69f1dd2e9 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 653c60b90..e0f8b9795 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -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 3d839e5fe..d615fdfb6 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 d57b783a1..4cd2b10aa 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 7eca69316..84e1816d9 100644
--- a/src/components/tasks/partials/description.vue
+++ b/src/components/tasks/partials/description.vue
@@ -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/heading.vue b/src/components/tasks/partials/heading.vue
index c02ceb63a..9b57c2ad6 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 73abace13..4ab004d1b 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 2b640a35d..8727695a9 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 2b48f716f..8386695f8 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/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index 5c466e428..2794de163 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/helpers/attachments.ts b/src/helpers/attachments.ts
index 51556c68c..1c9e9e733 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 3d262e9bc..e0e9c22d7 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 54f5a7c06..0e31647a4 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 be2f688b0..e54be9ed9 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 781e94fa7..f784a9190 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 d059a07c6..3ad23f087 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/models/attachment.ts b/src/models/attachment.ts
index 694609725..29862b49c 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 06f484fce..c9b2253c4 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 8c1a21341..181a4297e 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 3394583c4..2e0552491 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 bc904c477..dc5016f89 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 aece407f1..2f50da401 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 cb17d5151..4c32f17ed 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 1e14cf820..d151260b3 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 b1e068224..5b6c3c3c5 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 24aa8779c..241f58adb 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 02387f18e..b041694e1 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 8ed2ae74d..9a5607eae 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 dade605e8..d92c484ce 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 a1fc44ad5..911c49e7e 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 5140063f8..0c2d3cd87 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 702fcd50f..a52c9e10a 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 c432014ff..179268a20 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 77ae3dec8..08f0e7668 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 e8dafdf1c..d5e698fb4 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 5777e5b20..40fffce64 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 6c76e822f..7c117a3d0 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 e22eddb91..0dfdac81f 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 5e3bd27e5..1953a8f17 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 c7eb23c7e..3b743de79 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 5e094392d..a8b6fdf0d 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 41509c171..a946b4a2a 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 6b5bd7ca4..308c72d80 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 e21998d94..39e1f2c72 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 2851a440d..01dcd8805 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 8f97bb37e..11aede347 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 c76a2e471..85ad204a2 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 becbc43b0..692ab5a37 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 3e3b40cc0..a39e79637 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 079eac296..2d1ec54cc 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 36f3c7414..2d23f4627 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 736bf3b14..8025ba18e 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 5d3f33c33..eeecacbf1 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 cabc2c404..3e6740522 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 61220d488..62739f62a 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 2f05e4aa2..f271a47f2 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 b860c7c7f..ae9dc43f7 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 dba209377..3ba0ded72 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 ce9c48c0f..23ce1fd80 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 2d6f36aa3..51832abbe 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 c43381c5b..688dfb635 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 03306af16..fa202afab 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 61ae569d6..b71075164 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 2c41d6ec8..96e835327 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 9c4ba6fc9..bb41b6853 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 e76921da0..b36dcc40d 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 b4be337d7..bb781b87b 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 e5efdd715..5b6f34c13 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 d4602e13e..20b4842ee 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 841b717a4..6bc91c6f4 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 617180aa3..c3151da73 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 bbde85167..95d21f821 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 cd4a1a37d..531b9f8af 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 1db5ae9c9..7c3067d85 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 40b823b29..dc154b9d8 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 b3ede973a..1b40bba95 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 03497f6b9..6628f43bc 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 7a64a92d6..eaea7c2dd 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 b2970ada0..37a4648d6 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 b5ef4aa5f..306624806 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 7d83da8b0..ff388dc2e 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 38784cd07..ccfe03c6d 100644
--- a/src/views/tasks/ShowTasks.vue
+++ b/src/views/tasks/ShowTasks.vue
@@ -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 903ca84d8..27df350a2 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -426,7 +426,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 +457,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 08a6c4025..1d951e8e1 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 151d97082..88cba5117 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 2d5644c2b..68a1c7625 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -16,5 +16,8 @@
     "paths": {
       "@/*": ["./src/*"]
     }
+  },
+  "vueCompilerOptions": {
+    "strictTemplates": true
   }
 }
\ No newline at end of file