diff --git a/src/BoardSelector.vue b/src/BoardSelector.vue
index 25d6b2bfd..cca16fa31 100644
--- a/src/BoardSelector.vue
+++ b/src/BoardSelector.vue
@@ -41,7 +41,7 @@
 	</NcModal>
 </template>
 <script>
-import NcModal from '@nextcloud/vue/dist/Components/NcModal'
+import { NcModal } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 
diff --git a/src/CardCreateDialog.vue b/src/CardCreateDialog.vue
index 357fa9497..0e0a9c17e 100644
--- a/src/CardCreateDialog.vue
+++ b/src/CardCreateDialog.vue
@@ -92,9 +92,7 @@
 
 <script>
 import { generateUrl } from '@nextcloud/router'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+import { NcModal, NcMultiselect, NcEmptyContent } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 import { CardApi } from './services/CardApi.js'
 
diff --git a/src/CardSelector.vue b/src/CardSelector.vue
index ee5a8091b..5a255aac6 100644
--- a/src/CardSelector.vue
+++ b/src/CardSelector.vue
@@ -62,8 +62,7 @@
 
 <script>
 import { generateUrl } from '@nextcloud/router'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcModal, NcMultiselect } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 
 export default {
diff --git a/src/components/board/SharingTabSidebar.vue b/src/components/board/SharingTabSidebar.vue
index ec6e038e7..0d02c729e 100644
--- a/src/components/board/SharingTabSidebar.vue
+++ b/src/components/board/SharingTabSidebar.vue
@@ -41,9 +41,9 @@
 					<span v-if="acl.type===7">{{ t('deck', '(Circle)') }}</span>
 				</span>
 
-				<ActionCheckbox v-if="!(isCurrentUser(acl.participant.uid) && acl.type === 0) && (canManage || (canEdit && canShare))" :checked="acl.permissionEdit" @change="clickEditAcl(acl)">
+				<NcActionCheckbox v-if="!(isCurrentUser(acl.participant.uid) && acl.type === 0) && (canManage || (canEdit && canShare))" :checked="acl.permissionEdit" @change="clickEditAcl(acl)">
 					{{ t('deck', 'Can edit') }}
-				</ActionCheckbox>
+				</NcActionCheckbox>
 				<NcActions v-if="!(isCurrentUser(acl.participant.uid) && acl.type === 0)" :force-menu="true">
 					<ActionCheckbox v-if="canManage || canShare" :checked="acl.permissionShare" @change="clickShareAcl(acl)">
 						{{ t('deck', 'Can share') }}
@@ -73,7 +73,7 @@
 </template>
 
 <script>
-import { NcAvatar, NcMultiselect, NcActions, NcActionButton, ActionCheckbox, NcRelatedResourcesPanel } from '@nextcloud/vue'
+import { NcAvatar, NcMultiselect, NcActions, NcActionButton, NcActionCheckbox, NcRelatedResourcesPanel } from '@nextcloud/vue'
 import { CollectionList } from 'nextcloud-vue-collections'
 import { mapGetters, mapState } from 'vuex'
 import { getCurrentUser } from '@nextcloud/auth'
@@ -87,7 +87,7 @@ export default {
 		NcAvatar,
 		NcActions,
 		NcActionButton,
-		ActionCheckbox,
+		NcActionCheckbox,
 		NcMultiselect,
 		CollectionList,
 		NcRelatedResourcesPanel,
diff --git a/src/components/card/AttachmentList.vue b/src/components/card/AttachmentList.vue
index 7f9017b00..6a18cbd6c 100644
--- a/src/components/card/AttachmentList.vue
+++ b/src/components/card/AttachmentList.vue
@@ -76,15 +76,15 @@
 					</NcActionButton>
 				</NcActions>
 				<NcActions v-if="removable && !isReadOnly" :force-menu="true">
-					<ActionLink v-if="attachment.extendedData.fileid" icon="icon-folder" :href="internalLink(attachment)">
+					<NcActionLink v-if="attachment.extendedData.fileid" icon="icon-folder" :href="internalLink(attachment)">
 						{{ t('deck', 'Show in Files') }}
-					</ActionLink>
-					<ActionLink v-if="attachment.extendedData.fileid"
+					</NcActionLink>
+					<NcActionLink v-if="attachment.extendedData.fileid"
 						icon="icon-download"
 						:href="downloadLink(attachment)"
 						download>
 						{{ t('deck', 'Download') }}
-					</ActionLink>
+					</NcActionLink>
 					<NcActionButton v-if="attachment.extendedData.fileid && !isReadOnly" icon="icon-delete" @click="unshareAttachment(attachment)">
 						{{ t('deck', 'Remove attachment') }}
 					</NcActionButton>
@@ -103,7 +103,7 @@
 
 <script>
 import axios from '@nextcloud/axios'
-import { NcActions, NcActionButton, ActionLink } from '@nextcloud/vue'
+import { NcActions, NcActionButton, NcActionLink } from '@nextcloud/vue'
 import AttachmentDragAndDrop from '../AttachmentDragAndDrop.vue'
 import relativeDate from '../../mixins/relativeDate.js'
 import { formatFileSize } from '@nextcloud/files'
@@ -127,7 +127,7 @@ export default {
 	components: {
 		NcActions,
 		NcActionButton,
-		ActionLink,
+		NcActionLink,
 		AttachmentDragAndDrop,
 	},
 	mixins: [relativeDate, attachmentUpload],
diff --git a/src/init-card-reference.js b/src/init-card-reference.js
index 5fa563ec9..618a9065d 100644
--- a/src/init-card-reference.js
+++ b/src/init-card-reference.js
@@ -20,7 +20,7 @@
  */
 
 import { registerWidget } from '@nextcloud/vue-richtext'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { Tooltip } from '@nextcloud/vue'
 import Vue from 'vue'
 import CardReferenceWidget from './views/CardReferenceWidget.vue'
 
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 57816a293..222ee1fa5 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -61,13 +61,12 @@
 
 <script>
 import PlusIcon from 'vue-material-design-icons/Plus.vue'
-import { NcDashboardWidget } from '@nextcloud/vue'
+import { NcButton, NcDashboardWidget } from '@nextcloud/vue'
 import { mapGetters } from 'vuex'
 import labelStyle from './../mixins/labelStyle.js'
 import DueDate from '../components/cards/badges/DueDate.vue'
 import { generateUrl } from '@nextcloud/router'
 import CardCreateDialog from '../CardCreateDialog.vue'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 export default {
 	name: 'Dashboard',