diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 91877a9f..3438c03a 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -40,7 +40,7 @@ jobs:
         run: composer i
 
       - name: Install dependencies
-        run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
+        run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }}
 
       - name: Run coding standards check
         run: composer run psalm
diff --git a/composer.json b/composer.json
index 34d9914c..243f8cda 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
 		"phpunit/phpunit": "^9.5.26",
 		"nextcloud/coding-standard": "^1.0.0",
 		"vimeo/psalm": "^4",
-		"christophwurst/nextcloud": "v24.0.0"
+		"nextcloud/ocp": "v25.0.0"
 	},
 	"config": {
 		"optimize-autoloader": true,
diff --git a/src/App.vue b/src/App.vue
index ed65850a..f8a39753 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { mutations } from './store/'
+import { mutations } from './store/index.js'
 import { showError, showMessage } from '@nextcloud/dialogs'
 import { generateFilePath } from '@nextcloud/router'
 import { getRequestToken } from '@nextcloud/auth'
diff --git a/src/admin.js b/src/admin.js
index 690011f2..a3bcb3cc 100644
--- a/src/admin.js
+++ b/src/admin.js
@@ -4,10 +4,10 @@
  * This file is licensed under the Affero General Public License version 3 or later. See the COPYING file.
  */
 import Vue from 'vue'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
-import App from './components/ViewAdmin'
-import store from './store/'
-import AppGlobal from './mixins/AppGlobal'
+import { Tooltip } from '@nextcloud/vue'
+import App from './components/ViewAdmin.vue'
+import store from './store/index.js'
+import AppGlobal from './mixins/AppGlobal.js'
 import { Store } from 'vuex'
 
 Vue.mixin(AppGlobal)
diff --git a/src/collections.js b/src/collections.js
index 83504404..e3d522cd 100644
--- a/src/collections.js
+++ b/src/collections.js
@@ -5,12 +5,12 @@
  */
 
 import Vue from 'vue'
-import FolderPickerDialog from './components/FolderPickerDialog'
+import FolderPickerDialog from './components/FolderPickerDialog.vue'
 import { Store } from 'vuex'
 import deepClone from 'clone-deep'
-import store, { actions } from './store'
-import AppGlobal from './mixins/AppGlobal'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
+import store, { actions } from './store/index.js'
+import AppGlobal from './mixins/AppGlobal.js'
+import { Tooltip } from '@nextcloud/vue'
 
 // eslint-disable-next-line
 __webpack_nonce__ = btoa(OC.requestToken)
diff --git a/src/components/BookmarksList.vue b/src/components/BookmarksList.vue
index 33cb5f04..bd0a5232 100644
--- a/src/components/BookmarksList.vue
+++ b/src/components/BookmarksList.vue
@@ -5,11 +5,10 @@
   -->
 
 <template>
-	<div
-		:class="{
-			bookmarkslist: true,
-			'bookmarkslist--gridview': viewMode === 'grid'
-		}">
+	<div :class="{
+		bookmarkslist: true,
+		'bookmarkslist--gridview': viewMode === 'grid'
+	}">
 		<div v-if="$route.name === routes.ARCHIVED && bookmarks.length" class="bookmarkslist__description">
 			{{
 				t('bookmarks', 'Bookmarks to files on the web like photos or PDFs will automatically be saved to your Nextcloud files, so you can still find them even when the link goes offline.')
@@ -37,25 +36,21 @@
 				<!-- FOLDER VIEW WITH CUSTOM SORTING -->
 				<template v-if="sortOrder === 'index' && children.length">
 					<template v-for="item in children">
-						<Folder
-							v-if="item.type === 'folder' && getFolder(item.id)"
+						<Folder v-if="item.type === 'folder' && getFolder(item.id)"
 							:key="item.type + item.id"
 							:folder="getFolder(item.id)" />
-						<Bookmark
-							v-if="item.type === 'bookmark' && getBookmark(item.id)"
+						<Bookmark v-if="item.type === 'bookmark' && getBookmark(item.id)"
 							:key="item.type + item.id"
 							:bookmark="getBookmark(item.id)" />
 					</template>
 				</template>
 				<!-- FOLDER VIEW WITH NORMAL SORTING -->
 				<template v-else-if="(subFolders.length || bookmarks.length) && !loading">
-					<Folder
-						v-for="folder in subFolders"
+					<Folder v-for="folder in subFolders"
 						:key="'folder' + folder.id"
 						:folder="folder" />
 					<template v-if="bookmarks.length">
-						<Bookmark
-							v-for="bookmark in bookmarks"
+						<Bookmark v-for="bookmark in bookmarks"
 							:key="'bookmark' + bookmark.id"
 							:bookmark="bookmark" />
 					</template>
@@ -65,12 +60,10 @@
 			</template>
 			<!-- NON-FOLDER VIEW -->
 			<template v-else-if="subFolders.length || bookmarks.length">
-				<Folder
-					v-for="folder in subFolders"
+				<Folder v-for="folder in subFolders"
 					:key="'folder' + folder.id"
 					:folder="folder" />
-				<Bookmark
-					v-for="bookmark in bookmarks"
+				<Bookmark v-for="bookmark in bookmarks"
 					:key="'bookmark' + bookmark.id"
 					:bookmark="bookmark" />
 			</template>
@@ -81,15 +74,15 @@
 </template>
 
 <script>
-import Bookmark from './Bookmark'
-import Folder from './Folder'
-import CreateBookmark from './CreateBookmark'
-import CreateFolder from './CreateFolder'
-import { actions, mutations } from '../store'
-import NoBookmarks from './NoBookmarks'
-import FirstRun from './FirstRun'
-import VirtualScroll from './VirtualScroll'
-import { privateRoutes } from '../router'
+import Bookmark from './Bookmark.vue'
+import Folder from './Folder.vue'
+import CreateBookmark from './CreateBookmark.vue'
+import CreateFolder from './CreateFolder.vue'
+import { actions, mutations } from '../store/index.js'
+import NoBookmarks from './NoBookmarks.vue'
+import FirstRun from './FirstRun.vue'
+import VirtualScroll from './VirtualScroll.vue'
+import { privateRoutes } from '../router.js'
 
 export default {
 	name: 'BookmarksList',
diff --git a/src/components/CreateBookmark.vue b/src/components/CreateBookmark.vue
index e4a4e6c9..2fe0149f 100644
--- a/src/components/CreateBookmark.vue
+++ b/src/components/CreateBookmark.vue
@@ -19,9 +19,9 @@
 	</Item>
 </template>
 <script>
-import EarthIcon from 'vue-material-design-icons/Earth'
-import Item from './Item'
-import { actions, mutations } from '../store/'
+import EarthIcon from 'vue-material-design-icons/Earth.vue'
+import Item from './Item.vue'
+import { actions, mutations } from '../store/index.js'
 
 export default {
 	name: 'CreateBookmark',
diff --git a/src/components/CreateFolder.vue b/src/components/CreateFolder.vue
index 1cf336c4..ffb51892 100644
--- a/src/components/CreateFolder.vue
+++ b/src/components/CreateFolder.vue
@@ -19,9 +19,9 @@
 	</Item>
 </template>
 <script>
-import FolderIcon from 'vue-material-design-icons/Folder'
-import Item from './Item'
-import { actions, mutations } from '../store/'
+import FolderIcon from 'vue-material-design-icons/Folder.vue'
+import Item from './Item.vue'
+import { actions, mutations } from '../store/index.js'
 
 export default {
 	name: 'CreateFolder',
diff --git a/src/components/DashboardFrequent.vue b/src/components/DashboardFrequent.vue
index 47a3a7d6..d238d038 100644
--- a/src/components/DashboardFrequent.vue
+++ b/src/components/DashboardFrequent.vue
@@ -15,7 +15,7 @@
 <script>
 import { DashboardWidget } from '@nextcloud/vue-dashboard'
 import { generateUrl } from '@nextcloud/router'
-import { actions } from '../store'
+import { actions } from '../store/index.js'
 export default {
 	name: 'DashboardFrequent',
 	components: { DashboardWidget },
diff --git a/src/components/DashboardRecent.vue b/src/components/DashboardRecent.vue
index 1f73cf0c..7bec7207 100644
--- a/src/components/DashboardRecent.vue
+++ b/src/components/DashboardRecent.vue
@@ -15,7 +15,7 @@
 <script>
 import { DashboardWidget } from '@nextcloud/vue-dashboard'
 import { generateUrl } from '@nextcloud/router'
-import { actions } from '../store'
+import { actions } from '../store/index.js'
 export default {
 	name: 'DashboardRecent',
 	components: { DashboardWidget },
diff --git a/src/components/DragImage.vue b/src/components/DragImage.vue
index 0369520a..4261e5b6 100644
--- a/src/components/DragImage.vue
+++ b/src/components/DragImage.vue
@@ -12,8 +12,8 @@
 </template>
 
 <script>
-import FolderIcon from 'vue-material-design-icons/Folder'
-import EarthIcon from 'vue-material-design-icons/Earth'
+import FolderIcon from 'vue-material-design-icons/Folder.vue'
+import EarthIcon from 'vue-material-design-icons/Earth.vue'
 export default {
 	name: 'DragImage',
 	components: { FolderIcon, EarthIcon },
diff --git a/src/components/FolderOverview.vue b/src/components/FolderOverview.vue
index 50d6db06..460e6378 100644
--- a/src/components/FolderOverview.vue
+++ b/src/components/FolderOverview.vue
@@ -15,8 +15,8 @@
 
 <script>
 import { NcAppContentList } from '@nextcloud/vue'
-import TreeFolder from './TreeFolder'
-import { privateRoutes } from '../router'
+import TreeFolder from './TreeFolder.vue'
+import { privateRoutes } from '../router.js'
 
 export default {
 	name: 'FolderOverview',
diff --git a/src/components/ItemSkeleton.vue b/src/components/ItemSkeleton.vue
index 9a99575d..a66d1875 100644
--- a/src/components/ItemSkeleton.vue
+++ b/src/components/ItemSkeleton.vue
@@ -5,15 +5,13 @@
   -->
 
 <template>
-	<div
-		:class="{
+	<div :class="{
 			item: true,
 			'item--gridview': viewMode === 'grid'
 		}"
 		:style="{ background: '#efefef', height: viewMode !== 'grid'? '45px' : '' }">
 		<div class="item__labels" />
-		<div
-			class="item__actions" />
+		<div class="item__actions" />
 	</div>
 </template>
 <script>
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index b35d7b56..8fb7c7ab 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -21,8 +21,7 @@
 			<p>{{ t('bookmarks',
 				'Enter the path of a folder in your Files where bookmarked files should be stored.'
 			) }}</p>
-			<input
-				:value="archivePath"
+			<input :value="archivePath"
 				:readonly="true"
 				@click="onChangeArchivePath">
 		</label>
@@ -32,8 +31,7 @@
 			<p>{{ t('bookmarks',
 				'Enter the path of a folder in your Files where backups will be stored.'
 			) }}</p>
-			<input
-				:value="backupPath"
+			<input :value="backupPath"
 				:readonly="true"
 				@click="onChangeBackupPath">
 		</label>
@@ -60,8 +58,7 @@
 			<p>{{ t('bookmarks',
 				'Drag this to your browser bookmarks and click it to quickly bookmark a webpage.'
 			) }}</p>
-			<a
-				class="button center"
+			<a class="button center"
 				:href="bookmarklet"
 				@click.prevent="void 0">{{
 					t('bookmarks', 'Add to {instanceName}', {
@@ -73,7 +70,7 @@
 </template>
 <script>
 import { generateUrl } from '@nextcloud/router'
-import { actions } from '../store/'
+import { actions } from '../store/index.js'
 import { getRequestToken } from '@nextcloud/auth'
 import { getFilePickerBuilder } from '@nextcloud/dialogs'
 
diff --git a/src/components/SidebarFolder.vue b/src/components/SidebarFolder.vue
index fda981fe..d293d589 100644
--- a/src/components/SidebarFolder.vue
+++ b/src/components/SidebarFolder.vue
@@ -5,8 +5,7 @@
   -->
 
 <template>
-	<NcAppSidebar
-		v-if="isActive"
+	<NcAppSidebar v-if="isActive"
 		class="sidebar"
 		:title="folder.title"
 		:active.sync="activeTab"
@@ -47,8 +46,7 @@
 					<div v-if="publicLink"
 						v-tooltip="t('bookmarks', 'Reading allowed')"
 						:aria-label="t('bookmarks', 'Reading allowed')">
-						<EyeIcon
-							:size="20"
+						<EyeIcon :size="20"
 							:fill-color="colorMainText" />
 					</div>
 				</div>
@@ -80,21 +78,18 @@
 						<div v-if="share.canShare"
 							v-tooltip="t('bookmarks', 'Resharing allowed')"
 							:aria-label="t('bookmarks','Resharing allowed')">
-							<ShareAllIcon
-								:size="20"
+							<ShareAllIcon :size="20"
 								:fill-color="colorMainText" />
 						</div>
 						<div v-if="share.canWrite"
 							v-tooltip="t('bookmarks','Editing allowed')"
 							:aria-label="t('bookmarks','Editing allowed')">
-							<PencilIcon
-								:size="20"
+							<PencilIcon :size="20"
 								:fill-color="colorMainText" />
 						</div>
 						<div v-tooltip="t('bookmarks','Reading allowed')"
 							:aria-label="t('bookmarks', 'Reading allowed')">
-							<EyeIcon
-								:size="20"
+							<EyeIcon :size="20"
 								:fill-color="colorMainText" />
 						</div>
 					</div>
@@ -130,10 +125,10 @@ import { getCurrentUser } from '@nextcloud/auth'
 import { generateUrl, generateOcsUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
 import copy from 'copy-text-to-clipboard'
-import { actions, mutations } from '../store/'
-import EyeIcon from 'vue-material-design-icons/Eye'
-import PencilIcon from 'vue-material-design-icons/Pencil'
-import ShareAllIcon from 'vue-material-design-icons/ShareAll'
+import { actions, mutations } from '../store/index.js'
+import EyeIcon from 'vue-material-design-icons/Eye.vue'
+import PencilIcon from 'vue-material-design-icons/Pencil.vue'
+import ShareAllIcon from 'vue-material-design-icons/ShareAll.vue'
 import { CollectionList } from 'nextcloud-vue-collections'
 
 export default {
diff --git a/src/components/TagLine.vue b/src/components/TagLine.vue
index ebe21c16..68431d82 100644
--- a/src/components/TagLine.vue
+++ b/src/components/TagLine.vue
@@ -16,7 +16,7 @@
 	</div>
 </template>
 <script>
-import { privateRoutes, publicRoutes } from '../router'
+import { privateRoutes, publicRoutes } from '../router.js'
 
 export default {
 	name: 'TagLine',
diff --git a/src/components/TreeFolder.vue b/src/components/TreeFolder.vue
index d355cc4a..66b1279c 100644
--- a/src/components/TreeFolder.vue
+++ b/src/components/TreeFolder.vue
@@ -29,9 +29,9 @@
 </template>
 
 <script>
-import FolderIcon from 'vue-material-design-icons/Folder'
-import FolderOpenIcon from 'vue-material-design-icons/FolderOpen'
-import { privateRoutes } from '../router'
+import FolderIcon from 'vue-material-design-icons/Folder.vue'
+import FolderOpenIcon from 'vue-material-design-icons/FolderOpen.vue'
+import { privateRoutes } from '../router.js'
 export default {
 	name: 'TreeFolder',
 	components: { FolderIcon, FolderOpenIcon },
diff --git a/src/components/VirtualScroll.vue b/src/components/VirtualScroll.vue
index aa85c2f2..e1349945 100644
--- a/src/components/VirtualScroll.vue
+++ b/src/components/VirtualScroll.vue
@@ -4,7 +4,7 @@
   - This file is licensed under the Affero General Public License version 3 or later. See the COPYING file.
   -->
 <script>
-import ItemSkeleton from './ItemSkeleton'
+import ItemSkeleton from './ItemSkeleton.vue'
 
 const GRID_ITEM_HEIGHT = 200 + 10
 const GRID_ITEM_WIDTH = 250 + 10
diff --git a/src/dashboard.js b/src/dashboard.js
index be832bc2..34f9c20d 100644
--- a/src/dashboard.js
+++ b/src/dashboard.js
@@ -5,11 +5,11 @@
  */
 
 import Vue from 'vue'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
-import store from './store/'
-import AppGlobal from './mixins/AppGlobal'
+import { Tooltip } from '@nextcloud/vue'
+import store from './store/index.js'
+import AppGlobal from './mixins/AppGlobal.js'
 import DashboardRecent from './components/DashboardRecent.vue'
-import DashboardFrequent from './components/DashboardFrequent'
+import DashboardFrequent from './components/DashboardFrequent.vue'
 import { Store } from 'vuex'
 import deepClone from 'clone-deep'
 
diff --git a/src/main.js b/src/main.js
index a8964d16..d32c90de 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,12 +5,12 @@
  */
 import Vue from 'vue'
 import { Store } from 'vuex'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
-import App from './App'
-import router from './router'
-import store from './store/'
-import AppGlobal from './mixins/AppGlobal'
-import DropTarget from './directives/drop-target'
+import { Tooltip } from '@nextcloud/vue'
+import App from './App.vue'
+import router from './router.js'
+import store from './store/index.js'
+import AppGlobal from './mixins/AppGlobal.js'
+import DropTarget from './directives/drop-target.js'
 import { subscribe } from '@nextcloud/event-bus'
 import { generateUrl } from '@nextcloud/router'
 
diff --git a/src/router.js b/src/router.js
index aa38e1d7..874eb710 100644
--- a/src/router.js
+++ b/src/router.js
@@ -8,9 +8,9 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import { generateUrl } from '@nextcloud/router'
 
-const ViewPrivate = () => import(/* webpackPreload: true */ './components/ViewPrivate')
-const ViewPublic = () => import(/* webpackPreload: true */'./components/ViewPublic')
-const ViewBookmarklet = () => import(/* webpackPreload: true */'./components/ViewBookmarklet')
+const ViewPrivate = () => import(/* webpackPreload: true */ './components/ViewPrivate.vue')
+const ViewPublic = () => import(/* webpackPreload: true */'./components/ViewPublic.vue')
+const ViewBookmarklet = () => import(/* webpackPreload: true */'./components/ViewBookmarklet.vue')
 
 Vue.use(Router)
 
diff --git a/src/store/actions.js b/src/store/actions.js
index 9c2275f9..54fd6a17 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -7,11 +7,11 @@
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
-import AppGlobal from '../mixins/AppGlobal'
-import { mutations } from './mutations'
+import AppGlobal from '../mixins/AppGlobal.js'
+import { mutations } from './mutations.js'
 import * as Parallel from 'async-parallel'
-import uniq from 'lodash/uniq'
-import difference from 'lodash/difference'
+import uniq from 'lodash/uniq.js'
+import difference from 'lodash/difference.js'
 
 const BATCH_SIZE = 42
 
diff --git a/src/store/index.js b/src/store/index.js
index 94584c2d..5118fc8e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -6,18 +6,18 @@
 
 import Vue from 'vue'
 import Vuex from 'vuex'
-import Mutations from './mutations'
-import Actions from './actions'
-import { privateRoutes, publicRoutes } from '../router'
+import Mutations from './mutations.js'
+import Actions from './actions.js'
+import { privateRoutes, publicRoutes } from '../router.js'
 import { generateUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
-import { findFolder } from './findFolder'
+import { findFolder } from './findFolder.js'
 
 Vue.use(Vuex)
 
-export { mutations } from './mutations'
+export { mutations } from './mutations.js'
 
-export { actions } from './actions'
+export { actions } from './actions.js'
 
 export default {
 	mutations: Mutations,
diff --git a/src/store/mutations.js b/src/store/mutations.js
index fc3f616c..bf036cdc 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -6,7 +6,7 @@
 
 import Vue from 'vue'
 import axios from '@nextcloud/axios'
-import { findFolder } from './findFolder'
+import { findFolder } from './findFolder.js'
 
 export const mutations = {
 	SET_AUTH_TOKEN: 'SET_AUTH_TOKEN',