diff --git a/apps/files/src/FilesApp.vue b/apps/files/src/FilesApp.vue
index e83d4999c2425..fe6da67cfa92b 100644
--- a/apps/files/src/FilesApp.vue
+++ b/apps/files/src/FilesApp.vue
@@ -5,7 +5,7 @@
 <template>
 	<NcContent app-name="files">
 		<FilesNavigation v-if="!isPublic" />
-		<FilesList :is-public="isPublic" />
+		<RouterView />
 		<FilesSidebar v-if="!isPublic" />
 	</NcContent>
 </template>
@@ -13,7 +13,6 @@
 <script setup lang="ts">
 import { isPublicShare } from '@nextcloud/sharing/public'
 import NcContent from '@nextcloud/vue/components/NcContent'
-import FilesList from './views/FilesList.vue'
 import FilesNavigation from './views/FilesNavigation.vue'
 import FilesSidebar from './views/FilesSidebar.vue'
 import { useHotKeys } from './composables/useHotKeys.ts'
diff --git a/apps/files/src/actions/deleteUtils.ts b/apps/files/src/actions/deleteUtils.ts
index 6b1cbb9138b10..46f010e6146b0 100644
--- a/apps/files/src/actions/deleteUtils.ts
+++ b/apps/files/src/actions/deleteUtils.ts
@@ -11,7 +11,7 @@ import { getCapabilities } from '@nextcloud/capabilities'
 import { emit } from '@nextcloud/event-bus'
 import { FileType } from '@nextcloud/files'
 import { n, t } from '@nextcloud/l10n'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 import { useUserConfigStore } from '../store/userconfig.ts'
 
 export const isTrashbinEnabled = () => (getCapabilities() as Capabilities)?.files?.undelete === true
@@ -134,7 +134,7 @@ export function displayName({ nodes, view }: { nodes: INode[], view: IView }) {
  *
  */
 export function shouldAskForConfirmation() {
-	const userConfig = useUserConfigStore(getPinia())
+	const userConfig = useUserConfigStore(pinia)
 	return userConfig.userConfig.show_dialog_deletion !== false
 }
 
diff --git a/apps/files/src/actions/downloadAction.ts b/apps/files/src/actions/downloadAction.ts
index 63f943ddcedb3..14a476676758e 100644
--- a/apps/files/src/actions/downloadAction.ts
+++ b/apps/files/src/actions/downloadAction.ts
@@ -12,7 +12,7 @@ import { emit } from '@nextcloud/event-bus'
 import { DefaultType, FileType } from '@nextcloud/files'
 import { t } from '@nextcloud/l10n'
 import { useFilesStore } from '../store/files.ts'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 import { usePathsStore } from '../store/paths.ts'
 import { logger } from '../utils/logger.ts'
 import { isDownloadable } from '../utils/permissions.ts'
@@ -161,8 +161,8 @@ async function downloadNodes(nodes: INode[]) {
  * @return The current directory node or null if not found
  */
 function getCurrentDirectory(view: IView, directory: string): INode | null {
-	const filesStore = useFilesStore(getPinia())
-	const pathsStore = usePathsStore(getPinia())
+	const filesStore = useFilesStore(pinia)
+	const pathsStore = usePathsStore(pinia)
 	if (!view?.id) {
 		return null
 	}
diff --git a/apps/files/src/actions/favoriteAction.ts b/apps/files/src/actions/favoriteAction.ts
index f3b109871b2f0..865dc3575fa9f 100644
--- a/apps/files/src/actions/favoriteAction.ts
+++ b/apps/files/src/actions/favoriteAction.ts
@@ -15,7 +15,6 @@ import { encodePath } from '@nextcloud/paths'
 import { generateUrl } from '@nextcloud/router'
 import { isPublicShare } from '@nextcloud/sharing/public'
 import PQueue from 'p-queue'
-import Vue from 'vue'
 import { logger } from '../utils/logger.ts'
 
 const queue = new PQueue({ concurrency: 5 })
@@ -107,7 +106,7 @@ export async function favoriteNode(node: INode, view: IView, willFavorite: boole
 		}
 
 		// Update the node webdav attribute
-		Vue.set(node.attributes, 'favorite', willFavorite ? 1 : 0)
+		node.attributes.favorite = willFavorite ? 1 : 0
 		emit('files:node:updated', node)
 
 		// Dispatch event to whoever is interested
diff --git a/apps/files/src/actions/moveOrCopyAction.ts b/apps/files/src/actions/moveOrCopyAction.ts
index 2920a1cb5f743..ce487858c759c 100644
--- a/apps/files/src/actions/moveOrCopyAction.ts
+++ b/apps/files/src/actions/moveOrCopyAction.ts
@@ -16,9 +16,8 @@ import { FileType, getUniqueName, NodeStatus, Permission } from '@nextcloud/file
 import { defaultRootPath, getClient, getDefaultPropfind, resultToNode } from '@nextcloud/files/dav'
 import { n, t } from '@nextcloud/l10n'
 import { basename, join } from '@nextcloud/paths'
-import { getConflicts } from '@nextcloud/upload'
-import Vue from 'vue'
 import { getContents } from '../services/Files.ts'
+import { getConflicts } from '../utils/conflicts.ts'
 import { logger } from '../utils/logger.ts'
 import { canCopy, canMove, getQueue, MoveCopyAction } from './moveOrCopyActionUtils.ts'
 
@@ -165,7 +164,7 @@ export async function* handleCopyMoveNodesTo(nodes: INode[], destination: IFolde
 	try {
 		for (const node of nodes) {
 			// Set loading state
-			Vue.set(node, 'status', NodeStatus.LOADING)
+			node.status = NodeStatus.LOADING
 			yield queue.add(async () => {
 				try {
 					const client = getClient()
@@ -211,7 +210,7 @@ export async function* handleCopyMoveNodesTo(nodes: INode[], destination: IFolde
 					}
 					throw error
 				} finally {
-					Vue.set(node, 'status', undefined)
+					node.status = undefined
 				}
 			})
 		}
diff --git a/apps/files/src/actions/renameAction.spec.ts b/apps/files/src/actions/renameAction.spec.ts
index 1f25b86d4ebea..89e3f01001f7e 100644
--- a/apps/files/src/actions/renameAction.spec.ts
+++ b/apps/files/src/actions/renameAction.spec.ts
@@ -9,7 +9,7 @@ import * as eventBus from '@nextcloud/event-bus'
 import { File, Folder, Permission } from '@nextcloud/files'
 import { beforeEach, describe, expect, test, vi } from 'vitest'
 import { useFilesStore } from '../store/files.ts'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 import { action } from './renameAction.ts'
 
 const view = {
@@ -25,7 +25,7 @@ beforeEach(() => {
 		permissions: Permission.CREATE,
 		root: '/files/admin',
 	})
-	const files = useFilesStore(getPinia())
+	const files = useFilesStore(pinia)
 	files.setRoot({ service: 'files', root })
 })
 
diff --git a/apps/files/src/actions/renameAction.ts b/apps/files/src/actions/renameAction.ts
index 28b2bcd29a853..b63f4e9fb2be5 100644
--- a/apps/files/src/actions/renameAction.ts
+++ b/apps/files/src/actions/renameAction.ts
@@ -11,7 +11,7 @@ import { Permission } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
 import { dirname } from 'path'
 import { useFilesStore } from '../store/files.ts'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 
 export const ACTION_RENAME = 'rename'
 
@@ -31,7 +31,7 @@ export const action: IFileAction = {
 		}
 
 		const node = nodes[0]
-		const filesStore = useFilesStore(getPinia())
+		const filesStore = useFilesStore(pinia)
 		const parentNode = node.dirname === '/'
 			? filesStore.getRoot(view.id)
 			: filesStore.getNode(dirname(node.source))
diff --git a/apps/files/src/components/BreadCrumbs.vue b/apps/files/src/components/BreadCrumbs.vue
index 39bd54da0d6c5..1e309c45f503b 100644
--- a/apps/files/src/components/BreadCrumbs.vue
+++ b/apps/files/src/components/BreadCrumbs.vue
@@ -18,10 +18,10 @@
 			:to="section.to"
 			:force-icon-text="index === 0 && !isNarrow"
 			force-menu
-			:open.sync="isMenuOpen"
+			v-model:open="isMenuOpen"
 			:title="titleForSection(index, section)"
 			:aria-description="ariaForSection(section)"
-			@dragover.native="onDragOver($event, section.dir)"
+			@dragover="onDragOver($event, section.dir)"
 			@drop="onDrop($event, section.dir)">
 			<template v-if="index === 0" #icon>
 				<NcIconSvgWrapper
diff --git a/apps/files/src/components/DragAndDropNotice.vue b/apps/files/src/components/DragAndDropNotice.vue
index 44da33323f7cb..184edeef1d04c 100644
--- a/apps/files/src/components/DragAndDropNotice.vue
+++ b/apps/files/src/components/DragAndDropNotice.vue
@@ -32,8 +32,8 @@ import type { PropType } from 'vue'
 
 import { showError } from '@nextcloud/dialogs'
 import { Permission } from '@nextcloud/files'
-import { translate as t } from '@nextcloud/l10n'
-import { UploadStatus } from '@nextcloud/upload'
+import { UploadStatus } from '@nextcloud/files/upload'
+import { t } from '@nextcloud/l10n'
 import debounce from 'debounce'
 import { defineComponent } from 'vue'
 import TrayArrowDownIcon from 'vue-material-design-icons/TrayArrowDown.vue'
diff --git a/apps/files/src/components/DragAndDropPreview.vue b/apps/files/src/components/DragAndDropPreview.vue
index df0c0487b346b..7b5ccc6b40e34 100644
--- a/apps/files/src/components/DragAndDropPreview.vue
+++ b/apps/files/src/components/DragAndDropPreview.vue
@@ -17,12 +17,12 @@
 import type { Node } from '@nextcloud/files'
 
 import { FileType, formatFileSize } from '@nextcloud/files'
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FileMultipleIcon from 'vue-material-design-icons/FileMultiple.vue'
 import FolderIcon from 'vue-material-design-icons/Folder.vue'
 import { getSummaryFor } from '../utils/fileUtils.ts'
 
-export default Vue.extend({
+export default defineComponent({
 	name: 'DragAndDropPreview',
 
 	components: {
@@ -30,6 +30,8 @@ export default Vue.extend({
 		FolderIcon,
 	},
 
+	emits: ['loaded'],
+
 	data() {
 		return {
 			nodes: [] as Node[],
diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue
index 63daf33ef9a73..4d38fa0d0ebe1 100644
--- a/apps/files/src/components/FileEntry.vue
+++ b/apps/files/src/components/FileEntry.vue
@@ -33,16 +33,16 @@
 				ref="preview"
 				:source="source"
 				:dragover="dragover"
-				@auxclick.native="execDefaultAction"
-				@click.native="execDefaultAction" />
+				@auxclick="execDefaultAction"
+				@click="execDefaultAction" />
 
 			<FileEntryName
 				ref="name"
 				:basename="basename"
 				:extension="extension"
 				:source="source"
-				@auxclick.native="execDefaultAction"
-				@click.native="execDefaultAction" />
+				@auxclick="execDefaultAction"
+				@click="execDefaultAction" />
 		</td>
 
 		<!-- Actions -->
@@ -50,7 +50,7 @@
 			v-show="!isRenamingSmallScreen"
 			ref="actions"
 			:class="`files-list__row-actions-${uniqueId}`"
-			:opened.sync="openedMenu"
+			v-model:opened="openedMenu"
 			:source="source" />
 
 		<!-- Mime -->
diff --git a/apps/files/src/components/FileEntry/FileEntryName.vue b/apps/files/src/components/FileEntry/FileEntryName.vue
index ef7bd66b108b6..653d8fb5a4f6c 100644
--- a/apps/files/src/components/FileEntry/FileEntryName.vue
+++ b/apps/files/src/components/FileEntry/FileEntryName.vue
@@ -40,12 +40,13 @@
 
 <script lang="ts">
 import type { IFileAction, Node, TFileType } from '@nextcloud/files'
-import type { PropType } from 'vue'
+import type { ComponentPublicInstance, PropType } from 'vue'
 
 import { showError } from '@nextcloud/dialogs'
 import { FileType, NodeStatus } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
 import { basename } from '@nextcloud/paths'
+import { vOnClickOutside } from '@vueuse/components'
 import { defineComponent, inject } from 'vue'
 import NcTextField from '@nextcloud/vue/components/NcTextField'
 import { useFileListWidth } from '../../composables/useFileListWidth.ts'
@@ -62,6 +63,10 @@ export default defineComponent({
 		NcTextField,
 	},
 
+	directives: {
+		onClickOutside: vOnClickOutside,
+	},
+
 	props: {
 		/**
 		 * The filename without extension
@@ -185,7 +190,7 @@ export default defineComponent({
 		newName() {
 			// Check validity of the new name
 			const newName = this.newName.trim?.() || ''
-			const input = (this.$refs.renameInput as Vue | undefined)?.$el.querySelector('input')
+			const input = (this.$refs.renameInput as ComponentPublicInstance | undefined)?.$el.querySelector('input')
 			if (!input) {
 				return
 			}
@@ -213,7 +218,7 @@ export default defineComponent({
 		startRenaming() {
 			this.$nextTick(() => {
 				// Using split to get the true string length
-				const input = (this.$refs.renameInput as Vue | undefined)?.$el.querySelector('input')
+				const input = (this.$refs.renameInput as ComponentPublicInstance | undefined)?.$el.querySelector('input')
 				if (!input) {
 					logger.error('Could not find the rename input')
 					return
diff --git a/apps/files/src/components/FileEntryGrid.vue b/apps/files/src/components/FileEntryGrid.vue
index d2cb92ef40f3d..ccb8413275fe6 100644
--- a/apps/files/src/components/FileEntryGrid.vue
+++ b/apps/files/src/components/FileEntryGrid.vue
@@ -35,16 +35,16 @@
 				:dragover="dragover"
 				:grid-mode="true"
 				:source="source"
-				@auxclick.native="execDefaultAction"
-				@click.native="execDefaultAction" />
+				@auxclick="execDefaultAction"
+				@click="execDefaultAction" />
 
 			<FileEntryName
 				ref="name"
 				:basename="basename"
 				:extension="extension"
 				:source="source"
-				@auxclick.native="execDefaultAction"
-				@click.native="execDefaultAction" />
+				@auxclick="execDefaultAction"
+				@click="execDefaultAction" />
 		</td>
 
 		<!-- Mtime -->
@@ -63,7 +63,7 @@
 		<!-- Actions -->
 		<FileEntryActions
 			ref="actions"
-			:opened.sync="openedMenu"
+			v-model:opened="openedMenu"
 			:class="`files-list__row-actions-${uniqueId}`"
 			:grid-mode="true"
 			:source="source" />
diff --git a/apps/files/src/components/FileEntryMixin.ts b/apps/files/src/components/FileEntryMixin.ts
index 2471ced400989..381a4e2f276a4 100644
--- a/apps/files/src/components/FileEntryMixin.ts
+++ b/apps/files/src/components/FileEntryMixin.ts
@@ -11,9 +11,8 @@ import { FileType, Folder, File as NcFile, Node, NodeStatus, Permission } from '
 import { t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
 import { isPublicShare } from '@nextcloud/sharing/public'
-import { vOnClickOutside } from '@vueuse/components'
 import { extname } from 'path'
-import Vue, { computed, defineComponent } from 'vue'
+import { computed, defineComponent } from 'vue'
 import { action as sidebarAction } from '../actions/sidebarAction.ts'
 import { dataTransferToFileTree, onDropExternalFiles, onDropInternalFiles } from '../services/DropService.ts'
 import { getDragAndDropPreview } from '../utils/dragUtils.ts'
@@ -21,8 +20,6 @@ import { hashCode } from '../utils/hashUtils.ts'
 import { logger } from '../utils/logger.ts'
 import { isDownloadable } from '../utils/permissions.ts'
 
-Vue.directive('onClickOutside', vOnClickOutside)
-
 export default defineComponent({
 	props: {
 		source: {
@@ -287,7 +284,7 @@ export default defineComponent({
 		},
 	},
 
-	beforeDestroy() {
+	beforeUnmount() {
 		this.resetState()
 	},
 
diff --git a/apps/files/src/components/FileListFilter/FileListFilterToSearch.vue b/apps/files/src/components/FileListFilter/FileListFilterToSearch.vue
index 695f9c8ae76c5..882aca89d46e5 100644
--- a/apps/files/src/components/FileListFilter/FileListFilterToSearch.vue
+++ b/apps/files/src/components/FileListFilter/FileListFilterToSearch.vue
@@ -13,10 +13,10 @@
 import { t } from '@nextcloud/l10n'
 import { computed } from 'vue'
 import NcButton from '@nextcloud/vue/components/NcButton'
-import { getPinia } from '../../store/index.ts'
+import { pinia } from '../../store/index.ts'
 import { useSearchStore } from '../../store/search.ts'
 
-const searchStore = useSearchStore(getPinia())
+const searchStore = useSearchStore(pinia)
 
 const isVisible = computed(() => searchStore.query.length >= 3 && searchStore.scope === 'filter')
 
diff --git a/apps/files/src/components/FilesListHeader.vue b/apps/files/src/components/FilesListHeader.vue
index 084458c259cae..865e8148b5f9f 100644
--- a/apps/files/src/components/FilesListHeader.vue
+++ b/apps/files/src/components/FilesListHeader.vue
@@ -86,7 +86,7 @@ export default {
 		})
 	},
 
-	destroyed() {
+	unmounted() {
 		logger.debug(`Destroyed ${this.header.id} FilesListHeader`, { header: this.header })
 	},
 
diff --git a/apps/files/src/components/FilesListTableHeader.vue b/apps/files/src/components/FilesListTableHeader.vue
index 6553e698e29b3..c2a0e9e3f6e51 100644
--- a/apps/files/src/components/FilesListTableHeader.vue
+++ b/apps/files/src/components/FilesListTableHeader.vue
@@ -11,7 +11,7 @@
 				v-bind="selectAllBind"
 				:id="FILES_LIST_HEADER_SELECT_ALL_CHECKBOX_ID"
 				data-cy-files-list-selection-checkbox
-				@update:model-value="onToggleAll" />
+				@update:modelValue="onToggleAll" />
 		</th>
 
 		<!-- Columns display -->
@@ -86,9 +86,9 @@ import { defineComponent } from 'vue'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import { FILE_LIST_HEAD_FIRST_BATCH_ACTION_ID } from './FilesListTableHeaderActions.vue'
 import FilesListTableHeaderButton from './FilesListTableHeaderButton.vue'
+import { useFilesSorting } from '../composables/filesSorting.ts'
 import { useFileListWidth } from '../composables/useFileListWidth.ts'
 import { useRouteParameters } from '../composables/useRouteParameters.ts'
-import filesSortingMixin from '../mixins/filesSorting.ts'
 import { useActiveStore } from '../store/active.ts'
 import { useFilesStore } from '../store/files.ts'
 import { useSelectionStore } from '../store/selection.ts'
@@ -104,10 +104,6 @@ export default defineComponent({
 		NcCheckboxRadioSwitch,
 	},
 
-	mixins: [
-		filesSortingMixin,
-	],
-
 	props: {
 		isMimeAvailable: {
 			type: Boolean,
@@ -146,6 +142,8 @@ export default defineComponent({
 			directory,
 			isNarrow,
 
+			...useFilesSorting(),
+
 			FILES_LIST_HEADER_SELECT_ALL_CHECKBOX_ID,
 		}
 	},
diff --git a/apps/files/src/components/FilesListTableHeaderActions.vue b/apps/files/src/components/FilesListTableHeaderActions.vue
index 0f5a9e34ec42b..84d9ee6854acb 100644
--- a/apps/files/src/components/FilesListTableHeaderActions.vue
+++ b/apps/files/src/components/FilesListTableHeaderActions.vue
@@ -6,7 +6,7 @@
 	<div class="files-list__column files-list__row-actions-batch" data-cy-files-list-selection-actions>
 		<NcActions
 			ref="actionsMenu"
-			:open.sync="openedMenu"
+			v-model:open="openedMenu"
 			container="#app-content-vue"
 			:boundaries-element="boundariesElement"
 			:disabled="!!loading || areSomeNodesLoading"
@@ -315,7 +315,7 @@ export default defineComponent({
 				// Set loading markers
 				this.loading = action.id
 				this.nodes.forEach((node) => {
-					this.$set(node, 'status', NodeStatus.LOADING)
+					node.status = NodeStatus.LOADING
 				})
 
 				// Dispatch action execution
@@ -355,7 +355,7 @@ export default defineComponent({
 				// Remove loading markers
 				this.loading = null
 				this.nodes.forEach((node) => {
-					this.$set(node, 'status', undefined)
+					node.status = undefined
 				})
 			}
 		},
diff --git a/apps/files/src/components/FilesListTableHeaderButton.vue b/apps/files/src/components/FilesListTableHeaderButton.vue
index c37c685446b2f..dea93fa79b76f 100644
--- a/apps/files/src/components/FilesListTableHeaderButton.vue
+++ b/apps/files/src/components/FilesListTableHeaderButton.vue
@@ -21,43 +21,28 @@
 	</NcButton>
 </template>
 
-<script lang="ts">
-import { translate } from '@nextcloud/l10n'
-import { defineComponent } from 'vue'
+<script setup lang="ts">
 import NcButton from '@nextcloud/vue/components/NcButton'
 import MenuDown from 'vue-material-design-icons/MenuDown.vue'
 import MenuUp from 'vue-material-design-icons/MenuUp.vue'
-import filesSortingMixin from '../mixins/filesSorting.ts'
+import { useFilesSorting } from '../composables/filesSorting.ts'
 
-export default defineComponent({
-	name: 'FilesListTableHeaderButton',
+defineProps<{
+	/**
+	 * The display name of the column this button represents.
+	 */
+	name: string
+	/**
+	 * The sorting mode this button represents.
+	 */
+	mode: string
+}>()
 
-	components: {
-		MenuDown,
-		MenuUp,
-		NcButton,
-	},
-
-	mixins: [
-		filesSortingMixin,
-	],
-
-	props: {
-		name: {
-			type: String,
-			required: true,
-		},
-
-		mode: {
-			type: String,
-			required: true,
-		},
-	},
-
-	methods: {
-		t: translate,
-	},
-})
+const {
+	sortingMode,
+	isAscSorting,
+	toggleSortBy,
+} = useFilesSorting()
 </script>
 
 <style scoped lang="scss">
diff --git a/apps/files/src/components/FilesNavigationListItem.vue b/apps/files/src/components/FilesNavigationListItem.vue
index deaf5e0174869..7e0169c670bea 100644
--- a/apps/files/src/components/FilesNavigationListItem.vue
+++ b/apps/files/src/components/FilesNavigationListItem.vue
@@ -63,7 +63,7 @@ const sortedChildViews = computed(() => childViews.value.slice().sort((a, b) =>
 }))
 const hasChildViews = computed(() => childViews.value.length > 0)
 const activeViewId = inject('currentNavigationView', ref<string | undefined>(undefined))
-const isActiveView = computed(() => activeViewId.value.id === props.view.id)
+const isActiveView = computed(() => activeViewId.value === props.view.id)
 
 const navigationRoute = computed(() => {
 	if (props.view.params) {
@@ -130,21 +130,15 @@ const collator = Intl.Collator(
 	[getLanguage(), getCanonicalLocale()],
 	{ numeric: true, usage: 'sort' },
 )
-
-// TODO: Remove this with Vue 3 - the name is inferred by the filename!
-export default {
-	name: 'FilesNavigationListItem',
-}
 </script>
 
 <template>
 	<NcAppNavigationItem
 		class="files-navigation__item"
+		:data-cy-files-navigation-item="view.id"
 		:active="isActiveView"
-		allow-collapse
+		allowCollapse
 		:loading="isLoading"
-		:data-cy-files-navigation-item="view.id"
-		:exact="hasChildViews"
 		:name="view.name"
 		:open="isExpanded"
 		:pinned="view.sticky"
@@ -154,17 +148,13 @@ export default {
 			<NcIconSvgWrapper :svg="view.icon" />
 		</template>
 
-		<!-- Hack to force the collapse icon to be displayed -->
-		<li
-			v-if="!hasChildViews && !childViewsLoaded && view.loadChildViews"
-			v-show="false"
-			role="presentation" />
-
 		<!-- Recursively nest child views -->
-		<FilesNavigationListItem
-			v-for="childView in sortedChildViews"
-			:key="childView.id"
-			:level="level + 1"
-			:view="childView" />
+		<template v-if="hasChildViews || (!childViewsLoaded && view.loadChildViews)" #default>
+			<FilesNavigationListItem
+				v-for="childView in sortedChildViews"
+				:key="childView.id"
+				:level="level + 1"
+				:view="childView" />
+		</template>
 	</NcAppNavigationItem>
 </template>
diff --git a/apps/files/src/components/FilesNavigationSearch.vue b/apps/files/src/components/FilesNavigationSearch.vue
index 0f66d55af96e7..317e3e3f45d53 100644
--- a/apps/files/src/components/FilesNavigationSearch.vue
+++ b/apps/files/src/components/FilesNavigationSearch.vue
@@ -7,11 +7,11 @@
 import { mdiMagnify, mdiSearchWeb } from '@mdi/js'
 import { t } from '@nextcloud/l10n'
 import { computed } from 'vue'
+import { onBeforeRouteUpdate } from 'vue-router'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcAppNavigationSearch from '@nextcloud/vue/components/NcAppNavigationSearch'
 import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
-import { onBeforeNavigation } from '../composables/useBeforeNavigation.ts'
 import { useActiveStore } from '../store/active.ts'
 import { useSearchStore } from '../store/search.ts'
 import { VIEW_ID } from '../views/search.ts'
@@ -20,10 +20,9 @@ const activeStore = useActiveStore()
 const searchStore = useSearchStore()
 
 /**
- * When the route is changed from search view to something different
- * we need to clear the search box.
+ * When the route is changed from search view to something different we need to clear the search box.
  */
-onBeforeNavigation((to, from, next) => {
+onBeforeRouteUpdate((to, from) => {
 	if (to.params.view !== VIEW_ID
 		&& (from.params.view === VIEW_ID || from.query.dir !== to.query.dir)) {
 		// we are leaving the search view or navigate to another directory -> unset the query
@@ -32,17 +31,15 @@ onBeforeNavigation((to, from, next) => {
 	} else if (to.params.view === VIEW_ID && from.params.view === VIEW_ID) {
 		// fix the query if the user refreshed the view
 		if (searchStore.query && !to.query.query) {
-			// @ts-expect-error This is a weird issue with vue-router v4 and will be fixed in v5 (vue 3)
-			return next({
+			return {
 				...to,
 				query: {
 					...to.query,
 					query: searchStore.query,
 				},
-			})
+			}
 		}
 	}
-	next()
 })
 
 /**
@@ -69,13 +66,13 @@ const searchLabel = computed(() => {
 				<template #icon>
 					<NcIconSvgWrapper :path="searchStore.scope === 'globally' ? mdiSearchWeb : mdiMagnify" />
 				</template>
-				<NcActionButton close-after-click @click="searchStore.scope = 'filter'">
+				<NcActionButton closeAfterClick @click="searchStore.scope = 'filter'">
 					<template #icon>
 						<NcIconSvgWrapper :path="mdiMagnify" />
 					</template>
 					{{ t('files', 'Search here') }}
 				</NcActionButton>
-				<NcActionButton close-after-click @click="searchStore.scope = 'globally'">
+				<NcActionButton closeAfterClick @click="searchStore.scope = 'globally'">
 					<template #icon>
 						<NcIconSvgWrapper :path="mdiSearchWeb" />
 					</template>
diff --git a/apps/files/src/components/NavigationQuota.vue b/apps/files/src/components/NavigationQuota.vue
index 90f2149621e7f..758bbe31bd9d5 100644
--- a/apps/files/src/components/NavigationQuota.vue
+++ b/apps/files/src/components/NavigationQuota.vue
@@ -2,163 +2,157 @@
  - SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  - SPDX-License-Identifier: AGPL-3.0-or-later
  -->
-<template>
-	<NcAppNavigationItem
-		v-if="storageStats"
-		:aria-description="t('files', 'Storage information')"
-		:class="{ 'app-navigation-entry__settings-quota--not-unlimited': storageStats.quota >= 0 }"
-		:loading="loadingStorageStats"
-		:name="storageStatsTitle"
-		:title="storageStatsTooltip"
-		class="app-navigation-entry__settings-quota"
-		data-cy-files-navigation-settings-quota
-		@click.stop.prevent="debounceUpdateStorageStats">
-		<ChartPie slot="icon" :size="20" />
 
-		<!-- Progress bar -->
-		<NcProgressBar
-			v-if="storageStats.quota >= 0"
-			slot="extra"
-			:aria-label="t('files', 'Storage quota')"
-			:error="storageStats.relative > 80"
-			:value="Math.min(storageStats.relative, 100)" />
-	</NcAppNavigationItem>
-</template>
-
-<script>
+<script setup lang="ts">
 import axios from '@nextcloud/axios'
 import { showError } from '@nextcloud/dialogs'
-import { subscribe } from '@nextcloud/event-bus'
+import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { formatFileSize } from '@nextcloud/files'
 import { loadState } from '@nextcloud/initial-state'
-import { translate } from '@nextcloud/l10n'
+import { t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
-import { debounce, throttle } from 'throttle-debounce'
+import { useThrottleFn } from '@vueuse/core'
+import { computed, onBeforeMount, onMounted, onUnmounted, ref } from 'vue'
 import NcAppNavigationItem from '@nextcloud/vue/components/NcAppNavigationItem'
 import NcProgressBar from '@nextcloud/vue/components/NcProgressBar'
 import ChartPie from 'vue-material-design-icons/ChartPieOutline.vue'
 import { logger } from '../utils/logger.ts'
 
-export default {
-	name: 'NavigationQuota',
+type StorageStats = {
+	used: number
+	free: number
+	total: number
+	quota: number
+	relative: number
+}
+
+const loadingStorageStats = ref(false)
+const storageStats = ref(loadState<StorageStats | null>('files', 'storageStats', null))
+
+const storageStatsTitle = computed(() => {
+	const usedQuotaByte = formatFileSize(storageStats.value?.used ?? 0, false, false)
+	const quotaByte = formatFileSize(storageStats.value?.total ?? 0, false, false)
 
-	components: {
-		ChartPie,
-		NcAppNavigationItem,
-		NcProgressBar,
-	},
+	// If no quota set
+	if (storageStats.value === null || storageStats.value?.quota < 0) {
+		return t('files', '{usedQuotaByte} used', { usedQuotaByte })
+	}
 
-	data() {
-		return {
-			loadingStorageStats: false,
-			storageStats: loadState('files', 'storageStats', null),
+	return t('files', '{used} of {quota} used', {
+		used: usedQuotaByte,
+		quota: quotaByte,
+	})
+})
+
+const storageStatsTooltip = computed(() => {
+	if (!storageStats.value?.relative) {
+		return ''
+	}
+
+	return t('files', '{relative}% used', storageStats.value)
+})
+
+const throttleUpdateStorageStats = useThrottleFn(updateStorageStats, 2000)
+onBeforeMount(() => {
+	subscribe('files:node:created', throttleUpdateStorageStats)
+	subscribe('files:node:deleted', throttleUpdateStorageStats)
+	subscribe('files:node:moved', throttleUpdateStorageStats)
+	subscribe('files:node:updated', throttleUpdateStorageStats)
+})
+onUnmounted(() => {
+	unsubscribe('files:node:created', throttleUpdateStorageStats)
+	unsubscribe('files:node:deleted', throttleUpdateStorageStats)
+	unsubscribe('files:node:moved', throttleUpdateStorageStats)
+	unsubscribe('files:node:updated', throttleUpdateStorageStats)
+})
+
+onMounted(() => {
+	// If the user has a quota set, warn if the available account storage is <=0
+	//
+	// NOTE: This doesn't catch situations where actual *server*
+	// disk (non-quota) space is low, but those should probably
+	// be handled differently anyway since a regular user can't
+	// can't do much about them (If we did want to indicate server disk
+	// space matters to users, we'd probably want to use a warning
+	// specific to that situation anyhow. So this covers warning covers
+	// our primary day-to-day concern (individual account quota usage).
+	//
+	if (storageStats.value && storageStats.value?.quota > 0 && storageStats.value?.free === 0) {
+		showStorageFullWarning()
+	}
+})
+
+/**
+ * Update the storage stats
+ * Throttled at max 1 refresh per minute
+ *
+ * @param event - If user interaction
+ */
+async function updateStorageStats(event?: unknown) {
+	if (loadingStorageStats.value) {
+		return
+	}
+
+	loadingStorageStats.value = true
+	try {
+		const response = await axios.get(generateUrl('/apps/files/api/v1/stats'))
+		if (!response?.data?.data) {
+			throw new Error('Invalid storage stats')
+		}
+
+		// Warn the user if the available account storage changed from > 0 to 0
+		// (unless only because quota was intentionally set to 0 by admin in the interim)
+		if (storageStats.value && storageStats.value?.free > 0 && response.data.data?.free === 0 && response.data.data?.quota > 0) {
+			showStorageFullWarning()
 		}
-	},
-
-	computed: {
-		storageStatsTitle() {
-			const usedQuotaByte = formatFileSize(this.storageStats?.used, false, false)
-			const quotaByte = formatFileSize(this.storageStats?.total, false, false)
-
-			// If no quota set
-			if (this.storageStats?.quota < 0) {
-				return this.t('files', '{usedQuotaByte} used', { usedQuotaByte })
-			}
-
-			return this.t('files', '{used} of {quota} used', {
-				used: usedQuotaByte,
-				quota: quotaByte,
-			})
-		},
-
-		storageStatsTooltip() {
-			if (!this.storageStats.relative) {
-				return ''
-			}
-
-			return this.t('files', '{relative}% used', this.storageStats)
-		},
-	},
-
-	beforeMount() {
-		subscribe('files:node:created', this.throttleUpdateStorageStats)
-		subscribe('files:node:deleted', this.throttleUpdateStorageStats)
-		subscribe('files:node:moved', this.throttleUpdateStorageStats)
-		subscribe('files:node:updated', this.throttleUpdateStorageStats)
-	},
-
-	mounted() {
-		// If the user has a quota set, warn if the available account storage is <=0
-		//
-		// NOTE: This doesn't catch situations where actual *server*
-		// disk (non-quota) space is low, but those should probably
-		// be handled differently anyway since a regular user can't
-		// can't do much about them (If we did want to indicate server disk
-		// space matters to users, we'd probably want to use a warning
-		// specific to that situation anyhow. So this covers warning covers
-		// our primary day-to-day concern (individual account quota usage).
-		//
-		if (this.storageStats?.quota > 0 && this.storageStats?.free === 0) {
-			this.showStorageFullWarning()
+
+		storageStats.value = response.data.data
+	} catch (error) {
+		logger.error('Could not refresh storage stats', { error })
+		// Only show to the user if it was manually triggered
+		if (event) {
+			showError(t('files', 'Could not refresh storage stats'))
 		}
-	},
-
-	methods: {
-		// From user input
-		debounceUpdateStorageStats: debounce(200, function(event) {
-			this.updateStorageStats(event)
-		}),
-
-		// From interval or event bus
-		throttleUpdateStorageStats: throttle(1000, function(event) {
-			this.updateStorageStats(event)
-		}),
-
-		/**
-		 * Update the storage stats
-		 * Throttled at max 1 refresh per minute
-		 *
-		 * @param {Event} [event] if user interaction
-		 */
-		async updateStorageStats(event = null) {
-			if (this.loadingStorageStats) {
-				return
-			}
-
-			this.loadingStorageStats = true
-			try {
-				const response = await axios.get(generateUrl('/apps/files/api/v1/stats'))
-				if (!response?.data?.data) {
-					throw new Error('Invalid storage stats')
-				}
-
-				// Warn the user if the available account storage changed from > 0 to 0
-				// (unless only because quota was intentionally set to 0 by admin in the interim)
-				if (this.storageStats?.free > 0 && response.data.data?.free === 0 && response.data.data?.quota > 0) {
-					this.showStorageFullWarning()
-				}
-
-				this.storageStats = response.data.data
-			} catch (error) {
-				logger.error('Could not refresh storage stats', { error })
-				// Only show to the user if it was manually triggered
-				if (event) {
-					showError(t('files', 'Could not refresh storage stats'))
-				}
-			} finally {
-				this.loadingStorageStats = false
-			}
-		},
-
-		showStorageFullWarning() {
-			showError(this.t('files', 'Your storage is full, files can not be updated or synced anymore!'))
-		},
-
-		t: translate,
-	},
+	} finally {
+		loadingStorageStats.value = false
+	}
+}
+
+/**
+ * Show a warning that the user's storage is full and files can not be updated or synced anymore
+ */
+function showStorageFullWarning() {
+	showError(t('files', 'Your storage is full, files can not be updated or synced anymore!'))
 }
 </script>
 
+<template>
+	<NcAppNavigationItem
+		v-if="storageStats"
+		:aria-description="t('files', 'Storage information')"
+		:class="{ 'app-navigation-entry__settings-quota--not-unlimited': storageStats.quota >= 0 }"
+		:loading="loadingStorageStats"
+		:name="storageStatsTitle"
+		:title="storageStatsTooltip"
+		class="app-navigation-entry__settings-quota"
+		data-cy-files-navigation-settings-quota
+		@click.stop.prevent="throttleUpdateStorageStats">
+		<template #icon>
+			<ChartPie :size="20" />
+		</template>
+
+		<!-- Progress bar -->
+		<template #extra>
+			<NcProgressBar
+				v-if="storageStats.quota >= 0"
+
+				:aria-label="t('files', 'Storage quota')"
+				:error="storageStats.relative > 80"
+				:value="Math.min(storageStats.relative, 100)" />
+		</template>
+	</NcAppNavigationItem>
+</template>
+
 <style lang="scss" scoped>
 // User storage stats display
 .app-navigation-entry__settings-quota {
diff --git a/apps/files/src/components/NcUploadPicker.vue b/apps/files/src/components/NcUploadPicker.vue
new file mode 100644
index 0000000000000..f1e30c6f2c16e
--- /dev/null
+++ b/apps/files/src/components/NcUploadPicker.vue
@@ -0,0 +1,109 @@
+<script setup lang="ts">
+import type { IFolder, INode, NewMenuEntry } from '@nextcloud/files'
+import type { FilePickerItem, FilePickerItemGroup } from '@nextcloud/vue/components/NcFilePicker'
+
+import { getNewFileMenu, NewMenuEntryCategory } from '@nextcloud/files'
+import { getUploader } from '@nextcloud/files/upload'
+import { t } from '@nextcloud/l10n'
+import { computed } from 'vue'
+import NcFilePicker from '@nextcloud/vue/components/NcFilePicker'
+
+const { folder, context } = defineProps<{
+	/** Allow uploading to the current directory */
+	directory?: boolean
+	/** Whether to show only the icon */
+	iconOnly?: boolean
+	/** Whether to allow multiple file selection */
+	multiple?: boolean
+	/** The current folder */
+	folder: IFolder
+	/** The context for the upload (content of the folder) */
+	context: INode[]
+}>()
+
+const actions = computed(() => {
+	const menu = getNewFileMenu()
+	const entries = menu.getEntries()
+		.filter((entry) => !entry.enabled || entry.enabled(folder))
+		.sort((a, b) => a.order !== undefined && b.order !== undefined ? a.order - b.order : (a.order !== undefined ? -1 : 1))
+
+	const groups: FilePickerItemGroup[] = []
+	const uploadEntries = entries.filter((entry) => entry.category === NewMenuEntryCategory.UploadFromDevice)
+	if (uploadEntries.length) {
+		groups.push({
+			caption: t('files', 'Upload from device'),
+			actions: uploadEntries.map((entry) => ({
+				label: entry.displayName,
+				iconSvg: entry.iconSvgInline,
+				onClick: () => handleActionClick(entry),
+			} as FilePickerItem)),
+		})
+	}
+
+	const createNewEntries = entries.filter((entry) => entry.category === NewMenuEntryCategory.CreateNew)
+	if (createNewEntries.length) {
+		groups.push({
+			caption: t('files', 'Create new'),
+			actions: createNewEntries.map((entry) => ({
+				label: entry.displayName,
+				iconSvg: entry.iconSvgInline,
+				onClick: () => handleActionClick(entry),
+			} as FilePickerItem)),
+		})
+	}
+
+	const otherEntries = entries.filter((entry) => entry.category !== NewMenuEntryCategory.UploadFromDevice && entry.category !== NewMenuEntryCategory.CreateNew)
+	if (otherEntries.length) {
+		groups.push({
+			caption: t('files', 'Other'),
+			actions: otherEntries.map((entry) => ({
+				label: entry.displayName,
+				iconSvg: entry.iconSvgInline,
+				onClick: () => handleActionClick(entry),
+			} as FilePickerItem)),
+		})
+	}
+	return groups
+})
+
+/**
+ * Handle click on a menu entry
+ *
+ * @param entry - The menu entry that was clicked
+ */
+function handleActionClick(entry: NewMenuEntry) {
+	entry.handler(folder, context)
+}
+
+/**
+ * Hanlde picking files from the file picker
+ *
+ * @param files - The picked files
+ */
+async function onPick(files: File[]) {
+	const uploader = getUploader()
+	await uploader.batchUpload('', files, { callback: handleConflicts, root: folder.path })
+}
+
+/**
+ * Handle conflicts that occur during upload
+ *
+ * @param nodes - The nodes that are being uploaded
+ * @param currentPath - The current path
+ */
+async function handleConflicts(nodes: string[], currentPath: string): Promise<false | Record<string, string>> {
+	console.error('TODO: HANDLE CONFLICTS', { nodes, currentPath })
+	return Object.fromEntries(nodes.map((node) => [node, node]))
+}
+</script>
+
+<template>
+	<NcFilePicker
+		:label="t('files', 'New')"
+		:actions
+		:directory
+		:iconOnly
+		:multiple
+		variant="primary"
+		@pick="onPick" />
+</template>
diff --git a/apps/files/src/components/VirtualList.vue b/apps/files/src/components/VirtualList.vue
index 2af11785b027d..e4387a058de0b 100644
--- a/apps/files/src/components/VirtualList.vue
+++ b/apps/files/src/components/VirtualList.vue
@@ -17,7 +17,7 @@
 			<slot name="filters" />
 		</div>
 
-		<div v-if="!!$scopedSlots['header-overlay']" class="files-list__thead-overlay">
+		<div v-if="!!$slots['header-overlay']" class="files-list__thead-overlay">
 			<slot name="header-overlay" />
 		</div>
 
@@ -32,7 +32,7 @@
 			:inert="dataSources.length === 0"
 			class="files-list__table"
 			:class="{
-				'files-list__table--with-thead-overlay': !!$scopedSlots['header-overlay'],
+				'files-list__table--with-thead-overlay': !!$slots['header-overlay'],
 				'files-list__table--hidden': dataSources.length === 0,
 			}">
 			<!-- Accessibility table caption for screen readers -->
@@ -324,7 +324,7 @@ export default defineComponent({
 		})
 	},
 
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.resizeObserver) {
 			this.resizeObserver.disconnect()
 		}
diff --git a/apps/files/src/composables/filesSorting.ts b/apps/files/src/composables/filesSorting.ts
new file mode 100644
index 0000000000000..2acaff4c01bc6
--- /dev/null
+++ b/apps/files/src/composables/filesSorting.ts
@@ -0,0 +1,65 @@
+/*!
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { computed } from 'vue'
+import { useActiveStore } from '../store/active.ts'
+import { useViewConfigStore } from '../store/viewConfig.ts'
+
+/**
+ * Composable to get and set the sorting mode and direction for the current view.
+ */
+export function useFilesSorting() {
+	const activeStore = useActiveStore()
+	const viewConfigStore = useViewConfigStore()
+
+	/**
+	 * Get the sorting mode for the current view
+	 */
+	const sortingMode = computed(() => {
+		if (!activeStore.activeView) {
+			return 'basename'
+		}
+
+		return viewConfigStore.getConfig(activeStore.activeView.id)?.sorting_mode as string
+			|| activeStore.activeView?.defaultSortKey
+			|| 'basename'
+	})
+
+	/**
+	 * Get the sorting direction for the current view
+	 */
+	const isAscSorting = computed(() => {
+		if (!activeStore.activeView) {
+			return true
+		}
+
+		const sortingDirection = viewConfigStore.getConfig(activeStore.activeView.id)?.sorting_direction
+		return sortingDirection !== 'desc'
+	})
+
+	/**
+	 * Toogle sorting by a given key.
+	 *
+	 * If we're already sorting by this key, toggle the direction.
+	 * Otherwise, sort ASC by this key.
+	 *
+	 * @param key - The key to sort by
+	 */
+	function toggleSortBy(key: string) {
+		// If we're already sorting by this key, flip the direction
+		if (sortingMode.value === key) {
+			viewConfigStore.toggleSortingDirection(activeStore.activeView?.id)
+			return
+		}
+		// else sort ASC by this new key
+		viewConfigStore.setSortingBy(key, activeStore.activeView?.id)
+	}
+
+	return {
+		toggleSortBy,
+		sortingMode,
+		isAscSorting,
+	}
+}
diff --git a/apps/files/src/composables/useBeforeNavigation.ts b/apps/files/src/composables/useBeforeNavigation.ts
index 38b72e40fb33a..2856a733eec0a 100644
--- a/apps/files/src/composables/useBeforeNavigation.ts
+++ b/apps/files/src/composables/useBeforeNavigation.ts
@@ -6,7 +6,7 @@
 import type { NavigationGuard } from 'vue-router'
 
 import { onUnmounted } from 'vue'
-import { useRouter } from 'vue-router/composables'
+import { useRouter } from 'vue-router'
 
 /**
  * Helper until we use Vue-Router v4 (Vue3).
diff --git a/apps/files/src/composables/useFileActions.ts b/apps/files/src/composables/useFileActions.ts
index 05a77d701233d..7308fafac0566 100644
--- a/apps/files/src/composables/useFileActions.ts
+++ b/apps/files/src/composables/useFileActions.ts
@@ -4,12 +4,10 @@
  */
 
 import type { ActionContext, IFileAction } from '@nextcloud/files'
-import type { MaybeRefOrGetter } from '@vueuse/core'
-import type { Ref } from 'vue'
+import type { MaybeRefOrGetter, Ref } from 'vue'
 
 import { getFileActions, getFilesRegistry } from '@nextcloud/files'
-import { toValue } from '@vueuse/core'
-import { computed, readonly, ref } from 'vue'
+import { computed, readonly, ref, toValue } from 'vue'
 
 const actions = ref<IFileAction[] | undefined>()
 
diff --git a/apps/files/src/composables/useFileListActions.ts b/apps/files/src/composables/useFileListActions.ts
index 1dda302f61824..24cb2c5d3514c 100644
--- a/apps/files/src/composables/useFileListActions.ts
+++ b/apps/files/src/composables/useFileListActions.ts
@@ -4,12 +4,10 @@
  */
 
 import type { IFileListAction, IFolder, INode, IView } from '@nextcloud/files'
-import type { MaybeRefOrGetter } from '@vueuse/core'
-import type { ComputedRef } from 'vue'
+import type { ComputedRef, MaybeRefOrGetter } from 'vue'
 
 import { getFileListActions, getFilesRegistry } from '@nextcloud/files'
-import { toValue } from '@vueuse/core'
-import { computed, ref } from 'vue'
+import { computed, ref, toValue } from 'vue'
 
 const actions = ref<IFileListAction[]>()
 const sorted = computed(() => [...(actions.value ?? [])].sort((a, b) => a.order - b.order))
diff --git a/apps/files/src/composables/useHotKeys.spec.ts b/apps/files/src/composables/useHotKeys.spec.ts
index a675bb2f5e35a..89fe0604dbdcd 100644
--- a/apps/files/src/composables/useHotKeys.spec.ts
+++ b/apps/files/src/composables/useHotKeys.spec.ts
@@ -4,17 +4,17 @@
  */
 
 import type { View } from '@nextcloud/files'
-import type { Location } from 'vue-router'
+import type { RouteLocation } from 'vue-router'
 
 import axios from '@nextcloud/axios'
 import { File, Folder, Permission, registerFileAction } from '@nextcloud/files'
-import { enableAutoDestroy, mount } from '@vue/test-utils'
+import { enableAutoUnmount, mount } from '@vue/test-utils'
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
 import { defineComponent, nextTick } from 'vue'
 import { action as deleteAction } from '../actions/deleteAction.ts'
 import { useActiveStore } from '../store/active.ts'
 import { useFilesStore } from '../store/files.ts'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 import { useUserConfigStore } from '../store/userconfig.ts'
 import { useHotKeys } from './useHotKeys.ts'
 
@@ -32,7 +32,7 @@ const route = vi.hoisted(() => ({
 
 // mocked router
 const router = vi.hoisted(() => ({
-	push: vi.fn<(route: Location) => void>(),
+	push: vi.fn<(route: RouteLocation) => void>(),
 }))
 
 vi.mock('../actions/sidebarAction.ts', { spy: true })
@@ -40,7 +40,7 @@ vi.mock('../actions/deleteAction.ts', { spy: true })
 vi.mock('../actions/favoriteAction.ts', { spy: true })
 vi.mock('../actions/renameAction.ts', { spy: true })
 
-vi.mock('vue-router/composables', () => ({
+vi.mock('vue-router', () => ({
 	useRoute: vi.fn(() => route),
 	useRouter: vi.fn(() => router),
 }))
@@ -72,12 +72,12 @@ beforeAll(() => {
 })
 
 describe('HotKeysService testing', () => {
-	const activeStore = useActiveStore(getPinia())
+	const activeStore = useActiveStore(pinia)
 
 	let initialState: HTMLInputElement
 	let component: ReturnType<typeof mount>
 
-	enableAutoDestroy(afterEach)
+	enableAutoUnmount(afterEach)
 
 	afterEach(() => {
 		document.body.removeChild(initialState)
@@ -105,7 +105,7 @@ describe('HotKeysService testing', () => {
 			permissions: Permission.CREATE,
 		})
 
-		const files = useFilesStore(getPinia())
+		const files = useFilesStore(pinia)
 		files.setRoot({ service: 'files', root })
 
 		// Setting the view first as it reset the active node
@@ -129,7 +129,7 @@ describe('HotKeysService testing', () => {
 	// tests for register action handling
 
 	it('registeres actions', () => {
-		component.destroy()
+		component.unmount()
 		registerFileAction(deleteAction)
 		component = mount(TestComponent)
 
@@ -158,7 +158,7 @@ describe('HotKeysService testing', () => {
 	it('Pressing v should toggle grid view', async () => {
 		vi.spyOn(axios, 'put').mockImplementationOnce(() => Promise.resolve())
 
-		const userConfigStore = useUserConfigStore(getPinia())
+		const userConfigStore = useUserConfigStore(pinia)
 		userConfigStore.userConfig.grid_view = false
 		expect(userConfigStore.userConfig.grid_view).toBe(false)
 
@@ -174,7 +174,7 @@ describe('HotKeysService testing', () => {
 	])('Pressing v with modifier key %s should not toggle grid view', async (modifier: string) => {
 		vi.spyOn(axios, 'put').mockImplementationOnce(() => Promise.resolve())
 
-		const userConfigStore = useUserConfigStore(getPinia())
+		const userConfigStore = useUserConfigStore(pinia)
 		userConfigStore.userConfig.grid_view = false
 		expect(userConfigStore.userConfig.grid_view).toBe(false)
 
diff --git a/apps/files/src/composables/useHotKeys.ts b/apps/files/src/composables/useHotKeys.ts
index 9630ac5ae74e2..f23cde99b4a07 100644
--- a/apps/files/src/composables/useHotKeys.ts
+++ b/apps/files/src/composables/useHotKeys.ts
@@ -6,7 +6,7 @@
 import { getFileActions } from '@nextcloud/files'
 import { useHotKey } from '@nextcloud/vue/composables/useHotKey'
 import { dirname } from 'path'
-import { useRoute, useRouter } from 'vue-router/composables'
+import { useRoute, useRouter } from 'vue-router'
 import { useUserConfigStore } from '../store/userconfig.ts'
 import { executeAction } from '../utils/actionUtils.ts'
 import { logger } from '../utils/logger.ts'
diff --git a/apps/files/src/composables/usePreviewImage.ts b/apps/files/src/composables/usePreviewImage.ts
index 692474113ae8d..f515d8f960500 100644
--- a/apps/files/src/composables/usePreviewImage.ts
+++ b/apps/files/src/composables/usePreviewImage.ts
@@ -4,13 +4,12 @@
  */
 
 import type { INode } from '@nextcloud/files'
-import type { MaybeRefOrGetter } from '@vueuse/core'
+import type { MaybeRefOrGetter } from 'vue'
 
 import { FileType } from '@nextcloud/files'
 import { generateUrl } from '@nextcloud/router'
 import { getSharingToken, isPublicShare } from '@nextcloud/sharing/public'
-import { toValue } from '@vueuse/core'
-import { computed } from 'vue'
+import { computed, toValue } from 'vue'
 
 /**
  * Get the preview URL for a given node.
diff --git a/apps/files/src/composables/useRouteParameters.ts b/apps/files/src/composables/useRouteParameters.ts
index ec94928abcb6f..e3e5cc4d6feca 100644
--- a/apps/files/src/composables/useRouteParameters.ts
+++ b/apps/files/src/composables/useRouteParameters.ts
@@ -4,7 +4,7 @@
  */
 
 import { computed } from 'vue'
-import { useRoute } from 'vue-router/composables'
+import { useRoute } from 'vue-router'
 
 /**
  * Get information about the current route
@@ -23,7 +23,7 @@ export function useRouteParameters() {
 	 * Get the current fileId used on the route
 	 */
 	const fileId = computed<number | null>(() => {
-		const fileId = Number.parseInt(route.params.fileid ?? '0') || null
+		const fileId = Number.parseInt([route.params.fileid ?? '0'].flat()[0]) || null
 		return Number.isNaN(fileId) ? null : fileId
 	})
 
diff --git a/apps/files/src/filters/FilenameFilter.ts b/apps/files/src/filters/FilenameFilter.ts
index 4bbc3c10da570..4985b7fd4a963 100644
--- a/apps/files/src/filters/FilenameFilter.ts
+++ b/apps/files/src/filters/FilenameFilter.ts
@@ -7,7 +7,7 @@ import type { IFileListFilterChip, INode } from '@nextcloud/files'
 
 import { subscribe } from '@nextcloud/event-bus'
 import { FileListFilter, registerFileListFilter } from '@nextcloud/files'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 import { useSearchStore } from '../store/search.ts'
 
 /**
@@ -55,7 +55,7 @@ class FilenameFilter extends FileListFilter {
 				})
 			} else {
 				// make sure to also reset the search store when pressing the "X" on the filter chip
-				const store = useSearchStore(getPinia())
+				const store = useSearchStore(pinia)
 				if (store.scope === 'filter') {
 					store.query = ''
 				}
diff --git a/apps/files/src/filters/ModifiedFilter.ts b/apps/files/src/filters/ModifiedFilter.ts
index e78dacbd37d36..95bbd36962e87 100644
--- a/apps/files/src/filters/ModifiedFilter.ts
+++ b/apps/files/src/filters/ModifiedFilter.ts
@@ -8,8 +8,7 @@ import type { IFileListFilterChip, IFileListFilterWithUi, INode } from '@nextclo
 import svgCalendarRangeOutline from '@mdi/svg/svg/calendar-range-outline.svg?raw'
 import { FileListFilter, registerFileListFilter } from '@nextcloud/files'
 import { t } from '@nextcloud/l10n'
-import wrap from '@vue/web-component-wrapper'
-import Vue from 'vue'
+import { defineCustomElement } from 'vue'
 import FileListFilterModified from '../components/FileListFilter/FileListFilterModified.vue'
 
 export interface ITimePreset {
@@ -21,7 +20,7 @@ export interface ITimePreset {
 const tagName = 'files-file-list-filter-modified'
 
 class ModifiedFilter extends FileListFilter implements IFileListFilterWithUi {
-	private currentInstance?: Vue
+	private currentInstance?: InstanceType<typeof FileListFilterModified>
 	private currentPreset?: ITimePreset
 
 	public readonly displayName = t('files', 'Modified')
@@ -72,20 +71,7 @@ export type { ModifiedFilter }
  * Register the file list filter by modification date
  */
 export function registerModifiedFilter() {
-	const WrappedComponent = wrap(Vue, FileListFilterModified)
-	// In Vue 2, wrap doesn't support disabling shadow :(
-	// Disable with a hack
-	Object.defineProperty(WrappedComponent.prototype, 'attachShadow', {
-		value() {
-			return this
-		},
-	})
-	Object.defineProperty(WrappedComponent.prototype, 'shadowRoot', {
-		get() {
-			return this
-		},
-	})
-
+	const WrappedComponent = defineCustomElement(FileListFilterModified, { shadowRoot: false })
 	customElements.define(tagName, WrappedComponent)
 	registerFileListFilter(new ModifiedFilter())
 }
diff --git a/apps/files/src/filters/TypeFilter.ts b/apps/files/src/filters/TypeFilter.ts
index a49d0935d5d42..cd92bfee06a61 100644
--- a/apps/files/src/filters/TypeFilter.ts
+++ b/apps/files/src/filters/TypeFilter.ts
@@ -8,8 +8,7 @@ import type { IFileListFilterChip, IFileListFilterWithUi, INode } from '@nextclo
 import svgFileOutline from '@mdi/svg/svg/file-outline.svg?raw'
 import { FileListFilter, registerFileListFilter } from '@nextcloud/files'
 import { t } from '@nextcloud/l10n'
-import wrap from '@vue/web-component-wrapper'
-import Vue from 'vue'
+import { defineCustomElement } from 'vue'
 import FileListFilterType from '../components/FileListFilter/FileListFilterType.vue'
 import { logger } from '../utils/logger.ts'
 
@@ -23,7 +22,6 @@ export interface ITypePreset {
 const tagName = 'files-file-list-filter-type'
 
 class TypeFilter extends FileListFilter implements IFileListFilterWithUi {
-	private currentInstance?: Vue
 	private currentPresets: ITypePreset[]
 
 	public readonly displayName = t('files', 'Type')
@@ -71,12 +69,6 @@ class TypeFilter extends FileListFilter implements IFileListFilterWithUi {
 		logger.debug('TypeFilter: setting presets', { presets })
 
 		this.currentPresets = presets ?? []
-		if (this.currentInstance !== undefined) {
-			// could be called before the instance was created
-			// (meaning the files list is not mounted yet)
-			this.currentInstance.$props.presets = presets
-		}
-
 		this.filterUpdated()
 
 		const chips: IFileListFilterChip[] = []
@@ -89,7 +81,7 @@ class TypeFilter extends FileListFilter implements IFileListFilterWithUi {
 				})
 			}
 		} else {
-			(this.currentInstance as { resetFilter: () => void } | undefined)?.resetFilter()
+			this.reset()
 		}
 		this.updateChips(chips)
 	}
@@ -113,20 +105,7 @@ export type { TypeFilter }
  * Register the file list filter by file type
  */
 export function registerTypeFilter() {
-	const WrappedComponent = wrap(Vue, FileListFilterType)
-	// In Vue 2, wrap doesn't support disabling shadow :(
-	// Disable with a hack
-	Object.defineProperty(WrappedComponent.prototype, 'attachShadow', {
-		value() {
-			return this
-		},
-	})
-	Object.defineProperty(WrappedComponent.prototype, 'shadowRoot', {
-		get() {
-			return this
-		},
-	})
-
+	const WrappedComponent = defineCustomElement(FileListFilterType, { shadowRoot: false })
 	window.customElements.define(tagName, WrappedComponent)
 	registerFileListFilter(new TypeFilter())
 }
diff --git a/apps/files/src/main-settings-admin.ts b/apps/files/src/main-settings-admin.ts
index 93db0c9c1869f..e5de867ee5ca3 100644
--- a/apps/files/src/main-settings-admin.ts
+++ b/apps/files/src/main-settings-admin.ts
@@ -3,14 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { getCSPNonce } from '@nextcloud/auth'
 import { t } from '@nextcloud/l10n'
-import Vue from 'vue'
+import { createApp } from 'vue'
 import PersonalSettings from './views/SettingsAdmin.vue'
 
-__webpack_nonce__ = getCSPNonce()
+import 'vite/modulepreload-polyfill'
 
-Vue.prototype.t = t
-const View = Vue.extend(PersonalSettings)
-const instance = new View()
-instance.$mount('#files-admin-settings')
+const app = createApp(PersonalSettings)
+app.config.globalProperties.t = t
+app.mount('#files-admin-settings')
diff --git a/apps/files/src/main-settings-personal.ts b/apps/files/src/main-settings-personal.ts
index 768b17d01c945..e48b558692daa 100644
--- a/apps/files/src/main-settings-personal.ts
+++ b/apps/files/src/main-settings-personal.ts
@@ -3,14 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { getCSPNonce } from '@nextcloud/auth'
 import { t } from '@nextcloud/l10n'
-import Vue from 'vue'
+import { createApp } from 'vue'
 import PersonalSettings from './components/PersonalSettings.vue'
 
-__webpack_nonce__ = getCSPNonce()
+import 'vite/modulepreload-polyfill'
 
-Vue.prototype.t = t
-const View = Vue.extend(PersonalSettings)
-const instance = new View()
-instance.$mount('#files-personal-settings')
+const app = createApp(PersonalSettings)
+app.config.globalProperties.t = t
+app.mount('#files-personal-settings')
diff --git a/apps/files/src/main.ts b/apps/files/src/main.ts
index bc76d8bcffcfc..6f508700842d8 100644
--- a/apps/files/src/main.ts
+++ b/apps/files/src/main.ts
@@ -3,17 +3,15 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { getCSPNonce } from '@nextcloud/auth'
-import { PiniaVuePlugin } from 'pinia'
-import Vue from 'vue'
+import { createApp } from 'vue'
 import FilesApp from './FilesApp.vue'
 import SettingsModel from './models/Setting.ts'
-import router from './router/router.ts'
+import { router } from './router/router.ts'
 import RouterService from './services/RouterService.ts'
 import SettingsService from './services/Settings.js'
-import { getPinia } from './store/index.ts'
+import { pinia } from './store/index.ts'
 
-__webpack_nonce__ = getCSPNonce()
+import 'vite/modulepreload-polyfill'
 
 // Init private and public Files namespace
 window.OCA.Files = window.OCA.Files ?? {}
@@ -25,16 +23,12 @@ if (!window.OCP.Files.Router) {
 	Object.assign(window.OCP.Files, { Router })
 }
 
-// Init Pinia store
-Vue.use(PiniaVuePlugin)
-
 // Init Files App Settings Service
 const Settings = new SettingsService()
 Object.assign(window.OCA.Files, { Settings })
 Object.assign(window.OCA.Files.Settings, { Setting: SettingsModel })
 
-const FilesAppVue = Vue.extend(FilesApp)
-new FilesAppVue({
-	router: (window.OCP.Files.Router as RouterService)._router,
-	pinia: getPinia(),
-}).$mount('#content')
+const app = createApp(FilesApp)
+app.use(pinia)
+app.use((window.OCP.Files.Router as RouterService)._router)
+app.mount('#content')
diff --git a/apps/files/src/mixins/filesSorting.ts b/apps/files/src/mixins/filesSorting.ts
deleted file mode 100644
index 92fc91197af83..0000000000000
--- a/apps/files/src/mixins/filesSorting.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
- * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import { mapState } from 'pinia'
-import Vue from 'vue'
-import { useActiveStore } from '../store/active.ts'
-import { useViewConfigStore } from '../store/viewConfig.ts'
-
-export default Vue.extend({
-	setup() {
-		const activeStore = useActiveStore()
-
-		return {
-			activeStore,
-		}
-	},
-
-	computed: {
-		...mapState(useViewConfigStore, ['getConfig', 'setSortingBy', 'toggleSortingDirection']),
-
-		/**
-		 * Get the sorting mode for the current view
-		 */
-		sortingMode(): string {
-			return this.getConfig(this.activeStore.activeView?.id)?.sorting_mode as string
-				|| this.activeStore.activeView?.defaultSortKey
-				|| 'basename'
-		},
-
-		/**
-		 * Get the sorting direction for the current view
-		 */
-		isAscSorting(): boolean {
-			const sortingDirection = this.getConfig(this.activeStore.activeView?.id)?.sorting_direction
-			return sortingDirection !== 'desc'
-		},
-	},
-
-	methods: {
-		toggleSortBy(key: string) {
-			// If we're already sorting by this key, flip the direction
-			if (this.sortingMode === key) {
-				this.toggleSortingDirection(this.activeStore.activeView?.id)
-				return
-			}
-			// else sort ASC by this new key
-			this.setSortingBy(key, this.activeStore.activeView?.id)
-		},
-	},
-})
diff --git a/apps/files/src/newMenu/newFromTemplate.ts b/apps/files/src/newMenu/newFromTemplate.ts
index 761319897ed30..1d7a07107f60d 100644
--- a/apps/files/src/newMenu/newFromTemplate.ts
+++ b/apps/files/src/newMenu/newFromTemplate.ts
@@ -4,19 +4,19 @@
  */
 
 import type { IFolder, INode, NewMenuEntry } from '@nextcloud/files'
-import type { ComponentInstance } from 'vue'
+import type { ComponentPublicInstance } from 'vue'
 import type { TemplateFile } from '../types.ts'
 
 import { addNewFileMenuEntry, Permission } from '@nextcloud/files'
 import { loadState } from '@nextcloud/initial-state'
 import { translate as t } from '@nextcloud/l10n'
 import { isPublicShare } from '@nextcloud/sharing/public'
-import Vue, { defineAsyncComponent } from 'vue'
+import { createApp, defineAsyncComponent, h } from 'vue'
 import { newNodeName } from '../utils/newNodeDialog.ts'
 
 // async to reduce bundle size
 const TemplatePickerVue = defineAsyncComponent(() => import('../views/TemplatePicker.vue'))
-let TemplatePicker: ComponentInstance & { open: (n: string, t: TemplateFile) => void } | null = null
+let TemplatePicker: ComponentPublicInstance & { open: (n: string, t: TemplateFile) => void } | null = null
 
 /**
  *
@@ -30,19 +30,14 @@ async function getTemplatePicker(context: IFolder) {
 		document.body.appendChild(mountingPoint)
 
 		// Init vue app
-		TemplatePicker = new Vue({
-			render: (h) => h(
-				TemplatePickerVue,
-				{
-					ref: 'picker',
-					props: {
-						parent: context,
-					},
-				},
-			),
+		const app = createApp({
 			methods: { open(...args) { this.$refs.picker.open(...args) } },
-			el: mountingPoint,
+			render: () => h(TemplatePickerVue, {
+				ref: 'picker',
+				parent: context,
+			}),
 		})
+		TemplatePicker = app.mount(mountingPoint) as ComponentPublicInstance & { open: (n: string, t: TemplateFile) => void }
 	}
 	return TemplatePicker
 }
diff --git a/apps/files/src/reference-files.ts b/apps/files/src/reference-files.ts
index 9981ed260d016..9dd5df1e7bbcc 100644
--- a/apps/files/src/reference-files.ts
+++ b/apps/files/src/reference-files.ts
@@ -3,39 +3,33 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import type { App } from 'vue'
+
 import { t } from '@nextcloud/l10n'
-import Vue from 'vue'
+import { createApp } from 'vue'
 import { NcCustomPickerRenderResult, registerCustomPickerElement, registerWidget } from '@nextcloud/vue/components/NcRichText'
 import FileReferencePickerElement from './views/FileReferencePickerElement.vue'
 import FileWidget from './views/ReferenceFileWidget.vue'
 
-Vue.mixin({
-	methods: {
-		t,
-	},
-})
-
 registerWidget('file', (el, { richObjectType, richObject, accessible, interactive }) => {
-	const Widget = Vue.extend(FileWidget)
-	new Widget({
-		propsData: {
-			richObjectType,
-			richObject,
-			accessible,
-			interactive,
-		},
-	}).$mount(el)
+	const app = createApp(FileWidget, {
+		richObjectType,
+		richObject,
+		accessible,
+		interactive,
+	})
+	app.mixin({ methods: { t } })
+	app.mount(el)
 }, () => {}, { hasInteractiveView: true })
 
 registerCustomPickerElement('files', (el, { providerId, accessible }) => {
-	const Element = Vue.extend(FileReferencePickerElement)
-	const vueElement = new Element({
-		propsData: {
-			providerId,
-			accessible,
-		},
-	}).$mount(el)
-	return new NcCustomPickerRenderResult(vueElement.$el, vueElement)
+	const app = createApp(FileReferencePickerElement, {
+		providerId,
+		accessible,
+	})
+	app.mixin({ methods: { t } })
+	app.mount(el)
+	return new NcCustomPickerRenderResult(el, app)
 }, (el, renderResult) => {
-	renderResult.object.$destroy()
+	(renderResult.object as App).unmount()
 })
diff --git a/apps/files/src/router/router.ts b/apps/files/src/router/router.ts
index 94becd075382e..01f9cba2e7357 100644
--- a/apps/files/src/router/router.ts
+++ b/apps/files/src/router/router.ts
@@ -4,61 +4,24 @@
  */
 
 import type { INode } from '@nextcloud/files'
-import type { RawLocation, Route } from 'vue-router'
 
 import { subscribe } from '@nextcloud/event-bus'
 import { generateUrl } from '@nextcloud/router'
 import { relative } from 'path'
-import queryString from 'query-string'
-import Vue from 'vue'
-import Router, { isNavigationFailure, NavigationFailureType } from 'vue-router'
+import { createRouter, createWebHistory, isNavigationFailure, NavigationFailureType } from 'vue-router'
 import { useFilesStore } from '../store/files.ts'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 import { usePathsStore } from '../store/paths.ts'
 import { defaultView } from '../utils/filesViews.ts'
 import { logger } from '../utils/logger.ts'
 
-Vue.use(Router)
-
-// Prevent router from throwing errors when we're already on the page we're trying to go to
-const originalPush = Router.prototype.push
-Router.prototype.push = (function(this: Router, ...args: Parameters<typeof originalPush>) {
-	if (args.length > 1) {
-		return originalPush.call(this, ...args)
-	}
-	return originalPush.call<Router, [RawLocation], Promise<Route>>(this, args[0]).catch(ignoreDuplicateNavigation)
-}) as typeof originalPush
-
-const originalReplace = Router.prototype.replace
-Router.prototype.replace = (function(this: Router, ...args: Parameters<typeof originalReplace>) {
-	if (args.length > 1) {
-		return originalReplace.call(this, ...args)
-	}
-	return originalReplace.call<Router, [RawLocation], Promise<Route>>(this, args[0]).catch(ignoreDuplicateNavigation)
-}) as typeof originalReplace
-
-/**
- * Ignore duplicated- and redirected-navigation errors but forward real exceptions
- *
- * @param error The thrown error
- */
-function ignoreDuplicateNavigation(error: unknown): void {
-	if (isNavigationFailure(error, NavigationFailureType.duplicated)
-		|| isNavigationFailure(error, NavigationFailureType.redirected)) {
-		logger.debug('Ignoring duplicated/redirected navigation from vue-router', { error })
-	} else {
-		throw error
-	}
-}
-
-const router = new Router({
-	mode: 'history',
+const FilesListComponent = () => import('../views/FilesList.vue')
 
+export const router = createRouter({
 	// if index.php is in the url AND we got this far, then it's working:
 	// let's keep using index.php in the url
-	base: generateUrl('/apps/files'),
+	history: createWebHistory(generateUrl('/apps/files')),
 	linkActiveClass: 'active',
-
 	routes: [
 		{
 			path: '/',
@@ -69,20 +32,15 @@ const router = new Router({
 			path: '/:view/:fileid(\\d+)?',
 			name: 'filelist',
 			props: true,
+			component: FilesListComponent,
 		},
 	],
-
-	// Custom stringifyQuery to prevent encoding of slashes in the url
-	stringifyQuery(query) {
-		const result = queryString.stringify(query).replace(/%2F/gmi, '/')
-		return result ? ('?' + result) : ''
-	},
 })
 
 // Handle aborted navigation (NavigationGuards) gracefully
 router.onError((error) => {
 	if (isNavigationFailure(error, NavigationFailureType.aborted)) {
-		logger.debug('Navigation was aboorted', { error })
+		logger.debug('Navigation was aborted', { error })
 	} else {
 		throw error
 	}
@@ -91,15 +49,10 @@ router.onError((error) => {
 // If navigating back from a folder to a parent folder,
 // we need to keep the current dir fileid so it's highlighted
 // and scrolled into view.
-router.beforeResolve((to, from, next) => {
-	if (to.params?.parentIntercept) {
-		delete to.params.parentIntercept
-		return next()
-	}
-
+router.beforeResolve((to, from) => {
 	if (to.params.view !== from.params.view) {
 		// skip if different views
-		return next()
+		return
 	}
 
 	const fromDir = (from.query?.dir || '/') as string
@@ -112,47 +65,47 @@ router.beforeResolve((to, from, next) => {
 
 		if (!from.params.view) {
 			logger.error('No current view id found, cannot navigate to parent directory', { fromDir, toDir })
-			return next()
+			return
 		}
 
 		// Get the previous parent's file id
-		const fromSource = getPath(from.params.view, fromDir)
+		const fromSource = getPath(from.params.view as string, fromDir)
 		if (!fromSource) {
 			logger.error('No source found for the parent directory', { fromDir, toDir })
-			return next()
+			return
 		}
 
 		const fileId = getNode(fromSource)?.fileid
+		if (to.params.fileid === String(fileId)) {
+			// prevent infinite loop of navigating to the same parent directory
+			return
+		}
+
 		if (!fileId) {
 			logger.error('No fileid found for the parent directory', { fromDir, toDir, fromSource })
-			return next()
+			return
 		}
 
 		logger.debug('Navigating back to parent directory', { fromDir, toDir, fileId })
-		return next({
+		return {
 			name: 'filelist',
 			query: to.query,
 			params: {
 				...to.params,
 				fileid: String(fileId),
-				// Prevents the beforeEach from being called again
-				parentIntercept: 'true',
 			},
 			// Replace the current history entry
 			replace: true,
-		})
+		}
 	}
-
-	// else, we just continue
-	next()
 })
 
 subscribe('files:node:deleted', (node: INode) => {
-	if (router.currentRoute.params.fileid === String(node.fileid)) {
-		const params = { ...router.currentRoute.params }
-		const { getPath } = usePathsStore(getPinia())
-		const { getNode } = useFilesStore(getPinia())
-		const source = getPath(router.currentRoute.params.view, node.dirname)
+	if (router.currentRoute.value.params.fileid === String(node.fileid)) {
+		const params = { ...router.currentRoute.value.params }
+		const { getPath } = usePathsStore(pinia)
+		const { getNode } = useFilesStore(pinia)
+		const source = getPath(router.currentRoute.value.params.view as string, node.dirname)
 		const parentFolder = getNode(source!)
 		if (source && parentFolder) {
 			params.fileid = String(parentFolder.fileid)
@@ -160,17 +113,14 @@ subscribe('files:node:deleted', (node: INode) => {
 			delete params.fileid
 		}
 
-		const query = { ...router.currentRoute.query }
+		const query = { ...router.currentRoute.value.query }
 		delete query.opendetails
 		delete query.openfile
 
 		router.replace({
-			...router.currentRoute,
-			name: router.currentRoute.name as string,
+			name: router.currentRoute.value.name as string,
 			params,
 			query,
 		})
 	}
 })
-
-export default router
diff --git a/apps/files/src/services/DropService.ts b/apps/files/src/services/DropService.ts
index c408f183ac37d..1c7910e9c100f 100644
--- a/apps/files/src/services/DropService.ts
+++ b/apps/files/src/services/DropService.ts
@@ -4,15 +4,16 @@
  */
 
 import type { IFolder, INode } from '@nextcloud/files'
-import type { Upload } from '@nextcloud/upload'
+import type { IUpload } from '@nextcloud/files/upload'
 import type { RootDirectory } from './DropServiceUtils.ts'
 
 import { showError, showInfo, showSuccess, showWarning } from '@nextcloud/dialogs'
+import { getUploader } from '@nextcloud/files/upload'
 import { t } from '@nextcloud/l10n'
 import { join } from '@nextcloud/paths'
-import { getUploader, hasConflict } from '@nextcloud/upload'
 import { handleCopyMoveNodesTo, HintException } from '../actions/moveOrCopyAction.ts'
 import { MoveCopyAction } from '../actions/moveOrCopyActionUtils.ts'
+import { getConflicts } from '../utils/conflicts.ts'
 import { logger } from '../utils/logger.ts'
 import { createDirectoryIfNotExists, Directory, resolveConflict, traverseTree } from './DropServiceUtils.ts'
 
@@ -97,7 +98,7 @@ export async function onDropExternalFiles(root: RootDirectory, destination: IFol
 	const uploader = getUploader()
 
 	// Check for conflicts on root elements
-	if (await hasConflict(root.contents, contents)) {
+	if (getConflicts(root.contents, contents).length !== 0) {
 		root.contents = await resolveConflict(root.contents, destination, contents)
 		if (root.contents.length === 0) {
 			// user cancelled the upload
@@ -111,7 +112,7 @@ export async function onDropExternalFiles(root: RootDirectory, destination: IFol
 
 	// Let's process the files
 	logger.debug(`Uploading files to ${destination.path}`, { root, contents: root.contents })
-	const queue = [] as Promise<Upload>[]
+	const queue = [] as Promise<IUpload>[]
 
 	const uploadDirectoryContents = async (directory: Directory, path: string) => {
 		for (const file of directory.contents) {
@@ -137,7 +138,7 @@ export async function onDropExternalFiles(root: RootDirectory, destination: IFol
 			logger.debug('Uploading file to ' + join(destination.path, relativePath), { file })
 
 			// Overriding the root to avoid changing the current uploader context
-			queue.push(uploader.upload(relativePath, file, destination.source))
+			queue.push(uploader.upload(relativePath, file, { root: destination.source }))
 		}
 	}
 
@@ -177,7 +178,7 @@ export async function onDropExternalFiles(root: RootDirectory, destination: IFol
  */
 export async function onDropInternalFiles(nodes: INode[], destination: IFolder, contents: INode[], isCopy = false) {
 	// Check for conflicts on root elements
-	if (await hasConflict(nodes, contents)) {
+	if (getConflicts(nodes, contents).length !== 0) {
 		nodes = await resolveConflict(nodes, destination, contents)
 	}
 
diff --git a/apps/files/src/services/DropServiceUtils.ts b/apps/files/src/services/DropServiceUtils.ts
index 448923755f3b6..138bcacabeacc 100644
--- a/apps/files/src/services/DropServiceUtils.ts
+++ b/apps/files/src/services/DropServiceUtils.ts
@@ -7,11 +7,11 @@ import type { IFolder, INode } from '@nextcloud/files'
 import type { FileStat, ResponseDataDetailed } from 'webdav'
 
 import { showInfo, showWarning } from '@nextcloud/dialogs'
+import { openConflictPicker } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
 import { defaultRemoteURL, defaultRootPath, getClient, getDefaultPropfind, resultToNode } from '@nextcloud/files/dav'
 import { t } from '@nextcloud/l10n'
 import { join } from '@nextcloud/paths'
-import { openConflictPicker } from '@nextcloud/upload'
 import { logger } from '../utils/logger.ts'
 
 /**
@@ -171,12 +171,11 @@ export async function resolveConflict<T extends ((Directory | File) | INode)>(fi
 		})
 
 		// Let the user choose what to do with the conflicting files
-		const { selected, renamed } = await openConflictPicker(destination.path, conflicts, contents)
-
-		logger.debug('Conflict resolution', { uploads, selected, renamed })
+		const conflictResults = await openConflictPicker(destination.path, conflicts, contents)
+		logger.debug('Conflict resolution', { uploads, conflictResults })
 
 		// If the user selected nothing, we cancel the upload
-		if (selected.length === 0 && renamed.length === 0 && uploads.length === 0) {
+		if (conflictResults === null || (conflictResults.selected.length === 0 && conflictResults.renamed.length === 0 && uploads.length === 0)) {
 			// User skipped
 			showInfo(t('files', 'Conflicts resolution skipped'))
 			logger.info('User skipped the conflict resolution')
@@ -184,7 +183,7 @@ export async function resolveConflict<T extends ((Directory | File) | INode)>(fi
 		}
 
 		// Update the list of files to upload
-		return [...uploads, ...selected, ...renamed] as (typeof files)
+		return [...uploads, ...conflictResults.selected, ...conflictResults.renamed] as (typeof files)
 	} catch (error) {
 		// User cancelled
 		logger.warn('User cancelled the upload', { error })
diff --git a/apps/files/src/services/Files.ts b/apps/files/src/services/Files.ts
index 3941ee20ede96..e80a9d60b9aa0 100644
--- a/apps/files/src/services/Files.ts
+++ b/apps/files/src/services/Files.ts
@@ -8,7 +8,7 @@ import type { FileStat, ResponseDataDetailed } from 'webdav'
 import { getDefaultPropfind, getRootPath, resultToNode } from '@nextcloud/files/dav'
 import { join } from 'path'
 import { useFilesStore } from '../store/files.ts'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 import { useSearchStore } from '../store/search.ts'
 import { logger } from '../utils/logger.ts'
 import { client } from './WebdavClient.ts'
@@ -23,7 +23,7 @@ import { searchNodes } from './WebDavSearch.ts'
  * @param options.signal - Abort signal to cancel the request
  */
 export async function getContents(path = '/', options?: { signal: AbortSignal }): Promise<ContentsWithRoot> {
-	const searchStore = useSearchStore(getPinia())
+	const searchStore = useSearchStore(pinia)
 
 	if (searchStore.query.length < 3) {
 		return await defaultGetContents(path, options)
@@ -78,7 +78,7 @@ export async function defaultGetContents(path: string, options?: { signal: Abort
  * @param signal - The aboort signal
  */
 async function getLocalSearch(path: string, query: string, signal?: AbortSignal): Promise<ContentsWithRoot> {
-	const filesStore = useFilesStore(getPinia())
+	const filesStore = useFilesStore(pinia)
 	let folder = filesStore.getDirectoryByPath('files', path)
 	if (!folder) {
 		const rootPath = join(getRootPath(), path)
diff --git a/apps/files/src/services/Recent.ts b/apps/files/src/services/Recent.ts
index 9bdf674b111cf..6673dacffee9c 100644
--- a/apps/files/src/services/Recent.ts
+++ b/apps/files/src/services/Recent.ts
@@ -9,7 +9,7 @@ import { getCurrentUser } from '@nextcloud/auth'
 import { Folder, Permission } from '@nextcloud/files'
 import { getRecentSearch, getRemoteURL, getRootPath, resultToNode } from '@nextcloud/files/dav'
 import { loadState } from '@nextcloud/initial-state'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 import { useUserConfigStore } from '../store/userconfig.ts'
 import { logger } from '../utils/logger.ts'
 import { client } from './WebdavClient.ts'
@@ -27,8 +27,8 @@ const recentLimit = loadState<number>('files', 'recent_limit', 100)
  * @param options Options including abort signal
  * @param options.signal Abort signal to cancel the request
  */
-export async function getContents(path = '/', options: { signal: AbortSignal }): Promise<ContentsWithRoot> {
-	const store = useUserConfigStore(getPinia())
+export async function getContents(path = '/', options?: { signal: AbortSignal }): Promise<ContentsWithRoot> {
+	const store = useUserConfigStore(pinia)
 
 	/**
 	 * Filter function that returns only the visible nodes - or hidden if explicitly configured
@@ -41,7 +41,7 @@ export async function getContents(path = '/', options: { signal: AbortSignal }):
 
 	try {
 		const contentsResponse = await client.search('/', {
-			signal: options.signal,
+			signal: options?.signal,
 			details: true,
 			data: getRecentSearch(lastTwoWeeksTimestamp, recentLimit),
 		}) as ResponseDataDetailed<SearchResult>
@@ -65,7 +65,7 @@ export async function getContents(path = '/', options: { signal: AbortSignal }):
 			contents,
 		}
 	} catch (error) {
-		if (options.signal.aborted) {
+		if (options?.signal.aborted) {
 			logger.info('Fetching recent files aborted')
 			throw new DOMException('Aborted', 'AbortError')
 		}
diff --git a/apps/files/src/services/Search.ts b/apps/files/src/services/Search.ts
index ade5ef2b245be..b211bc088c91d 100644
--- a/apps/files/src/services/Search.ts
+++ b/apps/files/src/services/Search.ts
@@ -8,7 +8,7 @@ import type { ContentsWithRoot } from '@nextcloud/files'
 import { getCurrentUser } from '@nextcloud/auth'
 import { Folder, Permission } from '@nextcloud/files'
 import { defaultRemoteURL, getRootPath } from '@nextcloud/files/dav'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 import { useSearchStore } from '../store/search.ts'
 import { logger } from '../utils/logger.ts'
 import { searchNodes } from './WebDavSearch.ts'
@@ -21,7 +21,7 @@ import { searchNodes } from './WebDavSearch.ts'
  * @param options.signal - Abort signal to cancel the request
  */
 export async function getContents(path, options: { signal: AbortSignal }): Promise<ContentsWithRoot> {
-	const searchStore = useSearchStore(getPinia())
+	const searchStore = useSearchStore(pinia)
 
 	try {
 		const contents = await searchNodes(searchStore.query, { signal: options.signal })
diff --git a/apps/files/src/sidebar.ts b/apps/files/src/sidebar.ts
index c8c98cc7940ff..008d92b687763 100644
--- a/apps/files/src/sidebar.ts
+++ b/apps/files/src/sidebar.ts
@@ -5,9 +5,9 @@
 
 import type { ISidebar } from '@nextcloud/files'
 
-import { getPinia } from './store/index.ts'
+import { pinia } from './store/index.ts'
 import { useSidebarStore } from './store/sidebar.ts'
 
 // Provide sidebar implementation which is proxied by the `@nextcloud/files` library for app usage.
 window.OCA.Files ??= {}
-window.OCA.Files._sidebar = () => useSidebarStore(getPinia()) satisfies Omit<ISidebar, 'available' | 'registerAction' | 'registerTab' | 'registerAction'>
+window.OCA.Files._sidebar = () => useSidebarStore(pinia) satisfies Omit<ISidebar, 'available' | 'registerAction' | 'registerTab' | 'registerAction'>
diff --git a/apps/files/src/store/dragging.ts b/apps/files/src/store/dragging.ts
index d7679d2aadea7..7183272339525 100644
--- a/apps/files/src/store/dragging.ts
+++ b/apps/files/src/store/dragging.ts
@@ -6,7 +6,6 @@
 import type { DragAndDropStore, FileSource } from '../types.ts'
 
 import { defineStore } from 'pinia'
-import Vue from 'vue'
 
 export const useDragAndDropStore = defineStore('dragging', {
 	state: () => ({
@@ -20,14 +19,14 @@ export const useDragAndDropStore = defineStore('dragging', {
 		 * @param selection array of node sources
 		 */
 		set(selection = [] as FileSource[]) {
-			Vue.set(this, 'dragging', selection)
+			this.dragging = selection
 		},
 
 		/**
 		 * Reset the selection
 		 */
 		reset() {
-			Vue.set(this, 'dragging', [])
+			this.dragging = []
 		},
 	},
 })
diff --git a/apps/files/src/store/files.ts b/apps/files/src/store/files.ts
index 6ea456fb6bdb0..cc34b5813f532 100644
--- a/apps/files/src/store/files.ts
+++ b/apps/files/src/store/files.ts
@@ -8,7 +8,7 @@ import type { FileSource, FilesStore, RootOptions, RootsStore, Service } from '.
 
 import { subscribe } from '@nextcloud/event-bus'
 import { defineStore } from 'pinia'
-import Vue, { ref } from 'vue'
+import { ref } from 'vue'
 import { fetchNode } from '../services/WebdavClient.ts'
 import { logger } from '../utils/logger.ts'
 import { useActiveStore } from './active.ts'
@@ -251,7 +251,7 @@ export const useFilesStore = defineStore('files', () => {
 	function onAddFavorite(node: INode) {
 		const ourNode = getNode(node.source)
 		if (ourNode) {
-			Vue.set(ourNode.attributes, 'favorite', 1)
+			ourNode.attributes.favorite = 1
 		}
 	}
 
@@ -263,7 +263,7 @@ export const useFilesStore = defineStore('files', () => {
 	function onRemoveFavorite(node: INode) {
 		const ourNode = getNode(node.source)
 		if (ourNode) {
-			Vue.set(ourNode.attributes, 'favorite', 0)
+			ourNode.attributes.favorite = 0
 		}
 	}
 })
diff --git a/apps/files/src/store/index.ts b/apps/files/src/store/index.ts
index e80661bdd16e8..b80efcdad15ba 100644
--- a/apps/files/src/store/index.ts
+++ b/apps/files/src/store/index.ts
@@ -6,13 +6,6 @@
 import { createPinia } from 'pinia'
 
 /**
- * Get the Pinia instance for the Files app.
+ * The Pinia instance for the Files app.
  */
-export function getPinia() {
-	if (window._nc_files_pinia) {
-		return window._nc_files_pinia
-	}
-
-	window._nc_files_pinia = createPinia()
-	return window._nc_files_pinia
-}
+export const pinia = createPinia()
diff --git a/apps/files/src/store/keyboard.ts b/apps/files/src/store/keyboard.ts
index ee8ff289e437e..053490eea3994 100644
--- a/apps/files/src/store/keyboard.ts
+++ b/apps/files/src/store/keyboard.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import { defineStore } from 'pinia'
-import Vue from 'vue'
 
 /**
  * Observe various events and save the current
@@ -26,10 +25,10 @@ export function useKeyboardStore(...args) {
 				if (!event) {
 					event = window.event as MouseEvent | KeyboardEvent
 				}
-				Vue.set(this, 'altKey', !!event.altKey)
-				Vue.set(this, 'ctrlKey', !!event.ctrlKey)
-				Vue.set(this, 'metaKey', !!event.metaKey)
-				Vue.set(this, 'shiftKey', !!event.shiftKey)
+				this.altKey = !!event.altKey
+				this.ctrlKey = !!event.ctrlKey
+				this.metaKey = !!event.metaKey
+				this.shiftKey = !!event.shiftKey
 			},
 		},
 	})
diff --git a/apps/files/src/store/paths.ts b/apps/files/src/store/paths.ts
index e97e103932db0..68c33c5d74d93 100644
--- a/apps/files/src/store/paths.ts
+++ b/apps/files/src/store/paths.ts
@@ -10,7 +10,6 @@ import { subscribe } from '@nextcloud/event-bus'
 import { File, FileType, getNavigation } from '@nextcloud/files'
 import { dirname } from '@nextcloud/paths'
 import { defineStore } from 'pinia'
-import Vue from 'vue'
 import { logger } from '../utils/logger.ts'
 import { useFilesStore } from './files.ts'
 
@@ -41,11 +40,11 @@ export function usePathsStore(...args) {
 			addPath(payload: PathOptions) {
 				// If it doesn't exists, init the service state
 				if (!this.paths[payload.service]) {
-					Vue.set(this.paths, payload.service, {})
+					this.paths[payload.service] = {}
 				}
 
 				// Now we can set the provided path
-				Vue.set(this.paths[payload.service], payload.path, payload.source)
+				this.paths[payload.service][payload.path] = payload.source
 			},
 
 			deletePath(service: Service, path: string) {
@@ -54,7 +53,7 @@ export function usePathsStore(...args) {
 					return
 				}
 
-				Vue.delete(this.paths[service], path)
+				delete this.paths[service][path]
 			},
 
 			onCreatedNode(node: Node) {
@@ -133,7 +132,7 @@ export function usePathsStore(...args) {
 					// ensure sources are unique
 					const children = new Set(folder._children ?? [])
 					children.delete(node.source)
-					Vue.set(folder, '_children', [...children.values()])
+					folder._children = [...children.values()]
 					logger.debug('Children updated', { parent: folder, node, children: folder._children })
 					return
 				}
@@ -151,7 +150,7 @@ export function usePathsStore(...args) {
 					// ensure sources are unique
 					const children = new Set(folder._children ?? [])
 					children.add(node.source)
-					Vue.set(folder, '_children', [...children.values()])
+					folder._children = [...children.values()]
 					logger.debug('Children updated', { parent: folder, node, children: folder._children })
 					return
 				}
diff --git a/apps/files/src/store/renaming.ts b/apps/files/src/store/renaming.ts
index 5e85a728098b5..7f16dc67f3830 100644
--- a/apps/files/src/store/renaming.ts
+++ b/apps/files/src/store/renaming.ts
@@ -12,7 +12,7 @@ import { t } from '@nextcloud/l10n'
 import { basename, dirname, extname } from '@nextcloud/paths'
 import { spawnDialog } from '@nextcloud/vue/functions/dialog'
 import { defineStore } from 'pinia'
-import Vue, { defineAsyncComponent, ref } from 'vue'
+import { defineAsyncComponent, ref } from 'vue'
 import { fetchNode } from '../services/WebdavClient.ts'
 import { logger } from '../utils/logger.ts'
 import { useUserConfigStore } from './userconfig.ts'
@@ -58,7 +58,7 @@ export const useRenamingStore = defineStore('renaming', () => {
 
 		const userConfig = useUserConfigStore()
 		let node = renamingNode.value
-		Vue.set(node, 'status', NodeStatus.LOADING)
+		node.status = NodeStatus.LOADING
 		try {
 			if (userConfig.userConfig.show_dialog_file_extension) {
 				const oldExtension = extname(oldName)
@@ -139,7 +139,7 @@ export const useRenamingStore = defineStore('renaming', () => {
 			// Unknown error
 			throw new Error(t('files', 'Could not rename "{oldName}"', { oldName }), { cause: error })
 		} finally {
-			Vue.set(node, 'status', undefined)
+			node.status = undefined
 			isRenaming.value = false
 		}
 	}
diff --git a/apps/files/src/store/selection.ts b/apps/files/src/store/selection.ts
index 50de2cdb1da80..55e5209684897 100644
--- a/apps/files/src/store/selection.ts
+++ b/apps/files/src/store/selection.ts
@@ -6,7 +6,6 @@
 import type { FileSource, SelectionStore } from '../types.ts'
 
 import { defineStore } from 'pinia'
-import Vue from 'vue'
 
 export const useSelectionStore = defineStore('selection', {
 	state: () => ({
@@ -22,7 +21,7 @@ export const useSelectionStore = defineStore('selection', {
 		 * @param selection
 		 */
 		set(selection = [] as FileSource[]) {
-			Vue.set(this, 'selected', [...new Set(selection)])
+			this.selected = [...new Set(selection)]
 		},
 
 		/**
@@ -32,17 +31,17 @@ export const useSelectionStore = defineStore('selection', {
 		 */
 		setLastIndex(lastSelectedIndex = null as number | null) {
 			// Update the last selection if we provided a new selection starting point
-			Vue.set(this, 'lastSelection', lastSelectedIndex ? this.selected : [])
-			Vue.set(this, 'lastSelectedIndex', lastSelectedIndex)
+			this.lastSelection = lastSelectedIndex ? this.selected : []
+			this.lastSelectedIndex = lastSelectedIndex
 		},
 
 		/**
 		 * Reset the selection
 		 */
 		reset() {
-			Vue.set(this, 'selected', [])
-			Vue.set(this, 'lastSelection', [])
-			Vue.set(this, 'lastSelectedIndex', null)
+			this.selected = []
+			this.lastSelection = []
+			this.lastSelectedIndex = null
 		},
 	},
 })
diff --git a/apps/files/src/store/uploader.ts b/apps/files/src/store/uploader.ts
index dc6f638bdceca..0caaa01352189 100644
--- a/apps/files/src/store/uploader.ts
+++ b/apps/files/src/store/uploader.ts
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { Uploader } from '@nextcloud/upload'
+import type { Uploader } from '@nextcloud/files/upload'
 import type { UploaderStore } from '../types.ts'
 
-import { getUploader } from '@nextcloud/upload'
+import { getUploader } from '@nextcloud/files/upload'
 import { defineStore } from 'pinia'
 
 let uploader: Uploader
diff --git a/apps/files/src/store/userconfig.ts b/apps/files/src/store/userconfig.ts
index 00fd45e67ac7b..bea47439bdc6d 100644
--- a/apps/files/src/store/userconfig.ts
+++ b/apps/files/src/store/userconfig.ts
@@ -11,7 +11,7 @@ import { emit, subscribe } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
 import { generateUrl } from '@nextcloud/router'
 import { defineStore } from 'pinia'
-import { ref, set } from 'vue'
+import { ref } from 'vue'
 
 const initialUserConfig = loadState<UserConfig>('files', 'config', {
 	crop_image_previews: true,
@@ -38,7 +38,7 @@ export const useUserConfigStore = defineStore('userconfig', () => {
 	 * @param value The new value
 	 */
 	function onUpdate<Key extends string>(key: Key, value: UserConfig[Key]): void {
-		set(userConfig.value, key, value)
+		userConfig.value[key] = value
 	}
 
 	/**
diff --git a/apps/files/src/store/viewConfig.ts b/apps/files/src/store/viewConfig.ts
index d624584e5dc14..e95e045385570 100644
--- a/apps/files/src/store/viewConfig.ts
+++ b/apps/files/src/store/viewConfig.ts
@@ -11,7 +11,7 @@ import { emit, subscribe } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
 import { generateUrl } from '@nextcloud/router'
 import { defineStore } from 'pinia'
-import { ref, set } from 'vue'
+import { ref } from 'vue'
 
 const initialViewConfig = loadState('files', 'viewConfigs', {}) as ViewConfigs
 
@@ -36,9 +36,9 @@ export const useViewConfigStore = defineStore('viewconfig', () => {
 	 */
 	function onUpdate(viewId: ViewId, key: string, value: string | number | boolean): void {
 		if (!(viewId in viewConfigs.value)) {
-			set(viewConfigs.value, viewId, {})
+			viewConfigs.value[viewId] = {}
 		}
-		set(viewConfigs.value[viewId], key, value)
+		viewConfigs.value[viewId][key] = value
 	}
 
 	/**
diff --git a/apps/files/src/utils/actionUtils.ts b/apps/files/src/utils/actionUtils.ts
index 9fe659630a039..6e94b9d85df0e 100644
--- a/apps/files/src/utils/actionUtils.ts
+++ b/apps/files/src/utils/actionUtils.ts
@@ -7,7 +7,6 @@ import type { ActionContextSingle, IFileAction } from '@nextcloud/files'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { NodeStatus } from '@nextcloud/files'
 import { t } from '@nextcloud/l10n'
-import Vue from 'vue'
 import { useActiveStore } from '../store/active.ts'
 import { logger } from '../utils/logger.ts'
 
@@ -55,7 +54,7 @@ export async function executeAction(action: IFileAction) {
 
 	try {
 		// Set the loading marker
-		Vue.set(currentNode, 'status', NodeStatus.LOADING)
+		currentNode.status = NodeStatus.LOADING
 		activeStore.activeAction = action
 
 		const success = await action.exec(context)
@@ -75,7 +74,7 @@ export async function executeAction(action: IFileAction) {
 		showError(t('files', '{displayName}: failed', { displayName }))
 	} finally {
 		// Reset the loading marker
-		Vue.set(currentNode, 'status', undefined)
+		currentNode.status = undefined
 		activeStore.activeAction = undefined
 	}
 }
diff --git a/apps/files/src/utils/conflicts.ts b/apps/files/src/utils/conflicts.ts
new file mode 100644
index 0000000000000..cd896d226b63a
--- /dev/null
+++ b/apps/files/src/utils/conflicts.ts
@@ -0,0 +1,14 @@
+import type { INode } from '@nextcloud/files'
+
+type ConflictInput = INode | File | FileSystemEntry
+
+/**
+ * Check if there are conflicts between two sets of nodes
+ *
+ * @param sourceNodes - The nodes that might conflict
+ * @param targetNodes - The nodes in the target directory
+ */
+export function getConflicts<T extends ConflictInput>(sourceNodes: T[], targetNodes: INode[]): T[] {
+	const targetNames = targetNodes.map((node) => node.basename)
+	return sourceNodes.filter((node) => targetNames.includes('basename' in node ? node.basename : node.name))
+}
diff --git a/apps/files/src/utils/dragUtils.ts b/apps/files/src/utils/dragUtils.ts
index 897842f814924..8ae909ca98c0b 100644
--- a/apps/files/src/utils/dragUtils.ts
+++ b/apps/files/src/utils/dragUtils.ts
@@ -3,12 +3,15 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import type { Node } from '@nextcloud/files'
+import type { ComponentPublicInstance } from 'vue'
 
-import Vue from 'vue'
+import { createApp } from 'vue'
 import DragAndDropPreview from '../components/DragAndDropPreview.vue'
 
-const Preview = Vue.extend(DragAndDropPreview)
-let preview: Vue
+type PreviewInstance = ComponentPublicInstance & { update: (nodes: Node[]) => void }
+
+let preview: PreviewInstance | undefined
+let onLoaded: ((el: Element) => void) | undefined
 
 /**
  *
@@ -17,14 +20,15 @@ let preview: Vue
 export async function getDragAndDropPreview(nodes: Node[]): Promise<Element> {
 	return new Promise((resolve) => {
 		if (!preview) {
-			preview = new Preview().$mount()
-			document.body.appendChild(preview.$el)
+			const mountingPoint = document.createElement('div')
+			document.body.appendChild(mountingPoint)
+			const app = createApp(DragAndDropPreview, {
+				onLoaded: (el: Element) => onLoaded?.(el),
+			})
+			preview = app.mount(mountingPoint) as PreviewInstance
 		}
 
+		onLoaded = resolve
 		preview.update(nodes)
-		preview.$on('loaded', () => {
-			resolve(preview.$el)
-			preview.$off('loaded')
-		})
 	})
 }
diff --git a/apps/files/src/utils/generateUrl.spec.ts b/apps/files/src/utils/generateUrl.spec.ts
new file mode 100644
index 0000000000000..8c76386b60273
--- /dev/null
+++ b/apps/files/src/utils/generateUrl.spec.ts
@@ -0,0 +1,42 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { generateFileUrl } from './generateUrl.ts'
+
+const getCapabilities = vi.hoisted(() => vi.fn())
+vi.mock('@nextcloud/capabilities', () => ({ getCapabilities }))
+
+describe('generateFileUrl', () => {
+	beforeEach(() => window._oc_webroot = '')
+
+	/**
+	 * Regression test of https://github.com/nextcloud/server/issues/56374
+	 */
+	it('should work without globalscale and webroot', () => {
+		window._oc_webroot = '/nextcloud'
+		getCapabilities.mockReturnValue({ globalscale: null })
+		const url = generateFileUrl(12345)
+		expect(url).toBe('http://nextcloud.local/nextcloud/index.php/f/12345')
+	})
+
+	it('should work without globalscale', () => {
+		getCapabilities.mockReturnValue({ globalscale: null })
+		const url = generateFileUrl(12345)
+		expect(url).toBe('http://nextcloud.local/index.php/f/12345')
+	})
+
+	it('should work with older globalscale', () => {
+		getCapabilities.mockReturnValue({ globalscale: { enabled: true } })
+		const url = generateFileUrl(12345)
+		expect(url).toBe('http://nextcloud.local/index.php/f/12345')
+	})
+
+	it('should work with globalscale', () => {
+		getCapabilities.mockReturnValue({ globalscale: { enabled: true, token: 'abc123' } })
+		const url = generateFileUrl(12345)
+		expect(url).toBe('http://nextcloud.local/index.php/gf/abc123/12345')
+	})
+})
diff --git a/apps/files/src/utils/generateUrl.ts b/apps/files/src/utils/generateUrl.ts
new file mode 100644
index 0000000000000..267442af2c7a0
--- /dev/null
+++ b/apps/files/src/utils/generateUrl.ts
@@ -0,0 +1,32 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { getCapabilities } from '@nextcloud/capabilities'
+import { generateUrl, getBaseUrl } from '@nextcloud/router'
+
+interface IGlobalScaleCapabilities {
+	token?: string
+}
+
+/**
+ * @param fileid - The file ID to generate the direct file link for
+ */
+export function generateFileUrl(fileid: number): string {
+	const baseURL = getBaseUrl()
+
+	const { globalscale } = getCapabilities() as { globalscale?: IGlobalScaleCapabilities }
+	if (globalscale?.token) {
+		return generateUrl('/gf/{token}/{fileid}', {
+			token: globalscale.token,
+			fileid,
+		}, { baseURL })
+	}
+
+	return generateUrl('/f/{fileid}', {
+		fileid,
+	}, {
+		baseURL,
+	})
+}
diff --git a/apps/files/src/views/FileReferencePickerElement.vue b/apps/files/src/views/FileReferencePickerElement.vue
index e2a621b181eee..22d2581038883 100644
--- a/apps/files/src/views/FileReferencePickerElement.vue
+++ b/apps/files/src/views/FileReferencePickerElement.vue
@@ -9,16 +9,18 @@
 
 <script setup lang="ts">
 import type { IFilePickerButton } from '@nextcloud/dialogs'
-import type { Node as NcNode } from '@nextcloud/files'
+import type { INode } from '@nextcloud/files'
 
 import { FilePickerBuilder } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 import { onMounted } from 'vue'
-import { generateFileUrl } from '../../../files_sharing/src/utils/generateUrl.ts'
+import { generateFileUrl } from '../utils/generateUrl.ts'
 import { logger } from '../utils/logger.ts'
 
 defineProps<{
+	// eslint-disable-next-line vue/no-unused-properties -- Provided as per API but not used
 	providerId: string
+	// eslint-disable-next-line vue/no-unused-properties -- Provided as per API but not used
 	accessible: boolean
 }>()
 
@@ -51,7 +53,7 @@ onMounted(async () => {
  *
  * @param selected - currently selected nodes
  */
-function buttonFactory(selected: NcNode[]): IFilePickerButton[] {
+function buttonFactory(selected: INode[]): IFilePickerButton[] {
 	const buttons = [] as IFilePickerButton[]
 	const node = selected[0]
 	if (node === undefined) {
@@ -73,7 +75,7 @@ function buttonFactory(selected: NcNode[]): IFilePickerButton[] {
 /**
  * @param node - selected node
  */
-function onSubmit(node: NcNode) {
+function onSubmit(node: INode) {
 	emit('submit', generateFileUrl(node.fileid!))
 }
 </script>
diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue
index 55e4ef64dbc0a..15a94d812f33d 100644
--- a/apps/files/src/views/FilesList.vue
+++ b/apps/files/src/views/FilesList.vue
@@ -3,21 +3,19 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<NcAppContent :page-heading="pageHeading" data-cy-files-content>
+	<NcAppContent :pageHeading="pageHeading" data-cy-files-content>
 		<div class="files-list__header" :class="{ 'files-list__header--public': isPublic }">
 			<!-- Uploader -->
 			<component :is="isNarrow ? 'Teleport' : 'div'" :to="isNarrow ? 'body' : undefined">
-				<UploadPicker
+				<NcUploadPicker
 					v-if="canUpload && !isQuotaExceeded && currentFolder"
-					allow-folders
-					:no-label="isNarrow"
+					directory
+					:iconOnly="isNarrow"
 					class="files-list__header-upload-button"
 					:class="{ 'files-list__header-upload-button--narrow': isNarrow }"
-					:content="getContent"
-					:destination="currentFolder"
-					:forbidden-characters="forbiddenCharacters"
+					:context="getContent"
+					:folder="currentFolder"
 					multiple
-					primary
 					@failed="onUploadFail"
 					@uploaded="onUpload" />
 			</component>
@@ -36,13 +34,13 @@
 				class="files-list__header-actions"
 				:inline="1"
 				variant="tertiary"
-				force-name>
+				forceName>
 				<NcActionButton
 					v-for="action in enabledFileListActions"
 					:key="action.id"
 					:disabled="!!loadingAction"
 					:data-cy-files-list-action="action.id"
-					close-after-click
+					closeAfterClick
 					@click="execFileListAction(action)">
 					<template #icon>
 						<NcLoadingIcon v-if="loadingAction === action.id" :size="18" />
@@ -90,7 +88,7 @@
 		<FilesListVirtual
 			v-else
 			ref="filesListVirtual"
-			:current-folder="currentFolder"
+			:currentFolder="currentFolder"
 			:current-view="currentView"
 			:nodes="dirContentsSorted"
 			:summary="summary">
@@ -130,13 +128,12 @@
 					data-cy-files-content-empty>
 					<template v-if="directory !== '/'" #action>
 						<!-- Uploader -->
-						<UploadPicker
+						<NcUploadPicker
 							v-if="canUpload && !isQuotaExceeded"
-							allow-folders
+							directory
 							class="files-list__header-upload-button"
-							:content="getContent"
-							:destination="currentFolder"
-							:forbidden-characters="forbiddenCharacters"
+							:context="getContent"
+							:folder="currentFolder"
 							multiple
 							@failed="onUploadFail"
 							@uploaded="onUpload" />
@@ -154,10 +151,9 @@
 </template>
 
 <script lang="ts">
-import type { ContentsWithRoot, FileListAction, INode, Node } from '@nextcloud/files'
-import type { Upload } from '@nextcloud/upload'
+import type { ContentsWithRoot, IFileListAction, INode, Node } from '@nextcloud/files'
 import type { ComponentPublicInstance } from 'vue'
-import type { Route } from 'vue-router'
+import type { RouteLocationRaw } from 'vue-router'
 import type { UserConfig } from '../types.ts'
 
 import { showError, showSuccess, showWarning } from '@nextcloud/dialogs'
@@ -167,11 +163,9 @@ import { loadState } from '@nextcloud/initial-state'
 import { translate as t } from '@nextcloud/l10n'
 import { dirname, join } from '@nextcloud/paths'
 import { ShareType } from '@nextcloud/sharing'
-import { UploadPicker, UploadStatus } from '@nextcloud/upload'
 import { useThrottleFn } from '@vueuse/core'
 import { normalize, relative } from 'path'
 import { computed, defineComponent, nextTick, watch } from 'vue'
-import Teleport from 'vue2-teleport' // TODO: replace with native Vue Teleport when we switch to Vue 3
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcAppContent from '@nextcloud/vue/components/NcAppContent'
@@ -187,10 +181,11 @@ import BreadCrumbs from '../components/BreadCrumbs.vue'
 import DragAndDropNotice from '../components/DragAndDropNotice.vue'
 import FileListFilters from '../components/FileListFilter/FileListFilters.vue'
 import FilesListVirtual from '../components/FilesListVirtual.vue'
+import NcUploadPicker from '../components/NcUploadPicker.vue'
+import { useFilesSorting } from '../composables/filesSorting.ts'
 import { useEnabledFileListActions } from '../composables/useFileListActions.ts'
 import { useFileListWidth } from '../composables/useFileListWidth.ts'
 import { useRouteParameters } from '../composables/useRouteParameters.ts'
-import filesSortingMixin from '../mixins/filesSorting.ts'
 import { useActiveStore } from '../store/active.ts'
 import { useFilesStore } from '../store/files.ts'
 import { useFiltersStore } from '../store/filters.ts'
@@ -221,17 +216,12 @@ export default defineComponent({
 		NcEmptyContent,
 		NcIconSvgWrapper,
 		NcLoadingIcon,
-		Teleport,
-		UploadPicker,
+		NcUploadPicker,
 		ViewGridIcon,
 		IconAlertCircleOutline,
 		IconReload,
 	},
 
-	mixins: [
-		filesSortingMixin,
-	],
-
 	props: {
 		isPublic: {
 			type: Boolean,
@@ -297,6 +287,8 @@ export default defineComponent({
 			userConfigStore,
 			viewConfigStore,
 
+			...useFilesSorting(),
+
 			// non reactive data
 			enableGridView,
 			forbiddenCharacters,
@@ -415,7 +407,7 @@ export default defineComponent({
 		/**
 		 * Route to the previous directory.
 		 */
-		toPreviousDir(): Route {
+		toPreviousDir(): RouteLocationRaw {
 			const dir = this.directory.split('/').slice(0, -1).join('/') || '/'
 			return { ...this.$route, query: { dir } }
 		},
@@ -554,7 +546,7 @@ export default defineComponent({
 				window.addEventListener('DOMContentLoaded', () => {
 					if (!this.currentView) {
 						logger.warn('No current view after DOMContentLoaded, redirecting to the default view')
-						window.OCP.Files.Router.goToRoute(null, { view: defaultView() })
+						window.OCP.Files.Router.goToRoute(null, { view: defaultView()! })
 					}
 				}, { once: true })
 				return
@@ -580,7 +572,7 @@ export default defineComponent({
 
 				// Define current directory children
 				// TODO: make it more official
-				this.$set(folder, '_children', contents.map((node) => node.source))
+				folder._children = contents.map((node) => node.source)
 
 				// If we're in the root dir, define the root
 				if (dir === '/') {
@@ -697,7 +689,7 @@ export default defineComponent({
 			this.dirContentsFiltered = nodes
 		},
 
-		actionDisplayName(action: FileListAction): string {
+		actionDisplayName(action: IFileListAction): string {
 			let displayName = action.id
 			try {
 				displayName = action.displayName(this.currentView!)
@@ -707,13 +699,12 @@ export default defineComponent({
 			return displayName
 		},
 
-		async execFileListAction(action: FileListAction) {
+		async execFileListAction(action: IFileListAction) {
 			this.loadingAction = action.id
 
 			const displayName = this.actionDisplayName(action)
 			try {
 				const success = await action.exec({
-					nodes: [this.source],
 					view: this.currentView,
 					folder: this.currentFolder,
 					contents: this.dirContents,
diff --git a/apps/files/src/views/FilesNavigation.spec.ts b/apps/files/src/views/FilesNavigation.spec.ts
index b6b239560a8d3..7dd91ef9b57e7 100644
--- a/apps/files/src/views/FilesNavigation.spec.ts
+++ b/apps/files/src/views/FilesNavigation.spec.ts
@@ -11,7 +11,7 @@ import { createTestingPinia } from '@pinia/testing'
 import { cleanup, fireEvent, getAllByRole, render } from '@testing-library/vue'
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
 import NavigationView from './FilesNavigation.vue'
-import router from '../router/router.ts'
+import { router } from '../router/router.ts'
 import RouterService from '../services/RouterService.ts'
 import { useViewConfigStore } from '../store/viewConfig.ts'
 
diff --git a/apps/files/src/views/FilesNavigation.vue b/apps/files/src/views/FilesNavigation.vue
index 3c1f37baddf62..aeb386f0d4dcd 100644
--- a/apps/files/src/views/FilesNavigation.vue
+++ b/apps/files/src/views/FilesNavigation.vue
@@ -15,7 +15,7 @@
 
 			<!-- Settings modal-->
 			<FilesAppSettings
-				:open.sync="settingsOpened"
+				v-model:open="settingsOpened"
 				data-cy-files-navigation-settings
 				@close="settingsOpened = false" />
 		</template>
@@ -31,7 +31,9 @@
 					:name="t('files', 'Files settings')"
 					data-cy-files-navigation-settings-button
 					@click.prevent.stop="settingsOpened = true">
-					<IconCog slot="icon" :size="20" />
+					<template #icon>
+						<IconCog :size="20" />
+					</template>
 				</NcAppNavigationItem>
 			</ul>
 		</template>
@@ -43,7 +45,7 @@ import { emit } from '@nextcloud/event-bus'
 import { getNavigation } from '@nextcloud/files'
 import { t } from '@nextcloud/l10n'
 import { computed, provide, ref, watchEffect } from 'vue'
-import { useRoute } from 'vue-router/composables'
+import { useRoute } from 'vue-router'
 import NcAppNavigation from '@nextcloud/vue/components/NcAppNavigation'
 import NcAppNavigationItem from '@nextcloud/vue/components/NcAppNavigationItem'
 import IconCog from 'vue-material-design-icons/CogOutline.vue'
diff --git a/apps/files/src/views/FilesSidebar.vue b/apps/files/src/views/FilesSidebar.vue
index c83a7cf794ed4..6e5f2a318b424 100644
--- a/apps/files/src/views/FilesSidebar.vue
+++ b/apps/files/src/views/FilesSidebar.vue
@@ -73,7 +73,7 @@ function onToggle(open: boolean) {
 	<NcAppSidebar
 		data-cy-sidebar
 		force-menu
-		:active.sync="sidebar.activeTab"
+		v-model:active="sidebar.activeTab"
 		:background="background"
 		:empty="!sidebar.hasContext"
 		:loading="!sidebar.hasContext"
diff --git a/apps/files/src/views/ReferenceFileWidget.vue b/apps/files/src/views/ReferenceFileWidget.vue
index e7245f0faf997..67a27a3742e0b 100644
--- a/apps/files/src/views/ReferenceFileWidget.vue
+++ b/apps/files/src/views/ReferenceFileWidget.vue
@@ -67,7 +67,7 @@ import path from 'path'
 import { defineComponent } from 'vue'
 import FileIcon from 'vue-material-design-icons/File.vue'
 import FolderIcon from 'vue-material-design-icons/Folder.vue'
-import { generateFileUrl } from '../../../files_sharing/src/utils/generateUrl.ts'
+import { generateFileUrl } from '../utils/generateUrl.ts'
 import { logger } from '../utils/logger.ts'
 
 // see lib/private/Collaboration/Reference/File/FileReferenceProvider.php
diff --git a/apps/files/src/views/SearchEmptyView.vue b/apps/files/src/views/SearchEmptyView.vue
index 00669493a3442..f99ca48189bfa 100644
--- a/apps/files/src/views/SearchEmptyView.vue
+++ b/apps/files/src/views/SearchEmptyView.vue
@@ -10,10 +10,10 @@ import debounce from 'debounce'
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
 import NcInputField from '@nextcloud/vue/components/NcInputField'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 import { useSearchStore } from '../store/search.ts'
 
-const searchStore = useSearchStore(getPinia())
+const searchStore = useSearchStore(pinia)
 const debouncedUpdate = debounce((value: string) => {
 	searchStore.query = value
 }, 500)
diff --git a/apps/files/src/views/folderTree.ts b/apps/files/src/views/folderTree.ts
index 3e854a6b66a66..4b9693fb54d64 100644
--- a/apps/files/src/views/folderTree.ts
+++ b/apps/files/src/views/folderTree.ts
@@ -22,7 +22,7 @@ import {
 	sourceRoot,
 } from '../services/FolderTree.ts'
 import { useFilesStore } from '../store/files.ts'
-import { getPinia } from '../store/index.ts'
+import { pinia } from '../store/index.ts'
 
 interface IFolderTreeView extends IView {
 	loading?: boolean
@@ -170,7 +170,7 @@ function getLoadChildViews(node: TreeNode | IFolder) {
  */
 async function updateTreeChildren(path: string = '/') {
 	await queue.add(async () => {
-		const filesStore = useFilesStore(getPinia())
+		const filesStore = useFilesStore(pinia)
 		const cachedNodes = filesStore.getNodesByPath(Navigation.active!.id, path)
 		if (cachedNodes.length > 0) {
 			// if there are nodes loaded in the path we dont need to fetch from API
diff --git a/apps/files/src/views/search.ts b/apps/files/src/views/search.ts
index 3dbb95c225407..b26c1fc8e0746 100644
--- a/apps/files/src/views/search.ts
+++ b/apps/files/src/views/search.ts
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { ComponentPublicInstanceConstructor } from 'vue/types/v3-component-public-instance'
+import type { App } from 'vue'
 
 import MagnifySvg from '@mdi/svg/svg/magnify.svg?raw'
 import { getNavigation, View } from '@nextcloud/files'
 import { t } from '@nextcloud/l10n'
-import Vue from 'vue'
+import { createApp, defineAsyncComponent } from 'vue'
 import { getContents } from '../services/Search.ts'
 import { VIEW_ID as FILES_VIEW_ID } from './files.ts'
 
@@ -18,8 +18,8 @@ export const VIEW_ID = 'search'
  * Register the search-in-files view
  */
 export function registerSearchView() {
-	let instance: Vue
-	let view: ComponentPublicInstanceConstructor
+	const EmptyView = defineAsyncComponent(() => import('./SearchEmptyView.vue'))
+	let instance: App
 
 	const Navigation = getNavigation()
 	Navigation.register(new View({
@@ -28,13 +28,11 @@ export function registerSearchView() {
 		caption: t('files', 'Search results within your files.'),
 
 		async emptyView(el) {
-			if (!view) {
-				view = (await import('./SearchEmptyView.vue')).default
-			} else {
-				instance.$destroy()
+			if (instance) {
+				instance.unmount()
 			}
-			instance = new Vue(view)
-			instance.$mount(el)
+			instance = createApp(EmptyView)
+			instance.mount(el)
 		},
 
 		icon: MagnifySvg,
diff --git a/apps/files_sharing/src/files_views/publicFileShare.ts b/apps/files_sharing/src/files_views/publicFileShare.ts
index bf4fd0df573ab..cba5094caf869 100644
--- a/apps/files_sharing/src/files_views/publicFileShare.ts
+++ b/apps/files_sharing/src/files_views/publicFileShare.ts
@@ -9,8 +9,8 @@ import LinkSvg from '@mdi/svg/svg/link.svg?raw'
 import { Folder, getNavigation, Permission, View } from '@nextcloud/files'
 import { getDefaultPropfind, getRemoteURL, getRootPath, resultToNode } from '@nextcloud/files/dav'
 import { translate as t } from '@nextcloud/l10n'
-import { client } from '../../../files/src/services/WebdavClient.ts'
 import logger from '../services/logger.ts'
+import { client } from '~/apps/files/src/services/WebdavClient.ts'
 
 export default () => {
 	const view = new View({
diff --git a/apps/files_sharing/src/files_views/publicShare.ts b/apps/files_sharing/src/files_views/publicShare.ts
index 1666eeece97eb..435352c89c93e 100644
--- a/apps/files_sharing/src/files_views/publicShare.ts
+++ b/apps/files_sharing/src/files_views/publicShare.ts
@@ -1,11 +1,12 @@
-import LinkSvg from '@mdi/svg/svg/link.svg?raw'
-import { getNavigation, View } from '@nextcloud/files'
-/**
+/*
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { translate as t } from '@nextcloud/l10n'
-import { getContents } from '../../../files/src/services/Files.ts'
+
+import LinkSvg from '@mdi/svg/svg/link.svg?raw'
+import { getNavigation, View } from '@nextcloud/files'
+import { t } from '@nextcloud/l10n'
+import { getContents } from '~/apps/files/src/services/Files.ts'
 
 export default () => {
 	const view = new View({
diff --git a/apps/files_sharing/src/init-public.ts b/apps/files_sharing/src/init-public.ts
index b59389cb5c22e..2c53693bd20a4 100644
--- a/apps/files_sharing/src/init-public.ts
+++ b/apps/files_sharing/src/init-public.ts
@@ -9,7 +9,7 @@ import type { ShareAttribute } from './sharing.d.ts'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { getNavigation } from '@nextcloud/files'
 import { loadState } from '@nextcloud/initial-state'
-import RouterService from '../../files/src/services/RouterService.ts'
+import RouterService from '~/apps/files/src/services/RouterService.ts'
 import registerFileDropView from './files_views/publicFileDrop.ts'
 import registerPublicFileShareView from './files_views/publicFileShare.ts'
 import registerPublicShareView from './files_views/publicShare.ts'
diff --git a/apps/files_sharing/src/mixins/SharesMixin.js b/apps/files_sharing/src/mixins/SharesMixin.js
index fa5dc2d5d27b6..5abb55916a481 100644
--- a/apps/files_sharing/src/mixins/SharesMixin.js
+++ b/apps/files_sharing/src/mixins/SharesMixin.js
@@ -9,7 +9,6 @@ import { emit } from '@nextcloud/event-bus'
 import { ShareType } from '@nextcloud/sharing'
 import debounce from 'debounce'
 import PQueue from 'p-queue'
-import { fetchNode } from '../../../files/src/services/WebdavClient.ts'
 import {
 	ATOMIC_PERMISSIONS,
 	getBundledPermissions,
@@ -19,6 +18,7 @@ import Config from '../services/ConfigService.ts'
 import logger from '../services/logger.ts'
 import GeneratePassword from '../utils/GeneratePassword.ts'
 import SharesRequests from './ShareRequests.js'
+import { fetchNode } from '~/apps/files/src/services/WebdavClient.ts'
 
 export default {
 	mixins: [SharesRequests],
diff --git a/build/frontend-legacy/package-lock.json b/build/frontend-legacy/package-lock.json
index 96d4af1d29bfb..838abb8866ebc 100644
--- a/build/frontend-legacy/package-lock.json
+++ b/build/frontend-legacy/package-lock.json
@@ -7505,12 +7505,15 @@
       "peer": true
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.9.11",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.11.tgz",
-      "integrity": "sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==",
+      "version": "2.10.37",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.37.tgz",
+      "integrity": "sha512-girxaJ7WZssDOFhzCGZTDKoTa1gk6A1TbflaYTpykLJ4UU9Fz9kx1aREM8JCuoVHbL8X8T/mJg7w2oYSq72Oig==",
       "license": "Apache-2.0",
       "bin": {
-        "baseline-browser-mapping": "dist/cli.js"
+        "baseline-browser-mapping": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/batch": {
@@ -7964,9 +7967,9 @@
       "license": "MIT"
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001761",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001761.tgz",
-      "integrity": "sha512-JF9ptu1vP2coz98+5051jZ4PwQgd2ni8A+gYSN7EA7dPKIMf0pDlSUxhdmVOaV3/fYK5uWBkgSXJaRLr4+3A6g==",
+      "version": "1.0.30001799",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz",
+      "integrity": "sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==",
       "funding": [
         {
           "type": "opencollective",
diff --git a/build/frontend-legacy/webpack.common.cjs b/build/frontend-legacy/webpack.common.cjs
index f9b6f435c0313..e526cba45f877 100644
--- a/build/frontend-legacy/webpack.common.cjs
+++ b/build/frontend-legacy/webpack.common.cjs
@@ -255,6 +255,8 @@ const config = {
 		alias: {
 			// make sure to use the handlebar runtime when importing
 			handlebars: 'handlebars/runtime',
+			// allow to import from root (cross reference already migrated apps)
+			'~*': path.resolve(__dirname, '../../*'),
 		},
 		extensions: ['*', '.ts', '.js', '.vue'],
 		extensionAlias: {
diff --git a/build/frontend-legacy/webpack.modules.cjs b/build/frontend-legacy/webpack.modules.cjs
index f560508674162..b0cad14a80c26 100644
--- a/build/frontend-legacy/webpack.modules.cjs
+++ b/build/frontend-legacy/webpack.modules.cjs
@@ -27,15 +27,6 @@ module.exports = {
 	dashboard: {
 		main: path.join(__dirname, 'apps/dashboard/src', 'main.js'),
 	},
-	files: {
-		sidebar: path.join(__dirname, 'apps/files/src', 'sidebar.ts'),
-		main: path.join(__dirname, 'apps/files/src', 'main.ts'),
-		init: path.join(__dirname, 'apps/files/src', 'init.ts'),
-		search: path.join(__dirname, 'apps/files/src/plugins/search', 'folderSearch.ts'),
-		'settings-admin': path.join(__dirname, 'apps/files/src', 'main-settings-admin.ts'),
-		'settings-personal': path.join(__dirname, 'apps/files/src', 'main-settings-personal.ts'),
-		'reference-files': path.join(__dirname, 'apps/files/src', 'reference-files.ts'),
-	},
 	files_sharing: {
 		additionalScripts: path.join(__dirname, 'apps/files_sharing/src', 'additionalScripts.js'),
 		collaboration: path.join(__dirname, 'apps/files_sharing/src', 'collaborationresourceshandler.js'),
diff --git a/build/frontend-legacy/apps/files b/build/frontend/apps/files
similarity index 100%
rename from build/frontend-legacy/apps/files
rename to build/frontend/apps/files
diff --git a/build/frontend/vite.config.ts b/build/frontend/vite.config.ts
index c07ff0359b7c1..22df74f8ec6b9 100644
--- a/build/frontend/vite.config.ts
+++ b/build/frontend/vite.config.ts
@@ -33,6 +33,15 @@ const modules = {
 		'settings-admin': resolve(import.meta.dirname, 'apps/federatedfilesharing/src', 'settings-admin.ts'),
 		'settings-personal': resolve(import.meta.dirname, 'apps/federatedfilesharing/src', 'settings-personal.ts'),
 	},
+	files: {
+		sidebar: resolve(import.meta.dirname, 'apps/files/src', 'sidebar.ts'),
+		main: resolve(import.meta.dirname, 'apps/files/src', 'main.ts'),
+		init: resolve(import.meta.dirname, 'apps/files/src', 'init.ts'),
+		search: resolve(import.meta.dirname, 'apps/files/src/plugins/search', 'folderSearch.ts'),
+		'settings-admicn': resolve(import.meta.dirname, 'apps/files/src', 'main-settings-admin.ts'),
+		'settings-personal': resolve(import.meta.dirname, 'apps/files/src', 'main-settings-personal.ts'),
+		'reference-files': resolve(import.meta.dirname, 'apps/files/src', 'reference-files.ts'),
+	},
 	files_external: {
 		auth_rsa: resolve(import.meta.dirname, 'apps/files_external/src', 'auth-rsa.ts'),
 
diff --git a/package-lock.json b/package-lock.json
index 66c5ee75c2295..896f7be972565 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "@nextcloud/capabilities": "^1.2.1",
         "@nextcloud/dialogs": "^7.4.0",
         "@nextcloud/event-bus": "^3.3.3",
-        "@nextcloud/files": "^4.0.0",
+        "@nextcloud/files": "^4.1.0-beta.0",
         "@nextcloud/initial-state": "^3.0.0",
         "@nextcloud/l10n": "^3.4.1",
         "@nextcloud/logger": "^3.0.3",
@@ -34,6 +34,7 @@
         "marked": "^17.0.1",
         "p-queue": "^9.2.0",
         "pinia": "^3.0.4",
+        "query-string": "^9.4.0",
         "sortablejs": "^1.15.7",
         "vue": "^3.5.35",
         "vue-router": "^5.0.6",
@@ -856,7 +857,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -873,7 +873,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -890,7 +889,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -907,7 +905,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -924,7 +921,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -941,7 +937,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -958,7 +953,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -975,7 +969,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -992,7 +985,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1009,7 +1001,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1026,7 +1017,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1043,7 +1033,6 @@
       "cpu": [
         "loong64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1060,7 +1049,6 @@
       "cpu": [
         "mips64el"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1077,7 +1065,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1094,7 +1081,6 @@
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1111,7 +1097,6 @@
       "cpu": [
         "s390x"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1128,7 +1113,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1145,7 +1129,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1162,7 +1145,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1179,7 +1161,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1196,7 +1177,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1213,7 +1193,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1230,7 +1209,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1247,7 +1225,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1264,7 +1241,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1281,7 +1257,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2240,6 +2215,66 @@
         "node": "^20 || ^22 || ^24"
       }
     },
+    "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/files": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-4.0.0.tgz",
+      "integrity": "sha512-TmecnZIS+PGWGtRh7RpGEboCT4K6iTbHULUcfR6hs3eEzjDVsCc1Ldf8popGY/70lbpdlfYle8xbXnPIo3qaXA==",
+      "license": "AGPL-3.0-or-later",
+      "dependencies": {
+        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/capabilities": "^1.2.1",
+        "@nextcloud/l10n": "^3.4.1",
+        "@nextcloud/logger": "^3.0.3",
+        "@nextcloud/paths": "^3.0.0",
+        "@nextcloud/router": "^3.1.0",
+        "@nextcloud/sharing": "^0.3.0",
+        "is-svg": "^6.1.0",
+        "typescript-event-target": "^1.1.2",
+        "webdav": "^5.9.0"
+      },
+      "engines": {
+        "node": "^24.0.0"
+      }
+    },
+    "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/files/node_modules/@nextcloud/files": {
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.12.2.tgz",
+      "integrity": "sha512-vBo8tf3Xh6efiF8CrEo3pKj9AtvAF6RdDGO1XKL65IxV8+UUd9Uxl2lUExHlzoDRRczCqfGfaWfRRaFhYqce5Q==",
+      "license": "AGPL-3.0-or-later",
+      "optional": true,
+      "dependencies": {
+        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/capabilities": "^1.2.1",
+        "@nextcloud/l10n": "^3.4.1",
+        "@nextcloud/logger": "^3.0.3",
+        "@nextcloud/paths": "^3.0.0",
+        "@nextcloud/router": "^3.1.0",
+        "@nextcloud/sharing": "^0.3.0",
+        "cancelable-promise": "^4.3.1",
+        "is-svg": "^6.1.0",
+        "typescript-event-target": "^1.1.1",
+        "webdav": "^5.8.0"
+      },
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      }
+    },
+    "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/files/node_modules/@nextcloud/sharing": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/sharing/-/sharing-0.3.0.tgz",
+      "integrity": "sha512-kV7qeUZvd1fTKeFyH+W5Qq5rNOqG9rLATZM3U9MBxWXHJs3OxMqYQb8UQ3NYONzsX3zDGJmdQECIGHm1ei2sCA==",
+      "license": "GPL-3.0-or-later",
+      "dependencies": {
+        "@nextcloud/initial-state": "^3.0.0",
+        "is-svg": "^6.1.0"
+      },
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      },
+      "optionalDependencies": {
+        "@nextcloud/files": "^3.12.0"
+      }
+    },
     "node_modules/@nextcloud/dialogs/node_modules/@vueuse/core": {
       "version": "14.3.0",
       "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.3.0.tgz",
@@ -2346,63 +2381,27 @@
       }
     },
     "node_modules/@nextcloud/files": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-4.0.0.tgz",
-      "integrity": "sha512-TmecnZIS+PGWGtRh7RpGEboCT4K6iTbHULUcfR6hs3eEzjDVsCc1Ldf8popGY/70lbpdlfYle8xbXnPIo3qaXA==",
+      "version": "4.1.0-beta.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-4.1.0-beta.0.tgz",
+      "integrity": "sha512-0V6yO3yVUkYb5hzo4FAl1Rp/ysSr6D56fvq+5W/mhIoha0hTecfvx05Q+yzQJAziCBxLeMrWIuXrY4epDE/rZQ==",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
-        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/auth": "^2.6.0",
+        "@nextcloud/axios": "^2.6.0",
         "@nextcloud/capabilities": "^1.2.1",
         "@nextcloud/l10n": "^3.4.1",
         "@nextcloud/logger": "^3.0.3",
-        "@nextcloud/paths": "^3.0.0",
+        "@nextcloud/paths": "^3.1.0",
         "@nextcloud/router": "^3.1.0",
-        "@nextcloud/sharing": "^0.3.0",
+        "@nextcloud/sharing": "^0.4.0",
+        "axios-retry": "^4.5.0",
         "is-svg": "^6.1.0",
+        "p-queue": "^9.3.0",
         "typescript-event-target": "^1.1.2",
-        "webdav": "^5.9.0"
-      },
-      "engines": {
-        "node": "^24.0.0"
-      }
-    },
-    "node_modules/@nextcloud/files/node_modules/@nextcloud/files": {
-      "version": "3.12.2",
-      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.12.2.tgz",
-      "integrity": "sha512-vBo8tf3Xh6efiF8CrEo3pKj9AtvAF6RdDGO1XKL65IxV8+UUd9Uxl2lUExHlzoDRRczCqfGfaWfRRaFhYqce5Q==",
-      "license": "AGPL-3.0-or-later",
-      "optional": true,
-      "dependencies": {
-        "@nextcloud/auth": "^2.5.3",
-        "@nextcloud/capabilities": "^1.2.1",
-        "@nextcloud/l10n": "^3.4.1",
-        "@nextcloud/logger": "^3.0.3",
-        "@nextcloud/paths": "^3.0.0",
-        "@nextcloud/router": "^3.1.0",
-        "@nextcloud/sharing": "^0.3.0",
-        "cancelable-promise": "^4.3.1",
-        "is-svg": "^6.1.0",
-        "typescript-event-target": "^1.1.1",
-        "webdav": "^5.8.0"
-      },
-      "engines": {
-        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
-      }
-    },
-    "node_modules/@nextcloud/files/node_modules/@nextcloud/sharing": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/sharing/-/sharing-0.3.0.tgz",
-      "integrity": "sha512-kV7qeUZvd1fTKeFyH+W5Qq5rNOqG9rLATZM3U9MBxWXHJs3OxMqYQb8UQ3NYONzsX3zDGJmdQECIGHm1ei2sCA==",
-      "license": "GPL-3.0-or-later",
-      "dependencies": {
-        "@nextcloud/initial-state": "^3.0.0",
-        "is-svg": "^6.1.0"
+        "webdav": "^5.10.0"
       },
       "engines": {
-        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
-      },
-      "optionalDependencies": {
-        "@nextcloud/files": "^3.12.0"
+        "node": "^24.0.0 || >=26.0.0"
       }
     },
     "node_modules/@nextcloud/initial-state": {
@@ -2497,6 +2496,68 @@
         "@nextcloud/files": "^3.12.2 || ^4.0.0"
       }
     },
+    "node_modules/@nextcloud/sharing/node_modules/@nextcloud/files": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-4.0.0.tgz",
+      "integrity": "sha512-TmecnZIS+PGWGtRh7RpGEboCT4K6iTbHULUcfR6hs3eEzjDVsCc1Ldf8popGY/70lbpdlfYle8xbXnPIo3qaXA==",
+      "license": "AGPL-3.0-or-later",
+      "optional": true,
+      "dependencies": {
+        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/capabilities": "^1.2.1",
+        "@nextcloud/l10n": "^3.4.1",
+        "@nextcloud/logger": "^3.0.3",
+        "@nextcloud/paths": "^3.0.0",
+        "@nextcloud/router": "^3.1.0",
+        "@nextcloud/sharing": "^0.3.0",
+        "is-svg": "^6.1.0",
+        "typescript-event-target": "^1.1.2",
+        "webdav": "^5.9.0"
+      },
+      "engines": {
+        "node": "^24.0.0"
+      }
+    },
+    "node_modules/@nextcloud/sharing/node_modules/@nextcloud/sharing": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/sharing/-/sharing-0.3.0.tgz",
+      "integrity": "sha512-kV7qeUZvd1fTKeFyH+W5Qq5rNOqG9rLATZM3U9MBxWXHJs3OxMqYQb8UQ3NYONzsX3zDGJmdQECIGHm1ei2sCA==",
+      "license": "GPL-3.0-or-later",
+      "optional": true,
+      "dependencies": {
+        "@nextcloud/initial-state": "^3.0.0",
+        "is-svg": "^6.1.0"
+      },
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      },
+      "optionalDependencies": {
+        "@nextcloud/files": "^3.12.0"
+      }
+    },
+    "node_modules/@nextcloud/sharing/node_modules/@nextcloud/sharing/node_modules/@nextcloud/files": {
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.12.2.tgz",
+      "integrity": "sha512-vBo8tf3Xh6efiF8CrEo3pKj9AtvAF6RdDGO1XKL65IxV8+UUd9Uxl2lUExHlzoDRRczCqfGfaWfRRaFhYqce5Q==",
+      "license": "AGPL-3.0-or-later",
+      "optional": true,
+      "dependencies": {
+        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/capabilities": "^1.2.1",
+        "@nextcloud/l10n": "^3.4.1",
+        "@nextcloud/logger": "^3.0.3",
+        "@nextcloud/paths": "^3.0.0",
+        "@nextcloud/router": "^3.1.0",
+        "@nextcloud/sharing": "^0.3.0",
+        "cancelable-promise": "^4.3.1",
+        "is-svg": "^6.1.0",
+        "typescript-event-target": "^1.1.1",
+        "webdav": "^5.8.0"
+      },
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      }
+    },
     "node_modules/@nextcloud/stylelint-config": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/@nextcloud/stylelint-config/-/stylelint-config-3.2.2.tgz",
@@ -2756,7 +2817,6 @@
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
       "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
-      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -2796,7 +2856,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2817,7 +2876,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2838,7 +2896,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2859,7 +2916,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2880,7 +2936,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2901,7 +2956,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2922,7 +2976,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2943,7 +2996,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2964,7 +3016,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2985,7 +3036,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3006,7 +3056,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3027,7 +3076,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3048,7 +3096,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3245,7 +3292,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3259,7 +3305,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3273,7 +3318,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3287,7 +3331,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3301,7 +3344,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3315,7 +3357,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3329,7 +3370,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3343,7 +3383,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3357,7 +3396,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3371,7 +3409,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3385,7 +3422,6 @@
       "cpu": [
         "loong64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3399,7 +3435,6 @@
       "cpu": [
         "loong64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3413,7 +3448,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3427,7 +3461,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3441,7 +3474,6 @@
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3455,7 +3487,6 @@
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3469,7 +3500,6 @@
       "cpu": [
         "s390x"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3483,7 +3513,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3497,7 +3526,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3511,7 +3539,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3525,7 +3552,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3539,7 +3565,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3553,7 +3578,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3567,7 +3591,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3581,7 +3604,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4093,7 +4115,7 @@
       "version": "24.9.1",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.1.tgz",
       "integrity": "sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~7.16.0"
@@ -5554,6 +5576,18 @@
         "proxy-from-env": "^2.1.0"
       }
     },
+    "node_modules/axios-retry": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-4.5.0.tgz",
+      "integrity": "sha512-aR99oXhpEDGo0UuAlYcn2iGRds30k366Zfa05XWScR9QaQD4JYiP3/1Qt1u7YlefUOK+cn0CcwoL1oefavQUlQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "is-retry-allowed": "^2.2.0"
+      },
+      "peerDependencies": {
+        "axios": "0.x || 1.x"
+      }
+    },
     "node_modules/bail": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
@@ -5731,7 +5765,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
@@ -7269,6 +7303,15 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/decode-uri-component": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.4.1.tgz",
+      "integrity": "sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
     "node_modules/deep-equal": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
@@ -7452,7 +7495,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "bin": {
@@ -8141,7 +8183,7 @@
       "version": "0.25.11",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.11.tgz",
       "integrity": "sha512-KohQwyzrKTQmhXDW1PjCv3Tyspn9n5GcY2RTDqeORIdIJY8yKIF7sTSopFmn/wpMPW4rdPXI0UE5LJLuq3bx0Q==",
-      "dev": true,
+      "devOptional": true,
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -8993,7 +9035,7 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -9002,6 +9044,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/filter-obj": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz",
+      "integrity": "sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/find-cypress-specs": {
       "version": "1.54.12",
       "resolved": "https://registry.npmjs.org/find-cypress-specs/-/find-cypress-specs-1.54.12.tgz",
@@ -9246,7 +9300,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -9398,7 +9451,7 @@
       "version": "4.13.0",
       "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.0.tgz",
       "integrity": "sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "resolve-pkg-maps": "^1.0.0"
@@ -10072,7 +10125,7 @@
       "version": "5.1.5",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
       "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/import-fresh": {
@@ -10348,7 +10401,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -10388,7 +10441,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
@@ -10465,7 +10518,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
@@ -10567,6 +10620,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-retry-allowed": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
+      "integrity": "sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-set": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
@@ -12418,7 +12483,7 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
@@ -12432,7 +12497,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
       "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -12832,7 +12897,6 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
       "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "dev": true,
       "license": "MIT",
       "optional": true
     },
@@ -13184,9 +13248,9 @@
       }
     },
     "node_modules/p-queue": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-9.2.0.tgz",
-      "integrity": "sha512-dWgLE8AH0HjQ9fe74pUkKkvzzYT18Inp4zra3lKHnnwqGvcfcUBrvF2EAVX+envufDNBOzpPq/IBUONDbI7+3g==",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-9.3.0.tgz",
+      "integrity": "sha512-7NED7xhQ74Ngp4JP/2e0VZHp7vSWfJfqeiR92jPgxsz6m0Se4P03YoTKa9dDXyZ3r6P616gUXttrB6nnHYKang==",
       "license": "MIT",
       "dependencies": {
         "eventemitter3": "^5.0.4",
@@ -14070,6 +14134,23 @@
       ],
       "license": "MIT"
     },
+    "node_modules/query-string": {
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-9.4.0.tgz",
+      "integrity": "sha512-ivvWyHqU9K1Log4hJFhqVIIMoEi0nzmlRhvk2pPcTuQH/Y0K5iTTMxEx7R0PRHD2Z1hMVbWnjfsEWbIKIK+3IA==",
+      "license": "MIT",
+      "dependencies": {
+        "decode-uri-component": "^0.4.1",
+        "filter-obj": "^5.1.0",
+        "split-on-first": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/querystring-es3": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
@@ -14492,7 +14573,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
       "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
@@ -14809,7 +14890,7 @@
       "version": "1.100.0",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.100.0.tgz",
       "integrity": "sha512-B5j0rYMlinhhOo9tjQebMVVn0TfyXAF+wB3b2ggZUuJ/is/Y+7+JGjirAMxHZ9Z3hIP98NPfamlAkBHa1lAaXQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "chokidar": "^5.0.0",
@@ -15409,6 +15490,18 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/split-on-first": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-3.0.0.tgz",
+      "integrity": "sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/splitpanes": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/splitpanes/-/splitpanes-4.0.4.tgz",
@@ -16617,7 +16710,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
@@ -16758,7 +16851,7 @@
       "version": "4.20.6",
       "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.20.6.tgz",
       "integrity": "sha512-ytQKuwgmrrkDTFP4LjR0ToE2nqgy886GpvRSpU0JAnrdBYppuY5rLkRUYPU1yCryb24SsKBTL/hlDQAEFVwtZg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "~0.25.0",
@@ -16913,7 +17006,7 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
       "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/unicorn-magic": {
@@ -17391,7 +17484,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17408,7 +17500,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17425,7 +17516,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17442,7 +17532,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17459,7 +17548,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17476,7 +17564,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17493,7 +17580,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17510,7 +17596,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17527,7 +17612,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17544,7 +17628,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17561,7 +17644,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17578,7 +17660,6 @@
       "cpu": [
         "loong64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17595,7 +17676,6 @@
       "cpu": [
         "mips64el"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17612,7 +17692,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17629,7 +17708,6 @@
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17646,7 +17724,6 @@
       "cpu": [
         "s390x"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17663,7 +17740,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17680,7 +17756,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17697,7 +17772,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17714,7 +17788,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17731,7 +17804,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17748,7 +17820,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17765,7 +17836,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17782,7 +17852,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17799,7 +17868,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -17816,7 +17884,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
diff --git a/package.json b/package.json
index 4136e02ed9c3e..16d9b29ec8cd6 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "@nextcloud/capabilities": "^1.2.1",
     "@nextcloud/dialogs": "^7.4.0",
     "@nextcloud/event-bus": "^3.3.3",
-    "@nextcloud/files": "^4.0.0",
+    "@nextcloud/files": "^4.1.0-beta.0",
     "@nextcloud/initial-state": "^3.0.0",
     "@nextcloud/l10n": "^3.4.1",
     "@nextcloud/logger": "^3.0.3",
@@ -65,6 +65,7 @@
     "marked": "^17.0.1",
     "p-queue": "^9.2.0",
     "pinia": "^3.0.4",
+    "query-string": "^9.4.0",
     "sortablejs": "^1.15.7",
     "vue": "^3.5.35",
     "vue-router": "^5.0.6",