diff --git a/config/areas/languages/views.php b/config/areas/languages/views.php
index f37ded0247..f89d9bb80d 100644
--- a/config/areas/languages/views.php
+++ b/config/areas/languages/views.php
@@ -12,10 +12,11 @@
 			return App::instance()->option('languages.variables', true) !== false;
 		},
 		'action'  => function (string $code) {
+			$kirby        = App::instance();
 			$language     = Find::language($code);
 			$link         = '/languages/' . $language->code();
 			$strings      = [];
-			$foundation   = App::instance()->defaultLanguage()->translations();
+			$foundation   = $kirby->defaultLanguage()->translations();
 			$translations = $language->translations();
 
 			ksort($foundation);
@@ -67,6 +68,11 @@
 					]
 				],
 				'props'      => [
+					'buttons' => $kirby->option('panel.viewButtons.language', [
+						'preview',
+						'settings',
+						'remove'
+					]),
 					'deletable'    => $language->isDeletable(),
 					'code'         => Escape::html($language->code()),
 					'default'      => $language->isDefault(),
@@ -107,6 +113,9 @@
 			return [
 				'component' => 'k-languages-view',
 				'props'     => [
+					'buttons' => $kirby->option('panel.viewButtons.languages', [
+						'add'
+					]),
 					'languages' => $kirby->languages()->values(fn ($language) => [
 						'deletable' => $language->isDeletable(),
 						'default'   => $language->isDefault(),
diff --git a/config/areas/system/views.php b/config/areas/system/views.php
index 01f2eb23c0..49da8bb672 100644
--- a/config/areas/system/views.php
+++ b/config/areas/system/views.php
@@ -87,6 +87,7 @@
 			return [
 				'component' => 'k-system-view',
 				'props'     => [
+					'buttons'     => $kirby->option('panel.viewButtons.system', []),
 					'environment' => $environment,
 					'exceptions'  => $kirby->option('debug') === true ? $exceptions : [],
 					'info'        => $system->info(),
diff --git a/config/areas/users/views.php b/config/areas/users/views.php
index 5f0ce9d940..bf75a0d7e7 100644
--- a/config/areas/users/views.php
+++ b/config/areas/users/views.php
@@ -18,7 +18,10 @@
 			return [
 				'component' => 'k-users-view',
 				'props'     => [
-					'role' => function () use ($kirby, $roles, $role) {
+					'buttons' => $kirby->option('panel.viewButtons.users', [
+						'add'
+					]),
+					'role' => function () use ($roles, $role) {
 						if ($role) {
 							return $roles[$role] ?? null;
 						}
diff --git a/config/fields/radio.php b/config/fields/radio.php
index 48460539ea..9ec7c43485 100644
--- a/config/fields/radio.php
+++ b/config/fields/radio.php
@@ -20,7 +20,8 @@
 	],
 	'computed' => [
 		'default' => function () {
-			return $this->sanitizeOption($this->default);
+			$default = $this->model()->toString($this->default);
+			return $this->sanitizeOption($default);
 		},
 		'value' => function () {
 			return $this->sanitizeOption($this->value) ?? '';
diff --git a/config/fields/select.php b/config/fields/select.php
index 2f09c2d78c..4c06ef9e95 100644
--- a/config/fields/select.php
+++ b/config/fields/select.php
@@ -17,7 +17,7 @@
 			return $icon;
 		},
 		/**
-		 * Custom placeholder string for empty option.
+		 * Text shown when no option is selected yet
 		 */
 		'placeholder' => function (string $placeholder = '—') {
 			return $placeholder;
diff --git a/panel/lab/components/inputs/select/index.vue b/panel/lab/components/inputs/select/index.vue
index 2c0f2a69f2..83b1f96f23 100644
--- a/panel/lab/components/inputs/select/index.vue
+++ b/panel/lab/components/inputs/select/index.vue
@@ -56,13 +56,8 @@
 				/>
 			</k-lab-example>
 
-			<k-lab-example label="Empty: false">
-				<k-select-input
-					:empty="false"
-					:options="options"
-					:value="value"
-					@input="value = $event"
-				/>
+			<k-lab-example label="No empty option">
+				<k-select-input :required="true" :options="options" value="b" />
 			</k-lab-example>
 
 			<k-lab-example label="Multiple: true">
diff --git a/panel/lab/components/login/1_login-form/index.php b/panel/lab/components/login/1_login-form/index.php
new file mode 100644
index 0000000000..dcd29e629a
--- /dev/null
+++ b/panel/lab/components/login/1_login-form/index.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+	'docs' => 'k-login-form'
+];
diff --git a/panel/lab/components/login/1_login-form/index.vue b/panel/lab/components/login/1_login-form/index.vue
new file mode 100644
index 0000000000..3a3ae4b691
--- /dev/null
+++ b/panel/lab/components/login/1_login-form/index.vue
@@ -0,0 +1,26 @@
+<template>
+	<k-lab-examples>
+		<k-lab-example label="Default">
+			<k-login-form />
+		</k-lab-example>
+		<k-lab-example label="With password">
+			<k-login-form :methods="['password']" />
+		</k-lab-example>
+		<k-lab-example label="Prefilled">
+			<k-login-form
+				:methods="['password']"
+				:value="{
+					email: 'homer@simpson.com',
+					password: 'password1',
+					remember: true
+				}"
+			/>
+		</k-lab-example>
+		<k-lab-example label="Toggle between login methods">
+			<k-login-form :methods="['password', 'code']" />
+		</k-lab-example>
+		<k-lab-example label="Password reset">
+			<k-login-form :methods="['password', 'password-reset']" />
+		</k-lab-example>
+	</k-lab-examples>
+</template>
diff --git a/panel/lab/components/login/2_login-code-form/index.php b/panel/lab/components/login/2_login-code-form/index.php
new file mode 100644
index 0000000000..4bc5ea487d
--- /dev/null
+++ b/panel/lab/components/login/2_login-code-form/index.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+	'docs' => 'k-login-code-form'
+];
diff --git a/panel/lab/components/login/2_login-code-form/index.vue b/panel/lab/components/login/2_login-code-form/index.vue
new file mode 100644
index 0000000000..77f7aa5dd9
--- /dev/null
+++ b/panel/lab/components/login/2_login-code-form/index.vue
@@ -0,0 +1,15 @@
+<template>
+	<k-lab-examples>
+		<k-lab-example label="Default">
+			<k-login-code-form />
+		</k-lab-example>
+		<k-lab-example label="Prefilled">
+			<k-login-code-form value="123456" />
+		</k-lab-example>
+		<k-lab-example label="Pending info">
+			<k-login-code-form
+				:pending="{ email: 'homer@simpson.com', challenge: 'totp' }"
+			/>
+		</k-lab-example>
+	</k-lab-examples>
+</template>
diff --git a/panel/lab/components/uploads/1_upload-items/index.php b/panel/lab/components/uploads/1_upload-items/index.php
new file mode 100644
index 0000000000..dbc4bee102
--- /dev/null
+++ b/panel/lab/components/uploads/1_upload-items/index.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+	'docs' => 'k-upload-items',
+];
diff --git a/panel/lab/components/uploads/1_upload-items/index.vue b/panel/lab/components/uploads/1_upload-items/index.vue
new file mode 100644
index 0000000000..eab0b53a0b
--- /dev/null
+++ b/panel/lab/components/uploads/1_upload-items/index.vue
@@ -0,0 +1,54 @@
+<template>
+	<k-lab-examples>
+		<k-lab-example label="Upload Items">
+			<k-upload-items :items="items" @remove="remove" @rename="rename" />
+		</k-lab-example>
+	</k-lab-examples>
+</template>
+
+<script>
+export default {
+	computed: {
+		items() {
+			return [
+				{
+					extension: "jpeg",
+					type: "image/jpeg",
+					name: "test",
+					niceSize: "128 KB",
+					url: "https://picsum.photos/200/200"
+				},
+				{
+					extension: "pdf",
+					type: "application/pdf",
+					name: "document",
+					niceSize: "1.5 MB",
+					url: "/some.pdf"
+				},
+				{
+					extension: "mp4",
+					type: "video/mp4",
+					name: "screencast",
+					niceSize: "3 GB",
+					url: "/some.mp4"
+				},
+				{
+					extension: "mp3",
+					type: "audio/mp3",
+					name: "song",
+					niceSize: "2.5 MB",
+					url: "/some.mp3"
+				}
+			];
+		}
+	},
+	methods: {
+		remove(file) {
+			console.log("Remove", { file });
+		},
+		rename(file, name) {
+			console.log("Rename", { file, name });
+		}
+	}
+};
+</script>
diff --git a/panel/lab/components/uploads/2_upload-item/index.php b/panel/lab/components/uploads/2_upload-item/index.php
new file mode 100644
index 0000000000..312c6f3e6b
--- /dev/null
+++ b/panel/lab/components/uploads/2_upload-item/index.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+	'docs' => 'k-upload-item',
+];
diff --git a/panel/lab/components/uploads/2_upload-item/index.vue b/panel/lab/components/uploads/2_upload-item/index.vue
new file mode 100644
index 0000000000..9ffaf8bb42
--- /dev/null
+++ b/panel/lab/components/uploads/2_upload-item/index.vue
@@ -0,0 +1,74 @@
+<template>
+	<k-lab-examples>
+		<k-lab-example label="Upload Item">
+			<k-upload-item
+				extension="jpeg"
+				type="image/jpeg"
+				name="test"
+				niceSize="128 kB"
+				url="https://picsum.photos/200/200"
+				@remove="remove"
+				@rename="rename"
+			/>
+		</k-lab-example>
+		<k-lab-example label="Progress">
+			<k-upload-item
+				:progress="80"
+				extension="jpeg"
+				type="image/jpeg"
+				name="test"
+				niceSize="128 kB"
+				url="https://picsum.photos/200/200"
+				@remove="remove"
+				@rename="rename"
+			/>
+		</k-lab-example>
+		<k-lab-example label="Completed">
+			<k-upload-item
+				:completed="true"
+				extension="jpeg"
+				type="image/jpeg"
+				name="test"
+				niceSize="128 kB"
+				url="https://picsum.photos/200/200"
+				@remove="remove"
+				@rename="rename"
+			/>
+		</k-lab-example>
+		<k-lab-example label="Not editable">
+			<k-upload-item
+				:editable="false"
+				extension="jpeg"
+				type="image/jpeg"
+				name="test"
+				niceSize="128 kB"
+				url="https://picsum.photos/200/200"
+			/>
+		</k-lab-example>
+		<k-lab-example label="Error">
+			<k-upload-item
+				extension="jpeg"
+				type="image/jpeg"
+				name="test"
+				niceSize="128 kB"
+				error="The file could not be uploaded"
+				url="https://picsum.photos/200/200"
+				@remove="remove"
+				@rename="rename"
+			/>
+		</k-lab-example>
+	</k-lab-examples>
+</template>
+
+<script>
+export default {
+	methods: {
+		remove() {
+			console.log("Remove");
+		},
+		rename(name) {
+			console.log("Rename to", name);
+		}
+	}
+};
+</script>
diff --git a/panel/lab/components/uploads/3_upload-item-preview/index.php b/panel/lab/components/uploads/3_upload-item-preview/index.php
new file mode 100644
index 0000000000..1f1fdef1d1
--- /dev/null
+++ b/panel/lab/components/uploads/3_upload-item-preview/index.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+	'docs' => 'k-upload-item-preview',
+];
diff --git a/panel/lab/components/uploads/3_upload-item-preview/index.vue b/panel/lab/components/uploads/3_upload-item-preview/index.vue
new file mode 100644
index 0000000000..fd9da28e8c
--- /dev/null
+++ b/panel/lab/components/uploads/3_upload-item-preview/index.vue
@@ -0,0 +1,34 @@
+<template>
+	<k-lab-examples>
+		<k-lab-example label="Image with preview">
+			<k-upload-item-preview
+				type="image/jpeg"
+				url="https://picsum.photos/200/200"
+			/>
+		</k-lab-example>
+		<k-lab-example label="Image without preview">
+			<k-upload-item-preview
+				type="image/bitmap"
+				url="https://picsum.photos/200/200"
+			/>
+		</k-lab-example>
+		<k-lab-example label="Audio">
+			<k-upload-item-preview type="audio/mp3" url="/some.mp3" />
+		</k-lab-example>
+		<k-lab-example label="Video">
+			<k-upload-item-preview type="video/mp4" url="/some.mp4" />
+		</k-lab-example>
+		<k-lab-example label="Icon">
+			<k-upload-item-preview icon="image" url="/some.mp4" />
+		</k-lab-example>
+		<k-lab-example label="Color">
+			<k-upload-item-preview color="pink-500" icon="heart" url="/some.mp4" />
+		</k-lab-example>
+	</k-lab-examples>
+</template>
+
+<style>
+.k-lab-example .k-upload-item-preview {
+	width: 6rem;
+}
+</style>
diff --git a/panel/lab/internals/panel/notification/index.vue b/panel/lab/internals/panel/notification/index.vue
index 2e46b6f1c1..4e109f7630 100644
--- a/panel/lab/internals/panel/notification/index.vue
+++ b/panel/lab/internals/panel/notification/index.vue
@@ -9,7 +9,7 @@
 				</p>
 				<k-code>{{ $panel.notification.context || "&nbsp;" }}</k-code>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="$panel.notification.success('Yay')"
 				/>
@@ -24,7 +24,7 @@
 				</p>
 				<k-code>{{ $panel.notification.details || "&nbsp;" }}</k-code>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="
 						$panel.notification.success({
@@ -44,7 +44,7 @@
 				</p>
 				<k-code>{{ $panel.notification.icon || "&nbsp;" }}</k-code>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="
 						$panel.notification.success({
@@ -55,6 +55,19 @@
 				/>
 			</k-text>
 		</k-lab-example>
+		<k-lab-example label="info" :code="false">
+			<k-text>
+				<k-code language="js"
+					>window.panel.notification.info(notification);</k-code
+				>
+				<p>Displays an info notification</p>
+				<k-button
+					icon="megaphone"
+					variant="filled"
+					@click="$panel.notification.info('Did you know?')"
+				/>
+			</k-text>
+		</k-lab-example>
 		<k-lab-example label="message" :code="false">
 			<k-text>
 				<p>
@@ -63,7 +76,7 @@
 				</p>
 				<k-code>{{ $panel.notification.message || "&nbsp;" }}</k-code>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="
 						$panel.notification.success({
@@ -81,7 +94,7 @@
 				</p>
 				<k-code>{{ $panel.notification.timeout || "&nbsp;" }}</k-code>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="
 						$panel.notification.success({
@@ -100,7 +113,7 @@
 				</p>
 				<k-code>{{ $panel.notification.type || "&nbsp;" }}</k-code>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="
 						$panel.notification.success({
@@ -118,7 +131,7 @@
 				<k-code language="js">window.panel.notification.close();</k-code>
 				<p>Closes the current notification</p>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="$panel.notification.success('Nice one!')"
 				/>
@@ -136,7 +149,7 @@
 				>
 				<p>Used to show a deprecation warning in the console.</p>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="$panel.notification.deprecated('Don`t use this anymore')"
 				/>
@@ -149,7 +162,7 @@
 				>
 				<p>Displays an error notification.</p>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="$panel.notification.error('Something went wrong')"
 				/>
@@ -162,7 +175,7 @@
 				>
 				<p>Displays a fatal error in an iframe overlay for better isolation</p>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="$panel.notification.fatal('Something went wrong')"
 				/>
@@ -174,11 +187,18 @@
 					>window.panel.notification.open(notification);</k-code
 				>
 				<p>Open a custom notification</p>
+				<k-input :value="icon" type="text" @input="icon = $event" />
+				<k-input :value="text" type="text" @input="text = $event" />
+				<k-input :value="theme" type="text" @input="theme = $event" />
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="
-						$panel.notification.open({ type: 'success', message: 'Nice one!' })
+						$panel.notification.open({
+							message: text,
+							icon,
+							theme
+						})
 					"
 				/>
 			</k-text>
@@ -190,7 +210,7 @@
 				>
 				<p>Displays a success notification</p>
 				<k-button
-					icon="alert"
+					icon="megaphone"
 					variant="filled"
 					@click="$panel.notification.success('Nice one!')"
 				/>
@@ -198,3 +218,15 @@
 		</k-lab-example>
 	</k-lab-examples>
 </template>
+
+<script>
+export default {
+	data() {
+		return {
+			icon: "check",
+			text: "Yay",
+			theme: "positive"
+		};
+	}
+};
+</script>
diff --git a/panel/package-lock.json b/panel/package-lock.json
index 10a2091d13..7968db2048 100644
--- a/panel/package-lock.json
+++ b/panel/package-lock.json
@@ -8,15 +8,15 @@
 			"dependencies": {
 				"autosize": "^6.0.1",
 				"container-query-polyfill": "^1.0.2",
-				"dayjs": "^1.11.10",
+				"dayjs": "^1.11.11",
 				"mitt": "^3.0.1",
 				"prosemirror-commands": "^1.5.2",
 				"prosemirror-history": "^1.4.0",
 				"prosemirror-inputrules": "^1.4.0",
 				"prosemirror-keymap": "^1.2.2",
-				"prosemirror-model": "^1.20.0",
+				"prosemirror-model": "^1.21.0",
 				"prosemirror-schema-list": "^1.3.0",
-				"prosemirror-view": "^1.33.4",
+				"prosemirror-view": "^1.33.7",
 				"sortablejs": "^1.15.2",
 				"vue": "^3.4.21",
 				"vuedraggable": "^4.1.0",
@@ -25,51 +25,43 @@
 			"devDependencies": {
 				"@vitejs/plugin-vue": "^5.0.4",
 				"@vue/compiler-sfc": "^3.4.21",
-				"eslint": "^9.0.0",
+				"eslint": "^9.4.0",
 				"eslint-config-prettier": "^9.1.0",
-				"eslint-plugin-vue": "^9.24.1",
-				"glob": "^10.3.12",
-				"jsdom": "^24.0.0",
+				"eslint-plugin-vue": "^9.26.0",
+				"glob": "^10.4.1",
+				"jsdom": "^24.1.0",
 				"prettier": "^3.2.5",
 				"rollup-plugin-external-globals": "^0.10.0",
-				"terser": "^5.30.3",
-				"vite": "^5.2.8",
-				"vite-plugin-static-copy": "^1.0.2",
-				"vitest": "^1.5.0",
-				"vue-docgen-api": "^4.78.0"
-			}
-		},
-		"node_modules/@aashutoshrathi/word-wrap": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-			"integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+				"terser": "^5.31.0",
+				"vite": "^5.2.12",
+				"vite-plugin-static-copy": "^1.0.5",
+				"vitest": "^1.6.0",
+				"vue-docgen-api": "^4.78.0",
+				"vue-template-compiler": "^2.7.16"
 			}
 		},
 		"node_modules/@babel/helper-string-parser": {
-			"version": "7.23.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-			"integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+			"version": "7.24.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
+			"integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==",
 			"dev": true,
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.22.20",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-			"integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+			"version": "7.24.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz",
+			"integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==",
 			"dev": true,
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/parser": {
-			"version": "7.24.4",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",
-			"integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
+			"version": "7.24.5",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz",
+			"integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==",
 			"bin": {
 				"parser": "bin/babel-parser.js"
 			},
@@ -78,13 +70,13 @@
 			}
 		},
 		"node_modules/@babel/types": {
-			"version": "7.23.4",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.4.tgz",
-			"integrity": "sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==",
+			"version": "7.24.5",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.5.tgz",
+			"integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==",
 			"dev": true,
 			"dependencies": {
-				"@babel/helper-string-parser": "^7.23.4",
-				"@babel/helper-validator-identifier": "^7.22.20",
+				"@babel/helper-string-parser": "^7.24.1",
+				"@babel/helper-validator-identifier": "^7.24.5",
 				"to-fast-properties": "^2.0.0"
 			},
 			"engines": {
@@ -122,19 +114,45 @@
 				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
 			}
 		},
+		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
 		"node_modules/@eslint-community/regexpp": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
-			"integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
+			"version": "4.10.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
+			"integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
 			"dev": true,
 			"engines": {
 				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
 			}
 		},
+		"node_modules/@eslint/config-array": {
+			"version": "0.15.1",
+			"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.15.1.tgz",
+			"integrity": "sha512-K4gzNq+yymn/EVsXYmf+SBcBro8MTf+aXJZUphM96CdzUEr+ClGDvAbpmaEK+cGVigVXIgs9gNmvHAlrzzY5JQ==",
+			"dev": true,
+			"dependencies": {
+				"@eslint/object-schema": "^2.1.3",
+				"debug": "^4.3.1",
+				"minimatch": "^3.0.5"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			}
+		},
 		"node_modules/@eslint/eslintrc": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.0.2.tgz",
-			"integrity": "sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
+			"integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==",
 			"dev": true,
 			"dependencies": {
 				"ajv": "^6.12.4",
@@ -154,56 +172,22 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/@eslint/eslintrc/node_modules/eslint-visitor-keys": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
-			"integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
-			"dev": true,
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/@eslint/eslintrc/node_modules/espree": {
-			"version": "10.0.1",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-10.0.1.tgz",
-			"integrity": "sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==",
-			"dev": true,
-			"dependencies": {
-				"acorn": "^8.11.3",
-				"acorn-jsx": "^5.3.2",
-				"eslint-visitor-keys": "^4.0.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
 		"node_modules/@eslint/js": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.0.0.tgz",
-			"integrity": "sha512-RThY/MnKrhubF6+s1JflwUjPEsnCEmYCWwqa/aRISKWNXGZ9epUwft4bUMM35SdKF9xvBrLydAM1RDHd1Z//ZQ==",
+			"version": "9.4.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.4.0.tgz",
+			"integrity": "sha512-fdI7VJjP3Rvc70lC4xkFXHB0fiPeojiL1PxVG6t1ZvXQrarj893PweuBTujxDUFk0Fxj4R7PIIAZ/aiiyZPZcg==",
 			"dev": true,
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
-		"node_modules/@humanwhocodes/config-array": {
-			"version": "0.12.3",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.12.3.tgz",
-			"integrity": "sha512-jsNnTBlMWuTpDkeE3on7+dWJi0D6fdDfeANj/w7MpS8ztROCoLvIO2nG0CcFj+E4k8j4QrSTh4Oryi3i2G669g==",
+		"node_modules/@eslint/object-schema": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.3.tgz",
+			"integrity": "sha512-HAbhAYKfsAC2EkTqve00ibWIZlaU74Z1EHwAjYr4PXF0YU2VEA1zSIKSSpKszRLRWwHzzRZXvK632u+uXzvsvw==",
 			"dev": true,
-			"dependencies": {
-				"@humanwhocodes/object-schema": "^2.0.3",
-				"debug": "^4.3.1",
-				"minimatch": "^3.0.5"
-			},
 			"engines": {
-				"node": ">=10.10.0"
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
 		"node_modules/@humanwhocodes/module-importer": {
@@ -219,11 +203,18 @@
 				"url": "https://github.com/sponsors/nzakas"
 			}
 		},
-		"node_modules/@humanwhocodes/object-schema": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-			"integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-			"dev": true
+		"node_modules/@humanwhocodes/retry": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz",
+			"integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==",
+			"dev": true,
+			"engines": {
+				"node": ">=18.18"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/nzakas"
+			}
 		},
 		"node_modules/@isaacs/cliui": {
 			"version": "8.0.2",
@@ -282,61 +273,60 @@
 			}
 		},
 		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-			"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
 			"dev": true,
 			"dependencies": {
-				"@jridgewell/set-array": "^1.0.1",
+				"@jridgewell/set-array": "^1.2.1",
 				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/trace-mapping": "^0.3.24"
 			},
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-			"integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
 			"dev": true,
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
 			"dev": true,
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/source-map": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz",
-			"integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==",
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
 			"dev": true,
 			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25"
 			}
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.4.14",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-			"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-			"dev": true
+			"version": "1.4.15",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
 		},
 		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.17",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-			"integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+			"version": "0.3.25",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
 			"dev": true,
 			"dependencies": {
-				"@jridgewell/resolve-uri": "3.1.0",
-				"@jridgewell/sourcemap-codec": "1.4.14"
+				"@jridgewell/resolve-uri": "^3.1.0",
+				"@jridgewell/sourcemap-codec": "^1.4.14"
 			}
 		},
 		"node_modules/@nodelib/fs.scandir": {
@@ -406,10 +396,16 @@
 				}
 			}
 		},
+		"node_modules/@rollup/pluginutils/node_modules/estree-walker": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+			"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+			"dev": true
+		},
 		"node_modules/@rollup/rollup-darwin-arm64": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz",
-			"integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==",
+			"version": "4.17.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
+			"integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
 			"cpu": [
 				"arm64"
 			],
@@ -431,21 +427,10 @@
 			"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
 			"dev": true
 		},
-		"node_modules/@types/node": {
-			"version": "20.9.0",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz",
-			"integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==",
-			"dev": true,
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"undici-types": "~5.26.4"
-			}
-		},
 		"node_modules/@vitejs/plugin-vue": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.0.4.tgz",
-			"integrity": "sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==",
+			"version": "5.0.5",
+			"resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.0.5.tgz",
+			"integrity": "sha512-LOjm7XeIimLBZyzinBQ6OSm3UBCNVCpLkxGC0oWmm2YPzVZoxMsdvNVimLTBzpAnR9hl/yn1SHGuRfe6/Td9rQ==",
 			"dev": true,
 			"engines": {
 				"node": "^18.0.0 || >=20.0.0"
@@ -456,13 +441,13 @@
 			}
 		},
 		"node_modules/@vitest/expect": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.5.0.tgz",
-			"integrity": "sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.6.0.tgz",
+			"integrity": "sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==",
 			"dev": true,
 			"dependencies": {
-				"@vitest/spy": "1.5.0",
-				"@vitest/utils": "1.5.0",
+				"@vitest/spy": "1.6.0",
+				"@vitest/utils": "1.6.0",
 				"chai": "^4.3.10"
 			},
 			"funding": {
@@ -470,12 +455,12 @@
 			}
 		},
 		"node_modules/@vitest/runner": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.5.0.tgz",
-			"integrity": "sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.6.0.tgz",
+			"integrity": "sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==",
 			"dev": true,
 			"dependencies": {
-				"@vitest/utils": "1.5.0",
+				"@vitest/utils": "1.6.0",
 				"p-limit": "^5.0.0",
 				"pathe": "^1.1.1"
 			},
@@ -511,9 +496,9 @@
 			}
 		},
 		"node_modules/@vitest/snapshot": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.5.0.tgz",
-			"integrity": "sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.6.0.tgz",
+			"integrity": "sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==",
 			"dev": true,
 			"dependencies": {
 				"magic-string": "^0.30.5",
@@ -525,9 +510,9 @@
 			}
 		},
 		"node_modules/@vitest/spy": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.0.tgz",
-			"integrity": "sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.6.0.tgz",
+			"integrity": "sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==",
 			"dev": true,
 			"dependencies": {
 				"tinyspy": "^2.2.0"
@@ -537,9 +522,9 @@
 			}
 		},
 		"node_modules/@vitest/utils": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.0.tgz",
-			"integrity": "sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.6.0.tgz",
+			"integrity": "sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==",
 			"dev": true,
 			"dependencies": {
 				"diff-sequences": "^29.6.3",
@@ -551,109 +536,110 @@
 				"url": "https://opencollective.com/vitest"
 			}
 		},
-		"node_modules/@vitest/utils/node_modules/estree-walker": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
-			"integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-			"dev": true,
-			"dependencies": {
-				"@types/estree": "^1.0.0"
-			}
-		},
 		"node_modules/@vue/compiler-core": {
-			"version": "3.4.23",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.23.tgz",
-			"integrity": "sha512-HAFmuVEwNqNdmk+w4VCQ2pkLk1Vw4XYiiyxEp3z/xvl14aLTUBw2OfVH3vBcx+FtGsynQLkkhK410Nah1N2yyQ==",
+			"version": "3.4.27",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+			"integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
 			"dependencies": {
-				"@babel/parser": "^7.24.1",
-				"@vue/shared": "3.4.23",
+				"@babel/parser": "^7.24.4",
+				"@vue/shared": "3.4.27",
 				"entities": "^4.5.0",
 				"estree-walker": "^2.0.2",
 				"source-map-js": "^1.2.0"
 			}
 		},
+		"node_modules/@vue/compiler-core/node_modules/estree-walker": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+			"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+		},
 		"node_modules/@vue/compiler-dom": {
-			"version": "3.4.23",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.23.tgz",
-			"integrity": "sha512-t0b9WSTnCRrzsBGrDd1LNR5HGzYTr7LX3z6nNBG+KGvZLqrT0mY6NsMzOqlVMBKKXKVuusbbB5aOOFgTY+senw==",
+			"version": "3.4.27",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+			"integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
 			"dependencies": {
-				"@vue/compiler-core": "3.4.23",
-				"@vue/shared": "3.4.23"
+				"@vue/compiler-core": "3.4.27",
+				"@vue/shared": "3.4.27"
 			}
 		},
 		"node_modules/@vue/compiler-sfc": {
-			"version": "3.4.23",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.23.tgz",
-			"integrity": "sha512-fSDTKTfzaRX1kNAUiaj8JB4AokikzStWgHooMhaxyjZerw624L+IAP/fvI4ZwMpwIh8f08PVzEnu4rg8/Npssw==",
-			"dependencies": {
-				"@babel/parser": "^7.24.1",
-				"@vue/compiler-core": "3.4.23",
-				"@vue/compiler-dom": "3.4.23",
-				"@vue/compiler-ssr": "3.4.23",
-				"@vue/shared": "3.4.23",
+			"version": "3.4.27",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz",
+			"integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==",
+			"dependencies": {
+				"@babel/parser": "^7.24.4",
+				"@vue/compiler-core": "3.4.27",
+				"@vue/compiler-dom": "3.4.27",
+				"@vue/compiler-ssr": "3.4.27",
+				"@vue/shared": "3.4.27",
 				"estree-walker": "^2.0.2",
-				"magic-string": "^0.30.8",
+				"magic-string": "^0.30.10",
 				"postcss": "^8.4.38",
 				"source-map-js": "^1.2.0"
 			}
 		},
+		"node_modules/@vue/compiler-sfc/node_modules/estree-walker": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+			"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+		},
 		"node_modules/@vue/compiler-ssr": {
-			"version": "3.4.23",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.23.tgz",
-			"integrity": "sha512-hb6Uj2cYs+tfqz71Wj6h3E5t6OKvb4MVcM2Nl5i/z1nv1gjEhw+zYaNOV+Xwn+SSN/VZM0DgANw5TuJfxfezPg==",
+			"version": "3.4.27",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+			"integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
 			"dependencies": {
-				"@vue/compiler-dom": "3.4.23",
-				"@vue/shared": "3.4.23"
+				"@vue/compiler-dom": "3.4.27",
+				"@vue/shared": "3.4.27"
 			}
 		},
 		"node_modules/@vue/devtools-api": {
-			"version": "6.6.1",
-			"resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.1.tgz",
-			"integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA=="
+			"version": "6.6.2",
+			"resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.2.tgz",
+			"integrity": "sha512-134clD8u7cBBXdmBbXI282gHGF7T/eAbD/G7mAK2llQF62IbI4ny28IVamZVMoJSvfImC2Xxnj732hXkJvUj6g=="
 		},
 		"node_modules/@vue/reactivity": {
-			"version": "3.4.23",
-			"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.23.tgz",
-			"integrity": "sha512-GlXR9PL+23fQ3IqnbSQ8OQKLodjqCyoCrmdLKZk3BP7jN6prWheAfU7a3mrltewTkoBm+N7qMEb372VHIkQRMQ==",
+			"version": "3.4.27",
+			"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.27.tgz",
+			"integrity": "sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==",
 			"dependencies": {
-				"@vue/shared": "3.4.23"
+				"@vue/shared": "3.4.27"
 			}
 		},
 		"node_modules/@vue/runtime-core": {
-			"version": "3.4.23",
-			"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.23.tgz",
-			"integrity": "sha512-FeQ9MZEXoFzFkFiw9MQQ/FWs3srvrP+SjDKSeRIiQHIhtkzoj0X4rWQlRNHbGuSwLra6pMyjAttwixNMjc/xLw==",
+			"version": "3.4.27",
+			"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.27.tgz",
+			"integrity": "sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==",
 			"dependencies": {
-				"@vue/reactivity": "3.4.23",
-				"@vue/shared": "3.4.23"
+				"@vue/reactivity": "3.4.27",
+				"@vue/shared": "3.4.27"
 			}
 		},
 		"node_modules/@vue/runtime-dom": {
-			"version": "3.4.23",
-			"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.23.tgz",
-			"integrity": "sha512-RXJFwwykZWBkMiTPSLEWU3kgVLNAfActBfWFlZd0y79FTUxexogd0PLG4HH2LfOktjRxV47Nulygh0JFXe5f9A==",
+			"version": "3.4.27",
+			"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz",
+			"integrity": "sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==",
 			"dependencies": {
-				"@vue/runtime-core": "3.4.23",
-				"@vue/shared": "3.4.23",
+				"@vue/runtime-core": "3.4.27",
+				"@vue/shared": "3.4.27",
 				"csstype": "^3.1.3"
 			}
 		},
 		"node_modules/@vue/server-renderer": {
-			"version": "3.4.23",
-			"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.23.tgz",
-			"integrity": "sha512-LDwGHtnIzvKFNS8dPJ1SSU5Gvm36p2ck8wCZc52fc3k/IfjKcwCyrWEf0Yag/2wTFUBXrqizfhK9c/mC367dXQ==",
+			"version": "3.4.27",
+			"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.27.tgz",
+			"integrity": "sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==",
 			"dependencies": {
-				"@vue/compiler-ssr": "3.4.23",
-				"@vue/shared": "3.4.23"
+				"@vue/compiler-ssr": "3.4.27",
+				"@vue/shared": "3.4.27"
 			},
 			"peerDependencies": {
-				"vue": "3.4.23"
+				"vue": "3.4.27"
 			}
 		},
 		"node_modules/@vue/shared": {
-			"version": "3.4.23",
-			"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.23.tgz",
-			"integrity": "sha512-wBQ0gvf+SMwsCQOyusNw/GoXPV47WGd1xB5A1Pgzy0sQ3Bi5r5xm3n+92y3gCnB3MWqnRDdvfkRGxhKtbBRNgg=="
+			"version": "3.4.27",
+			"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+			"integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
 		},
 		"node_modules/acorn": {
 			"version": "8.11.3",
@@ -686,9 +672,9 @@
 			}
 		},
 		"node_modules/agent-base": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-			"integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+			"integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
 			"dev": true,
 			"dependencies": {
 				"debug": "^4.3.4"
@@ -762,18 +748,6 @@
 			"integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
 			"dev": true
 		},
-		"node_modules/assert": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-			"integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
-			"dev": true,
-			"dependencies": {
-				"es6-object-assign": "^1.1.0",
-				"is-nan": "^1.2.1",
-				"object-is": "^1.0.1",
-				"util": "^0.12.0"
-			}
-		},
 		"node_modules/assert-never": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz",
@@ -812,18 +786,6 @@
 			"resolved": "https://registry.npmjs.org/autosize/-/autosize-6.0.1.tgz",
 			"integrity": "sha512-f86EjiUKE6Xvczc4ioP1JBlWG7FKrE13qe/DxBCpe8GCipCq2nFw73aO8QEBKHfSbYGDN5eB9jXWKen7tspDqQ=="
 		},
-		"node_modules/available-typed-arrays": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-			"integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/babel-walk": {
 			"version": "3.0.0-canary-5",
 			"resolved": "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz",
@@ -843,12 +805,15 @@
 			"dev": true
 		},
 		"node_modules/binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+			"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
 			"dev": true,
 			"engines": {
 				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/boolbase": {
@@ -895,13 +860,19 @@
 			}
 		},
 		"node_modules/call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+			"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
 			"dev": true,
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"set-function-length": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -950,18 +921,6 @@
 				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"node_modules/chalk/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/character-parser": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
@@ -984,16 +943,10 @@
 			}
 		},
 		"node_modules/chokidar": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+			"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
 			"dev": true,
-			"funding": [
-				{
-					"type": "individual",
-					"url": "https://paulmillr.com/funding/"
-				}
-			],
 			"dependencies": {
 				"anymatch": "~3.1.2",
 				"braces": "~3.0.2",
@@ -1006,6 +959,9 @@
 			"engines": {
 				"node": ">= 8.10.0"
 			},
+			"funding": {
+				"url": "https://paulmillr.com/funding/"
+			},
 			"optionalDependencies": {
 				"fsevents": "~2.3.2"
 			}
@@ -1052,12 +1008,24 @@
 				"node": ">= 0.8"
 			}
 		},
+		"node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true
+		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
 			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
 			"dev": true
 		},
+		"node_modules/confbox": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
+			"integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==",
+			"dev": true
+		},
 		"node_modules/constantinople": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz",
@@ -1130,9 +1098,15 @@
 			}
 		},
 		"node_modules/dayjs": {
-			"version": "1.11.10",
-			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
-			"integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+			"version": "1.11.11",
+			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
+			"integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
+		},
+		"node_modules/de-indent": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
+			"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
+			"dev": true
 		},
 		"node_modules/debug": {
 			"version": "4.3.4",
@@ -1175,14 +1149,15 @@
 			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
 			"dev": true
 		},
-		"node_modules/define-properties": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-			"integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+		"node_modules/define-data-property": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
 			"dev": true,
 			"dependencies": {
-				"has-property-descriptors": "^1.0.0",
-				"object-keys": "^1.1.1"
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.0.1"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -1200,20 +1175,6 @@
 				"node": ">=0.4.0"
 			}
 		},
-		"node_modules/detect-libc": {
-			"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,
-			"optional": true,
-			"peer": true,
-			"bin": {
-				"detect-libc": "bin/detect-libc.js"
-			},
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
 		"node_modules/diff-sequences": {
 			"version": "29.6.3",
 			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
@@ -1252,11 +1213,26 @@
 				"url": "https://github.com/fb55/entities?sponsor=1"
 			}
 		},
-		"node_modules/es6-object-assign": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-			"integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
-			"dev": true
+		"node_modules/es-define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+			"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+			"dev": true,
+			"dependencies": {
+				"get-intrinsic": "^1.2.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-errors": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
 		"node_modules/esbuild": {
 			"version": "0.20.2",
@@ -1309,17 +1285,18 @@
 			}
 		},
 		"node_modules/eslint": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.0.0.tgz",
-			"integrity": "sha512-IMryZ5SudxzQvuod6rUdIUz29qFItWx281VhtFVc2Psy/ZhlCeD/5DT6lBIJ4H3G+iamGJoTln1v+QSuPw0p7Q==",
+			"version": "9.4.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.4.0.tgz",
+			"integrity": "sha512-sjc7Y8cUD1IlwYcTS9qPSvGjAC8Ne9LctpxKKu3x/1IC9bnOg98Zy6GxEJUfr1NojMgVPlyANXYns8oE2c1TAA==",
 			"dev": true,
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.6.1",
-				"@eslint/eslintrc": "^3.0.2",
-				"@eslint/js": "9.0.0",
-				"@humanwhocodes/config-array": "^0.12.3",
+				"@eslint/config-array": "^0.15.1",
+				"@eslint/eslintrc": "^3.1.0",
+				"@eslint/js": "9.4.0",
 				"@humanwhocodes/module-importer": "^1.0.1",
+				"@humanwhocodes/retry": "^0.3.0",
 				"@nodelib/fs.walk": "^1.2.8",
 				"ajv": "^6.12.4",
 				"chalk": "^4.0.0",
@@ -1335,7 +1312,6 @@
 				"file-entry-cache": "^8.0.0",
 				"find-up": "^5.0.0",
 				"glob-parent": "^6.0.2",
-				"graphemer": "^1.4.0",
 				"ignore": "^5.2.0",
 				"imurmurhash": "^0.1.4",
 				"is-glob": "^4.0.0",
@@ -1372,9 +1348,9 @@
 			}
 		},
 		"node_modules/eslint-plugin-vue": {
-			"version": "9.24.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.24.1.tgz",
-			"integrity": "sha512-wk3SuwmS1pZdcuJlokGYEi/buDOwD6KltvhIZyOnpJ/378dcQ4zchu9PAMbbLAaydCz1iYc5AozszcOOgZIIOg==",
+			"version": "9.26.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.26.0.tgz",
+			"integrity": "sha512-eTvlxXgd4ijE1cdur850G6KalZqk65k1JKoOI2d1kT3hr8sPD07j1q98FRFdNnpxBELGPWxZmInxeHGF/GxtqQ==",
 			"dev": true,
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.4.0",
@@ -1409,34 +1385,6 @@
 			}
 		},
 		"node_modules/eslint-scope": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-			"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-			"dev": true,
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint-visitor-keys": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-			"dev": true,
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint/node_modules/eslint-scope": {
 			"version": "8.0.1",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.1.tgz",
 			"integrity": "sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==",
@@ -1452,7 +1400,7 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/eslint/node_modules/eslint-visitor-keys": {
+		"node_modules/eslint-visitor-keys": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
 			"integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
@@ -1464,7 +1412,13 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/eslint/node_modules/espree": {
+		"node_modules/esm-resolve": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/esm-resolve/-/esm-resolve-1.0.11.tgz",
+			"integrity": "sha512-LxF0wfUQm3ldUDHkkV2MIbvvY0TgzIpJ420jHSV1Dm+IlplBEWiJTKWM61GtxUfvjV6iD4OtTYFGAGM2uuIUWg==",
+			"dev": true
+		},
+		"node_modules/espree": {
 			"version": "10.0.1",
 			"resolved": "https://registry.npmjs.org/espree/-/espree-10.0.1.tgz",
 			"integrity": "sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==",
@@ -1481,29 +1435,6 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/esm-resolve": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/esm-resolve/-/esm-resolve-1.0.8.tgz",
-			"integrity": "sha512-pzYHY8bf7uLpDuefGsI6JtHVS1J3N1uOkIEC36ejvvWhiiMr/xKBX4PrxCtsxeISJbCEMBLkPZvRwZNHgdwn5A==",
-			"dev": true
-		},
-		"node_modules/espree": {
-			"version": "9.6.1",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-			"integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-			"dev": true,
-			"dependencies": {
-				"acorn": "^8.9.0",
-				"acorn-jsx": "^5.3.2",
-				"eslint-visitor-keys": "^3.4.1"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
 		"node_modules/esprima": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
@@ -1551,9 +1482,13 @@
 			}
 		},
 		"node_modules/estree-walker": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-			"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+			"integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+			"dev": true,
+			"dependencies": {
+				"@types/estree": "^1.0.0"
+			}
 		},
 		"node_modules/esutils": {
 			"version": "2.0.3",
@@ -1594,9 +1529,9 @@
 			"dev": true
 		},
 		"node_modules/fast-glob": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz",
-			"integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==",
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
 			"dev": true,
 			"dependencies": {
 				"@nodelib/fs.stat": "^2.0.2",
@@ -1634,9 +1569,9 @@
 			"dev": true
 		},
 		"node_modules/fastq": {
-			"version": "1.14.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
-			"integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
+			"version": "1.17.1",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+			"integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
 			"dev": true,
 			"dependencies": {
 				"reusify": "^1.0.4"
@@ -1701,15 +1636,6 @@
 			"integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
 			"dev": true
 		},
-		"node_modules/for-each": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-			"dev": true,
-			"dependencies": {
-				"is-callable": "^1.1.3"
-			}
-		},
 		"node_modules/foreground-child": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
@@ -1726,6 +1652,29 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
+		"node_modules/fs-extra": {
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=14.14"
+			}
+		},
+		"node_modules/fs-extra/node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
 		"node_modules/fsevents": {
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -1741,10 +1690,13 @@
 			}
 		},
 		"node_modules/function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-			"dev": true
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/get-func-name": {
 			"version": "2.0.2",
@@ -1756,14 +1708,19 @@
 			}
 		},
 		"node_modules/get-intrinsic": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-			"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+			"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
 			"dev": true,
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.3"
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"has-proto": "^1.0.1",
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -1782,22 +1739,22 @@
 			}
 		},
 		"node_modules/glob": {
-			"version": "10.3.12",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
-			"integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
+			"version": "10.4.1",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz",
+			"integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==",
 			"dev": true,
 			"dependencies": {
 				"foreground-child": "^3.1.0",
-				"jackspeak": "^2.3.6",
-				"minimatch": "^9.0.1",
-				"minipass": "^7.0.4",
-				"path-scurry": "^1.10.2"
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"path-scurry": "^1.11.1"
 			},
 			"bin": {
 				"glob": "dist/esm/bin.mjs"
 			},
 			"engines": {
-				"node": ">=16 || 14 >=14.17"
+				"node": ">=16 || 14 >=14.18"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
@@ -1825,9 +1782,9 @@
 			}
 		},
 		"node_modules/glob/node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"version": "9.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+			"integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
 			"dev": true,
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
@@ -1864,29 +1821,11 @@
 			}
 		},
 		"node_modules/graceful-fs": {
-			"version": "4.2.10",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-			"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+			"version": "4.2.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
 			"dev": true
 		},
-		"node_modules/graphemer": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-			"dev": true
-		},
-		"node_modules/has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"dev": true,
-			"dependencies": {
-				"function-bind": "^1.1.1"
-			},
-			"engines": {
-				"node": ">= 0.4.0"
-			}
-		},
 		"node_modules/has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1897,12 +1836,24 @@
 			}
 		},
 		"node_modules/has-property-descriptors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-			"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
 			"dev": true,
 			"dependencies": {
-				"get-intrinsic": "^1.1.1"
+				"es-define-property": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-proto": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+			"integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -1921,12 +1872,12 @@
 			}
 		},
 		"node_modules/has-tostringtag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+			"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
 			"dev": true,
 			"dependencies": {
-				"has-symbols": "^1.0.2"
+				"has-symbols": "^1.0.3"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -1941,6 +1892,27 @@
 			"integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
 			"dev": true
 		},
+		"node_modules/hasown": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+			"dev": true,
+			"bin": {
+				"he": "bin/he"
+			}
+		},
 		"node_modules/html-encoding-sniffer": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
@@ -1954,9 +1926,9 @@
 			}
 		},
 		"node_modules/http-proxy-agent": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-			"integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+			"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
 			"dev": true,
 			"dependencies": {
 				"agent-base": "^7.1.0",
@@ -1967,9 +1939,9 @@
 			}
 		},
 		"node_modules/https-proxy-agent": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-			"integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+			"integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
 			"dev": true,
 			"dependencies": {
 				"agent-base": "^7.0.2",
@@ -2031,29 +2003,7 @@
 			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
 			"dev": true,
 			"engines": {
-				"node": ">=0.8.19"
-			}
-		},
-		"node_modules/inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-			"dev": true
-		},
-		"node_modules/is-arguments": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-			"dev": true,
-			"dependencies": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+				"node": ">=0.8.19"
 			}
 		},
 		"node_modules/is-binary-path": {
@@ -2068,25 +2018,13 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/is-callable": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-			"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/is-core-module": {
-			"version": "2.11.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-			"integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+			"version": "2.13.1",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+			"integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
 			"dev": true,
 			"dependencies": {
-				"has": "^1.0.3"
+				"hasown": "^2.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -2132,21 +2070,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/is-generator-function": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-			"integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-			"dev": true,
-			"dependencies": {
-				"has-tostringtag": "^1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/is-glob": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -2159,22 +2082,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/is-nan": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
-			"integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
-			"dev": true,
-			"dependencies": {
-				"call-bind": "^1.0.0",
-				"define-properties": "^1.1.3"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/is-number": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -2242,25 +2149,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/is-typed-array": {
-			"version": "1.1.10",
-			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-			"integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
-			"dev": true,
-			"dependencies": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"for-each": "^0.3.3",
-				"gopd": "^1.0.1",
-				"has-tostringtag": "^1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/isexe": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -2268,9 +2156,9 @@
 			"dev": true
 		},
 		"node_modules/jackspeak": {
-			"version": "2.3.6",
-			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
-			"integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz",
+			"integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==",
 			"dev": true,
 			"dependencies": {
 				"@isaacs/cliui": "^8.0.2"
@@ -2292,9 +2180,9 @@
 			"dev": true
 		},
 		"node_modules/js-tokens": {
-			"version": "8.0.3",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-8.0.3.tgz",
-			"integrity": "sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==",
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz",
+			"integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==",
 			"dev": true
 		},
 		"node_modules/js-yaml": {
@@ -2310,9 +2198,9 @@
 			}
 		},
 		"node_modules/jsdom": {
-			"version": "24.0.0",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.0.0.tgz",
-			"integrity": "sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==",
+			"version": "24.1.0",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.0.tgz",
+			"integrity": "sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==",
 			"dev": true,
 			"dependencies": {
 				"cssstyle": "^4.0.1",
@@ -2320,21 +2208,21 @@
 				"decimal.js": "^10.4.3",
 				"form-data": "^4.0.0",
 				"html-encoding-sniffer": "^4.0.0",
-				"http-proxy-agent": "^7.0.0",
-				"https-proxy-agent": "^7.0.2",
+				"http-proxy-agent": "^7.0.2",
+				"https-proxy-agent": "^7.0.4",
 				"is-potential-custom-element-name": "^1.0.1",
-				"nwsapi": "^2.2.7",
+				"nwsapi": "^2.2.10",
 				"parse5": "^7.1.2",
-				"rrweb-cssom": "^0.6.0",
+				"rrweb-cssom": "^0.7.0",
 				"saxes": "^6.0.0",
 				"symbol-tree": "^3.2.4",
-				"tough-cookie": "^4.1.3",
+				"tough-cookie": "^4.1.4",
 				"w3c-xmlserializer": "^5.0.0",
 				"webidl-conversions": "^7.0.0",
 				"whatwg-encoding": "^3.1.1",
 				"whatwg-mimetype": "^4.0.0",
 				"whatwg-url": "^14.0.0",
-				"ws": "^8.16.0",
+				"ws": "^8.17.0",
 				"xml-name-validator": "^5.0.0"
 			},
 			"engines": {
@@ -2363,6 +2251,12 @@
 				"node": ">= 6"
 			}
 		},
+		"node_modules/jsdom/node_modules/rrweb-cssom": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.0.tgz",
+			"integrity": "sha512-KlSv0pm9kgQSRxXEMgtivPJ4h826YHsuob8pSHcfSZsSXGtvpEAie8S0AnXuObEJ7nhikOb4ahwxDm0H2yW17g==",
+			"dev": true
+		},
 		"node_modules/jsdom/node_modules/xml-name-validator": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
@@ -2390,12 +2284,6 @@
 			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
 			"dev": true
 		},
-		"node_modules/jsonc-parser": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-			"integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-			"dev": true
-		},
 		"node_modules/jsonfile": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -2408,6 +2296,15 @@
 				"graceful-fs": "^4.1.6"
 			}
 		},
+		"node_modules/jsonfile/node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
 		"node_modules/jstransformer": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
@@ -2440,56 +2337,6 @@
 				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/lightningcss": {
-			"version": "1.22.1",
-			"resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.1.tgz",
-			"integrity": "sha512-Fy45PhibiNXkm0cK5FJCbfO8Y6jUpD/YcHf/BtuI+jvYYqSXKF4muk61jjE8YxCR9y+hDYIWSzHTc+bwhDE6rQ==",
-			"dev": true,
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"detect-libc": "^1.0.3"
-			},
-			"engines": {
-				"node": ">= 12.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			},
-			"optionalDependencies": {
-				"lightningcss-darwin-arm64": "1.22.1",
-				"lightningcss-darwin-x64": "1.22.1",
-				"lightningcss-freebsd-x64": "1.22.1",
-				"lightningcss-linux-arm-gnueabihf": "1.22.1",
-				"lightningcss-linux-arm64-gnu": "1.22.1",
-				"lightningcss-linux-arm64-musl": "1.22.1",
-				"lightningcss-linux-x64-gnu": "1.22.1",
-				"lightningcss-linux-x64-musl": "1.22.1",
-				"lightningcss-win32-x64-msvc": "1.22.1"
-			}
-		},
-		"node_modules/lightningcss-darwin-arm64": {
-			"version": "1.22.1",
-			"resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.22.1.tgz",
-			"integrity": "sha512-ldvElu+R0QimNTjsKpaZkUv3zf+uefzLy/R1R19jtgOfSRM+zjUCUgDhfEDRmVqJtMwYsdhMI2aJtJChPC6Osg==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">= 12.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
 		"node_modules/local-pkg": {
 			"version": "0.5.0",
 			"resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz",
@@ -2543,9 +2390,9 @@
 			}
 		},
 		"node_modules/lru-cache": {
-			"version": "10.2.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
-			"integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+			"version": "10.2.2",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
+			"integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
 			"dev": true,
 			"engines": {
 				"node": "14 || >=16.14"
@@ -2559,11 +2406,6 @@
 				"@jridgewell/sourcemap-codec": "^1.4.15"
 			}
 		},
-		"node_modules/magic-string/node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.4.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
-		},
 		"node_modules/merge-stream": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -2638,9 +2480,9 @@
 			}
 		},
 		"node_modules/minipass": {
-			"version": "7.0.4",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-			"integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
 			"engines": {
 				"node": ">=16 || 14 >=14.17"
@@ -2652,15 +2494,15 @@
 			"integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
 		},
 		"node_modules/mlly": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
-			"integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.0.tgz",
+			"integrity": "sha512-U9SDaXGEREBYQgfejV97coK0UL1r+qnF2SyO9A3qcI8MzKnsIFKHNVEkrDyNncQTKQQumsasmeq84eNMdBfsNQ==",
 			"dev": true,
 			"dependencies": {
-				"acorn": "^8.10.0",
-				"pathe": "^1.1.1",
-				"pkg-types": "^1.0.3",
-				"ufo": "^1.3.0"
+				"acorn": "^8.11.3",
+				"pathe": "^1.1.2",
+				"pkg-types": "^1.1.0",
+				"ufo": "^1.5.3"
 			}
 		},
 		"node_modules/ms": {
@@ -2702,9 +2544,9 @@
 			}
 		},
 		"node_modules/npm-run-path": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-			"integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+			"integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
 			"dev": true,
 			"dependencies": {
 				"path-key": "^4.0.0"
@@ -2741,9 +2583,9 @@
 			}
 		},
 		"node_modules/nwsapi": {
-			"version": "2.2.7",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-			"integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
+			"version": "2.2.10",
+			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz",
+			"integrity": "sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==",
 			"dev": true
 		},
 		"node_modules/object-assign": {
@@ -2755,31 +2597,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/object-is": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-			"dev": true,
-			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/object-keys": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
 		"node_modules/onetime": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
@@ -2796,26 +2613,26 @@
 			}
 		},
 		"node_modules/optionator": {
-			"version": "0.9.3",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-			"integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+			"version": "0.9.4",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
 			"dev": true,
 			"dependencies": {
-				"@aashutoshrathi/word-wrap": "^1.2.3",
 				"deep-is": "^0.1.3",
 				"fast-levenshtein": "^2.0.6",
 				"levn": "^0.4.1",
 				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0"
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.5"
 			},
 			"engines": {
 				"node": ">= 0.8.0"
 			}
 		},
 		"node_modules/orderedmap": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-2.1.0.tgz",
-			"integrity": "sha512-/pIFexOm6S70EPdznemIz3BQZoJ4VTFrhqzu0ACBqBgeLsLxq8e6Jim63ImIfwW/zAD1AlXpRMlOv3aghmo4dA=="
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-2.1.1.tgz",
+			"integrity": "sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g=="
 		},
 		"node_modules/p-limit": {
 			"version": "3.1.0",
@@ -2896,25 +2713,25 @@
 			"dev": true
 		},
 		"node_modules/path-scurry": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz",
-			"integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+			"integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
 			"dev": true,
 			"dependencies": {
 				"lru-cache": "^10.2.0",
 				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
 			},
 			"engines": {
-				"node": ">=16 || 14 >=14.17"
+				"node": ">=16 || 14 >=14.18"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
 		"node_modules/pathe": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
-			"integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+			"integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
 			"dev": true
 		},
 		"node_modules/pathval": {
@@ -2944,14 +2761,14 @@
 			}
 		},
 		"node_modules/pkg-types": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-			"integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.1.tgz",
+			"integrity": "sha512-ko14TjmDuQJ14zsotODv7dBlwxKhUKQEhuhmbqo1uCi9BB0Z2alo/wAXg6q1dTR5TyuqYyWhjtfe/Tsh+X28jQ==",
 			"dev": true,
 			"dependencies": {
-				"jsonc-parser": "^3.2.0",
-				"mlly": "^1.2.0",
-				"pathe": "^1.1.0"
+				"confbox": "^0.1.7",
+				"mlly": "^1.7.0",
+				"pathe": "^1.1.2"
 			}
 		},
 		"node_modules/postcss": {
@@ -3093,9 +2910,9 @@
 			}
 		},
 		"node_modules/prosemirror-model": {
-			"version": "1.20.0",
-			"resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.20.0.tgz",
-			"integrity": "sha512-q7AY7vMjKYqDCeoedgUiAgrLabliXxndJuuFmcmc2+YU1SblvnOiG2WEACF2lwAZsMlfLpiAilA3L+TWlDqIsQ==",
+			"version": "1.21.0",
+			"resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.21.0.tgz",
+			"integrity": "sha512-zLpS1mVCZLA7VTp82P+BfMiYVPcX1/z0Mf3gsjKZtzMWubwn2pN7CceMV0DycjlgE5JeXPR7UF4hJPbBV98oWA==",
 			"dependencies": {
 				"orderedmap": "^2.0.0"
 			}
@@ -3111,9 +2928,9 @@
 			}
 		},
 		"node_modules/prosemirror-state": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.2.tgz",
-			"integrity": "sha512-puuzLD2mz/oTdfgd8msFbe0A42j5eNudKAAPDB0+QJRw8cO1ygjLmhLrg9RvDpf87Dkd6D4t93qdef00KKNacQ==",
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.3.tgz",
+			"integrity": "sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==",
 			"dependencies": {
 				"prosemirror-model": "^1.0.0",
 				"prosemirror-transform": "^1.0.0",
@@ -3121,17 +2938,17 @@
 			}
 		},
 		"node_modules/prosemirror-transform": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.7.3.tgz",
-			"integrity": "sha512-qDapyx5lqYfxVeUWEw0xTGgeP2S8346QtE7DxkalsXlX89lpzkY6GZfulgfHyk1n4tf74sZ7CcXgcaCcGjsUtA==",
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.9.0.tgz",
+			"integrity": "sha512-5UXkr1LIRx3jmpXXNKDhv8OyAOeLTGuXNwdVfg8x27uASna/wQkr9p6fD3eupGOi4PLJfbezxTyi/7fSJypXHg==",
 			"dependencies": {
-				"prosemirror-model": "^1.0.0"
+				"prosemirror-model": "^1.21.0"
 			}
 		},
 		"node_modules/prosemirror-view": {
-			"version": "1.33.4",
-			"resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.33.4.tgz",
-			"integrity": "sha512-xQqAhH8/HGleVpKDhQsrd+oqdyeKMxFtdCWDxWMmP+n0k27fBpyUqa8pA+RB5cFY8rqDDc1hll69aRZQa7UaAw==",
+			"version": "1.33.7",
+			"resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.33.7.tgz",
+			"integrity": "sha512-jo6eMQCtPRwcrA2jISBCnm0Dd2B+szS08BU1Ay+XGiozHo5EZMHfLQE8R5nO4vb1spTH2RW1woZIYXRiQsuP8g==",
 			"dependencies": {
 				"prosemirror-model": "^1.20.0",
 				"prosemirror-state": "^1.0.0",
@@ -3304,9 +3121,9 @@
 			]
 		},
 		"node_modules/react-is": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-			"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
 			"dev": true
 		},
 		"node_modules/readdirp": {
@@ -3322,15 +3139,15 @@
 			}
 		},
 		"node_modules/recast": {
-			"version": "0.23.1",
-			"resolved": "https://registry.npmjs.org/recast/-/recast-0.23.1.tgz",
-			"integrity": "sha512-RokaBcoxSjXUDzz1TXSZmZsSW6ZpLmlA3GGqJ8uuTrQ9hZhEz+4Tpsc+gRvYRJ2BU4H+ZyUlg91eSGDw7bwy7g==",
+			"version": "0.23.7",
+			"resolved": "https://registry.npmjs.org/recast/-/recast-0.23.7.tgz",
+			"integrity": "sha512-MpQlLZVpqbbxYcqEjwpRWo88sGvjOYoXptySz710RuddNMHx+wPkoNX6YyLZJlXAh5VZr1qmPrTwcTuFMh0Lag==",
 			"dev": true,
 			"dependencies": {
-				"assert": "^2.0.0",
 				"ast-types": "^0.16.1",
 				"esprima": "~4.0.0",
 				"source-map": "~0.6.1",
+				"tiny-invariant": "^1.3.3",
 				"tslib": "^2.0.1"
 			},
 			"engines": {
@@ -3344,12 +3161,12 @@
 			"dev": true
 		},
 		"node_modules/resolve": {
-			"version": "1.22.1",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-			"integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+			"version": "1.22.8",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
 			"dev": true,
 			"dependencies": {
-				"is-core-module": "^2.9.0",
+				"is-core-module": "^2.13.0",
 				"path-parse": "^1.0.7",
 				"supports-preserve-symlinks-flag": "^1.0.0"
 			},
@@ -3380,9 +3197,9 @@
 			}
 		},
 		"node_modules/rollup": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz",
-			"integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==",
+			"version": "4.17.2",
+			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.2.tgz",
+			"integrity": "sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==",
 			"dev": true,
 			"dependencies": {
 				"@types/estree": "1.0.5"
@@ -3395,19 +3212,22 @@
 				"npm": ">=8.0.0"
 			},
 			"optionalDependencies": {
-				"@rollup/rollup-android-arm-eabi": "4.13.0",
-				"@rollup/rollup-android-arm64": "4.13.0",
-				"@rollup/rollup-darwin-arm64": "4.13.0",
-				"@rollup/rollup-darwin-x64": "4.13.0",
-				"@rollup/rollup-linux-arm-gnueabihf": "4.13.0",
-				"@rollup/rollup-linux-arm64-gnu": "4.13.0",
-				"@rollup/rollup-linux-arm64-musl": "4.13.0",
-				"@rollup/rollup-linux-riscv64-gnu": "4.13.0",
-				"@rollup/rollup-linux-x64-gnu": "4.13.0",
-				"@rollup/rollup-linux-x64-musl": "4.13.0",
-				"@rollup/rollup-win32-arm64-msvc": "4.13.0",
-				"@rollup/rollup-win32-ia32-msvc": "4.13.0",
-				"@rollup/rollup-win32-x64-msvc": "4.13.0",
+				"@rollup/rollup-android-arm-eabi": "4.17.2",
+				"@rollup/rollup-android-arm64": "4.17.2",
+				"@rollup/rollup-darwin-arm64": "4.17.2",
+				"@rollup/rollup-darwin-x64": "4.17.2",
+				"@rollup/rollup-linux-arm-gnueabihf": "4.17.2",
+				"@rollup/rollup-linux-arm-musleabihf": "4.17.2",
+				"@rollup/rollup-linux-arm64-gnu": "4.17.2",
+				"@rollup/rollup-linux-arm64-musl": "4.17.2",
+				"@rollup/rollup-linux-powerpc64le-gnu": "4.17.2",
+				"@rollup/rollup-linux-riscv64-gnu": "4.17.2",
+				"@rollup/rollup-linux-s390x-gnu": "4.17.2",
+				"@rollup/rollup-linux-x64-gnu": "4.17.2",
+				"@rollup/rollup-linux-x64-musl": "4.17.2",
+				"@rollup/rollup-win32-arm64-msvc": "4.17.2",
+				"@rollup/rollup-win32-ia32-msvc": "4.17.2",
+				"@rollup/rollup-win32-x64-msvc": "4.17.2",
 				"fsevents": "~2.3.2"
 			}
 		},
@@ -3426,19 +3246,10 @@
 				"rollup": "^2.25.0 || ^3.3.0 || ^4.1.4"
 			}
 		},
-		"node_modules/rollup-plugin-external-globals/node_modules/estree-walker": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
-			"integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-			"dev": true,
-			"dependencies": {
-				"@types/estree": "^1.0.0"
-			}
-		},
 		"node_modules/rope-sequence": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.3.tgz",
-			"integrity": "sha512-85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q=="
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.4.tgz",
+			"integrity": "sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ=="
 		},
 		"node_modules/rrweb-cssom": {
 			"version": "0.6.0",
@@ -3488,13 +3299,10 @@
 			}
 		},
 		"node_modules/semver": {
-			"version": "7.6.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-			"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+			"version": "7.6.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+			"integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
 			"dev": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -3502,16 +3310,21 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/semver/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+		"node_modules/set-function-length": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
 			"dev": true,
 			"dependencies": {
-				"yallist": "^4.0.0"
+				"define-data-property": "^1.1.4",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.2"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/shebang-command": {
@@ -3592,9 +3405,9 @@
 			"dev": true
 		},
 		"node_modules/std-env": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.6.0.tgz",
-			"integrity": "sha512-aFZ19IgVmhdB2uX599ve2kE6BIE3YMnQ6Gp6BURhW/oIzpXGKr878TQfAQZn1+i0Flcc/UKUy1gOlcfaUBCryg==",
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
+			"integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
 			"dev": true
 		},
 		"node_modules/string-width": {
@@ -3712,17 +3525,29 @@
 			}
 		},
 		"node_modules/strip-literal": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.0.0.tgz",
-			"integrity": "sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.0.tgz",
+			"integrity": "sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==",
 			"dev": true,
 			"dependencies": {
-				"js-tokens": "^8.0.2"
+				"js-tokens": "^9.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/antfu"
 			}
 		},
+		"node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/supports-preserve-symlinks-flag": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
@@ -3742,9 +3567,9 @@
 			"dev": true
 		},
 		"node_modules/terser": {
-			"version": "5.30.3",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.30.3.tgz",
-			"integrity": "sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA==",
+			"version": "5.31.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz",
+			"integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==",
 			"dev": true,
 			"dependencies": {
 				"@jridgewell/source-map": "^0.3.3",
@@ -3759,28 +3584,28 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/terser/node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"dev": true
-		},
 		"node_modules/text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
 			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
 			"dev": true
 		},
+		"node_modules/tiny-invariant": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+			"integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
+			"dev": true
+		},
 		"node_modules/tinybench": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
-			"integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.8.0.tgz",
+			"integrity": "sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==",
 			"dev": true
 		},
 		"node_modules/tinypool": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.3.tgz",
-			"integrity": "sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==",
+			"version": "0.8.4",
+			"resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.4.tgz",
+			"integrity": "sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==",
 			"dev": true,
 			"engines": {
 				"node": ">=14.0.0"
@@ -3823,9 +3648,9 @@
 			"dev": true
 		},
 		"node_modules/tough-cookie": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-			"integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+			"version": "4.1.4",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+			"integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
 			"dev": true,
 			"dependencies": {
 				"psl": "^1.1.33",
@@ -3837,15 +3662,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/tough-cookie/node_modules/universalify": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-			"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 4.0.0"
-			}
-		},
 		"node_modules/tr46": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
@@ -3865,9 +3681,9 @@
 			"dev": true
 		},
 		"node_modules/tslib": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-			"integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+			"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
 			"dev": true
 		},
 		"node_modules/type-check": {
@@ -3904,26 +3720,18 @@
 			}
 		},
 		"node_modules/ufo": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
-			"integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==",
+			"version": "1.5.3",
+			"resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz",
+			"integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==",
 			"dev": true
 		},
-		"node_modules/undici-types": {
-			"version": "5.26.5",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-			"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-			"dev": true,
-			"optional": true,
-			"peer": true
-		},
 		"node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+			"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
 			"dev": true,
 			"engines": {
-				"node": ">= 10.0.0"
+				"node": ">= 4.0.0"
 			}
 		},
 		"node_modules/uri-js": {
@@ -3945,19 +3753,6 @@
 				"requires-port": "^1.0.0"
 			}
 		},
-		"node_modules/util": {
-			"version": "0.12.5",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-			"dev": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"is-arguments": "^1.0.4",
-				"is-generator-function": "^1.0.7",
-				"is-typed-array": "^1.1.3",
-				"which-typed-array": "^1.1.2"
-			}
-		},
 		"node_modules/util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -3965,9 +3760,9 @@
 			"dev": true
 		},
 		"node_modules/vite": {
-			"version": "5.2.8",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz",
-			"integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==",
+			"version": "5.2.12",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz",
+			"integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==",
 			"dev": true,
 			"dependencies": {
 				"esbuild": "^0.20.1",
@@ -4020,9 +3815,9 @@
 			}
 		},
 		"node_modules/vite-node": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.5.0.tgz",
-			"integrity": "sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.6.0.tgz",
+			"integrity": "sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==",
 			"dev": true,
 			"dependencies": {
 				"cac": "^6.7.14",
@@ -4042,9 +3837,9 @@
 			}
 		},
 		"node_modules/vite-plugin-static-copy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-1.0.2.tgz",
-			"integrity": "sha512-AfmEF+a/mfjsUsrgjbCkhzUCeIUF4EKQXXt3Ie1cour9MBpy6f6GphbdW2td28oYfOrwCyRzFCksgLkpk58q6Q==",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-1.0.5.tgz",
+			"integrity": "sha512-02k0Rox+buYdEOfeilKZSgs1gXfPf9RjVztZEIYZgVIxjsVZi6AXssjzdi+qW6zYt00d3bq+tpP2voVXN2fKLw==",
 			"dev": true,
 			"dependencies": {
 				"chokidar": "^3.5.3",
@@ -4059,31 +3854,17 @@
 				"vite": "^5.0.0"
 			}
 		},
-		"node_modules/vite-plugin-static-copy/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-			"dev": true,
-			"dependencies": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^6.0.1",
-				"universalify": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=14.14"
-			}
-		},
 		"node_modules/vitest": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/vitest/-/vitest-1.5.0.tgz",
-			"integrity": "sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/vitest/-/vitest-1.6.0.tgz",
+			"integrity": "sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==",
 			"dev": true,
 			"dependencies": {
-				"@vitest/expect": "1.5.0",
-				"@vitest/runner": "1.5.0",
-				"@vitest/snapshot": "1.5.0",
-				"@vitest/spy": "1.5.0",
-				"@vitest/utils": "1.5.0",
+				"@vitest/expect": "1.6.0",
+				"@vitest/runner": "1.6.0",
+				"@vitest/snapshot": "1.6.0",
+				"@vitest/spy": "1.6.0",
+				"@vitest/utils": "1.6.0",
 				"acorn-walk": "^8.3.2",
 				"chai": "^4.3.10",
 				"debug": "^4.3.4",
@@ -4097,7 +3878,7 @@
 				"tinybench": "^2.5.1",
 				"tinypool": "^0.8.3",
 				"vite": "^5.0.0",
-				"vite-node": "1.5.0",
+				"vite-node": "1.6.0",
 				"why-is-node-running": "^2.2.2"
 			},
 			"bin": {
@@ -4112,8 +3893,8 @@
 			"peerDependencies": {
 				"@edge-runtime/vm": "*",
 				"@types/node": "^18.0.0 || >=20.0.0",
-				"@vitest/browser": "1.5.0",
-				"@vitest/ui": "1.5.0",
+				"@vitest/browser": "1.6.0",
+				"@vitest/ui": "1.6.0",
 				"happy-dom": "*",
 				"jsdom": "*"
 			},
@@ -4148,15 +3929,15 @@
 			}
 		},
 		"node_modules/vue": {
-			"version": "3.4.23",
-			"resolved": "https://registry.npmjs.org/vue/-/vue-3.4.23.tgz",
-			"integrity": "sha512-X1y6yyGJ28LMUBJ0k/qIeKHstGd+BlWQEOT40x3auJFTmpIhpbKLgN7EFsqalnJXq1Km5ybDEsp6BhuWKciUDg==",
+			"version": "3.4.27",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-3.4.27.tgz",
+			"integrity": "sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==",
 			"dependencies": {
-				"@vue/compiler-dom": "3.4.23",
-				"@vue/compiler-sfc": "3.4.23",
-				"@vue/runtime-dom": "3.4.23",
-				"@vue/server-renderer": "3.4.23",
-				"@vue/shared": "3.4.23"
+				"@vue/compiler-dom": "3.4.27",
+				"@vue/compiler-sfc": "3.4.27",
+				"@vue/runtime-dom": "3.4.27",
+				"@vue/server-renderer": "3.4.27",
+				"@vue/shared": "3.4.27"
 			},
 			"peerDependencies": {
 				"typescript": "*"
@@ -4223,15 +4004,70 @@
 				"eslint": ">=6.0.0"
 			}
 		},
+		"node_modules/vue-eslint-parser/node_modules/eslint-scope": {
+			"version": "7.2.2",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+			"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/espree": {
+			"version": "9.6.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+			"integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.9.0",
+				"acorn-jsx": "^5.3.2",
+				"eslint-visitor-keys": "^3.4.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
 		"node_modules/vue-inbrowser-compiler-independent-utils": {
-			"version": "4.69.0",
-			"resolved": "https://registry.npmjs.org/vue-inbrowser-compiler-independent-utils/-/vue-inbrowser-compiler-independent-utils-4.69.0.tgz",
-			"integrity": "sha512-z9BTi8iXqS1ZLDK2quH6mrahMsaT+UuB5InhVPqR2Ft08OJw1Wxtalr9Cp5rRHOUirq9vaklzjEfD8WJGOIpuA==",
+			"version": "4.71.1",
+			"resolved": "https://registry.npmjs.org/vue-inbrowser-compiler-independent-utils/-/vue-inbrowser-compiler-independent-utils-4.71.1.tgz",
+			"integrity": "sha512-K3wt3iVmNGaFEOUR4JIThQRWfqokxLfnPslD41FDZB2ajXp789+wCqJyGYlIFsvEQ2P61PInw6/ph5iiqg51gg==",
 			"dev": true,
 			"peerDependencies": {
 				"vue": ">=2"
 			}
 		},
+		"node_modules/vue-template-compiler": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
+			"integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
+			"dev": true,
+			"dependencies": {
+				"de-indent": "^1.0.2",
+				"he": "^1.2.0"
+			}
+		},
 		"node_modules/vuedraggable": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
@@ -4260,9 +4096,9 @@
 			}
 		},
 		"node_modules/w3c-keyname": {
-			"version": "2.2.6",
-			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz",
-			"integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg=="
+			"version": "2.2.8",
+			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+			"integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="
 		},
 		"node_modules/w3c-xmlserializer": {
 			"version": "5.0.0",
@@ -4343,26 +4179,6 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/which-typed-array": {
-			"version": "1.1.9",
-			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-			"integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
-			"dev": true,
-			"dependencies": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"for-each": "^0.3.3",
-				"gopd": "^1.0.1",
-				"has-tostringtag": "^1.0.0",
-				"is-typed-array": "^1.1.10"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/why-is-node-running": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
@@ -4394,6 +4210,15 @@
 				"node": ">= 10.0.0"
 			}
 		},
+		"node_modules/word-wrap": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/wrap-ansi": {
 			"version": "8.1.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
@@ -4489,9 +4314,9 @@
 			}
 		},
 		"node_modules/ws": {
-			"version": "8.16.0",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
-			"integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
+			"version": "8.17.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
+			"integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
 			"dev": true,
 			"engines": {
 				"node": ">=10.0.0"
@@ -4524,12 +4349,6 @@
 			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
 			"dev": true
 		},
-		"node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true
-		},
 		"node_modules/yocto-queue": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/panel/package.json b/panel/package.json
index b543da2292..829d72a38c 100644
--- a/panel/package.json
+++ b/panel/package.json
@@ -13,15 +13,15 @@
 	"dependencies": {
 		"autosize": "^6.0.1",
 		"container-query-polyfill": "^1.0.2",
-		"dayjs": "^1.11.10",
+		"dayjs": "^1.11.11",
 		"mitt": "^3.0.1",
 		"prosemirror-commands": "^1.5.2",
 		"prosemirror-history": "^1.4.0",
 		"prosemirror-inputrules": "^1.4.0",
 		"prosemirror-keymap": "^1.2.2",
-		"prosemirror-model": "^1.20.0",
+		"prosemirror-model": "^1.21.0",
 		"prosemirror-schema-list": "^1.3.0",
-		"prosemirror-view": "^1.33.4",
+		"prosemirror-view": "^1.33.7",
 		"sortablejs": "^1.15.2",
 		"vue": "^3.4.21",
 		"vuedraggable": "^4.1.0",
@@ -30,18 +30,19 @@
 	"devDependencies": {
 		"@vitejs/plugin-vue": "^5.0.4",
 		"@vue/compiler-sfc": "^3.4.21",
-		"eslint": "^9.0.0",
+		"eslint": "^9.4.0",
 		"eslint-config-prettier": "^9.1.0",
-		"eslint-plugin-vue": "^9.24.1",
-		"glob": "^10.3.12",
-		"jsdom": "^24.0.0",
+		"eslint-plugin-vue": "^9.26.0",
+		"glob": "^10.4.1",
+		"jsdom": "^24.1.0",
 		"prettier": "^3.2.5",
 		"rollup-plugin-external-globals": "^0.10.0",
-		"terser": "^5.30.3",
-		"vite": "^5.2.8",
-		"vite-plugin-static-copy": "^1.0.2",
-		"vitest": "^1.5.0",
-		"vue-docgen-api": "^4.78.0"
+		"terser": "^5.31.0",
+		"vite": "^5.2.12",
+		"vite-plugin-static-copy": "^1.0.5",
+		"vitest": "^1.6.0",
+		"vue-docgen-api": "^4.78.0",
+		"vue-template-compiler": "^2.7.16"
 	},
 	"browserslist": [
 		"last 2 Android versions",
diff --git a/panel/public/js/plugins.js b/panel/public/js/plugins.js
index 64f65473be..c7f7780060 100644
--- a/panel/public/js/plugins.js
+++ b/panel/public/js/plugins.js
@@ -7,6 +7,7 @@ window.panel.plugins = {
 	textareaButtons: {},
 	thirdParty: {},
 	use: [],
+	viewButtons: {},
 	views: {},
 	writerMarks: {},
 	writerNodes: {}
@@ -48,6 +49,11 @@ window.panel.plugin = function (plugin, extensions) {
 		};
 	});
 
+	// View Buttons
+	resolve(extensions, "viewButtons", (name, options) => {
+		window.panel.plugins.components[`k-view-${name}-button`] = options;
+	});
+
 	// `Vue.use`
 	resolve(extensions, "use", (name, options) => {
 		window.panel.plugins.use.push(options);
diff --git a/panel/src/api/request.js b/panel/src/api/request.js
index e2b839e695..04c49d9fc6 100644
--- a/panel/src/api/request.js
+++ b/panel/src/api/request.js
@@ -28,6 +28,13 @@ export default (api) => {
 			options.method = "POST";
 		}
 
+		// remove null headers
+		for (const key in options.headers) {
+			if (options.headers[key] === null) {
+				delete options.headers[key];
+			}
+		}
+
 		// build the request URL
 		options.url = rtrim(api.endpoint, "/") + "/" + ltrim(path, "/");
 
diff --git a/panel/src/components/Dialogs/UploadDialog.vue b/panel/src/components/Dialogs/UploadDialog.vue
index 159eecd237..857e26c135 100644
--- a/panel/src/components/Dialogs/UploadDialog.vue
+++ b/panel/src/components/Dialogs/UploadDialog.vue
@@ -8,80 +8,31 @@
 		@submit="$emit('submit')"
 	>
 		<k-dropzone @drop="$panel.upload.select($event)">
-			<template v-if="$panel.upload.files.length === 0">
-				<k-empty icon="upload" layout="cards" @click="$panel.upload.pick()">
-					{{ $t("files.empty") }}
-				</k-empty>
-			</template>
-			<template v-else>
-				<ul class="k-upload-items">
-					<li
-						v-for="file in $panel.upload.files"
-						:key="file.id"
-						:data-completed="file.completed"
-						class="k-upload-item"
-					>
-						<a :href="file.url" class="k-upload-item-preview" target="_blank">
-							<k-image-frame
-								v-if="isPreviewable(file.type)"
-								:cover="true"
-								:src="file.url"
-								back="pattern"
-							/>
-							<k-icon-frame
-								v-else
-								back="black"
-								color="white"
-								ratio="1/1"
-								icon="file"
-							/>
-						</a>
-						<k-input
-							:disabled="file.completed"
-							:after="'.' + file.extension"
-							:required="true"
-							:value="file.name"
-							class="k-upload-item-input"
-							type="slug"
-							@input="file.name = $event"
-						/>
-						<div class="k-upload-item-body">
-							<p class="k-upload-item-meta">
-								{{ file.niceSize }}
-								<template v-if="file.progress">
-									- {{ file.progress }}%
-								</template>
-							</p>
-							<p v-if="file.error" class="k-upload-item-error">
-								{{ file.error }}
-							</p>
-							<k-progress
-								v-else-if="file.progress"
-								:value="file.progress"
-								class="k-upload-item-progress"
-							/>
-						</div>
-						<div class="k-upload-item-toggle">
-							<k-button
-								v-if="!file.completed && !file.progress"
-								icon="remove"
-								@click="$panel.upload.remove(file.id)"
-							/>
+			<!-- No files yet -->
+			<k-empty
+				v-if="$panel.upload.files.length === 0"
+				icon="upload"
+				layout="cards"
+				@click="$panel.upload.pick()"
+			>
+				{{ $t("files.empty") }}
+			</k-empty>
 
-							<div v-else-if="!file.completed">
-								<k-icon type="loader" />
-							</div>
-
-							<k-button
-								v-else
-								icon="check"
-								theme="positive"
-								@click="$panel.upload.remove(file.id)"
-							/>
-						</div>
-					</li>
-				</ul>
-			</template>
+			<!-- Files list -->
+			<k-upload-items
+				v-else
+				:items="$panel.upload.files"
+				@remove="
+					(file) => {
+						$panel.upload.remove(file.id);
+					}
+				"
+				@rename="
+					(file, name) => {
+						file.name = name;
+					}
+				"
+			/>
 		</k-dropzone>
 	</k-dialog>
 </template>
@@ -104,19 +55,6 @@ export default {
 				};
 			}
 		}
-	},
-	methods: {
-		isPreviewable(mime) {
-			return [
-				"image/jpeg",
-				"image/jpg",
-				"image/gif",
-				"image/png",
-				"image/webp",
-				"image/avif",
-				"image/svg+xml"
-			].includes(mime);
-		}
 	}
 };
 </script>
@@ -125,84 +63,4 @@ export default {
 .k-upload-dialog.k-dialog {
 	--dialog-width: 40rem;
 }
-
-.k-upload-items {
-	display: grid;
-	gap: 0.25rem;
-}
-.k-upload-item {
-	accent-color: var(--color-focus);
-	display: grid;
-	grid-template-areas:
-		"preview input input"
-		"preview body toggle";
-	grid-template-columns: 6rem 1fr auto;
-	grid-template-rows: var(--input-height) 1fr;
-	border-radius: var(--rounded);
-	background: var(--color-white);
-	box-shadow: var(--shadow);
-	min-height: 6rem;
-}
-.k-upload-item-preview {
-	grid-area: preview;
-	display: flex;
-	width: 100%;
-	height: 100%;
-	overflow: hidden;
-	border-start-start-radius: var(--rounded);
-	border-end-start-radius: var(--rounded);
-}
-.k-upload-item-preview:focus {
-	border-radius: var(--rounded);
-	outline: 2px solid var(--color-focus);
-	z-index: 1;
-}
-
-.k-upload-item-body {
-	grid-area: body;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-between;
-	padding: var(--spacing-2) var(--spacing-3);
-	min-width: 0;
-}
-.k-upload-item-input.k-input {
-	--input-color-border: transparent;
-	--input-padding: var(--spacing-2) var(--spacing-3);
-	--input-rounded: 0;
-	grid-area: input;
-	font-size: var(--text-sm);
-	border-bottom: 1px solid var(--color-light);
-}
-.k-upload-item-input.k-input:focus-within {
-	outline: 2px solid var(--color-focus);
-	z-index: 1;
-	border-radius: var(--rounded);
-}
-.k-upload-item-input .k-input-after {
-	color: var(--color-gray-600);
-}
-.k-upload-item-meta {
-	font-size: var(--text-xs);
-	color: var(--color-gray-600);
-}
-.k-upload-item-error {
-	font-size: var(--text-xs);
-	margin-top: 0.25rem;
-	color: var(--color-red-700);
-}
-.k-upload-item-progress {
-	--progress-height: 0.25rem;
-	--progress-color-back: var(--color-light);
-}
-.k-upload-item-toggle {
-	grid-area: toggle;
-	align-self: end;
-}
-.k-upload-item-toggle > * {
-	padding: var(--spacing-3);
-}
-.k-upload-item[data-completed="true"] .k-upload-item-progress {
-	--progress-color-value: var(--color-green-400);
-}
 </style>
diff --git a/panel/src/components/Dialogs/UploadReplaceDialog.vue b/panel/src/components/Dialogs/UploadReplaceDialog.vue
index 8952914b26..3b261c82c3 100644
--- a/panel/src/components/Dialogs/UploadReplaceDialog.vue
+++ b/panel/src/components/Dialogs/UploadReplaceDialog.vue
@@ -8,76 +8,24 @@
 	>
 		<ul class="k-upload-items">
 			<li class="k-upload-original">
-				<k-image
-					v-if="isPreviewable(original.mime)"
-					:cover="true"
-					:src="original.url"
-					back="pattern"
-				/>
-				<k-icon-frame
-					v-else
-					:color="original.image?.color ?? 'white'"
-					:icon="original.image?.icon ?? 'file'"
-					back="black"
-					ratio="1/1"
+				<k-upload-item-preview
+					:color="original.image?.color"
+					:icon="original.image?.icon"
+					:url="original.url"
+					:type="original.mime"
 				/>
 			</li>
 
 			<li>&larr;</li>
 
-			<li
-				v-for="file in $panel.upload.files"
-				:key="file.id"
-				:data-completed="file.completed"
-				class="k-upload-item"
-			>
-				<a :href="file.url" class="k-upload-item-preview" target="_blank">
-					<k-image
-						v-if="isPreviewable(file.type)"
-						:cover="true"
-						:src="file.url"
-						back="pattern"
-					/>
-					<k-icon-frame
-						v-else
-						:color="original.image?.color ?? 'white'"
-						:icon="original.image?.icon ?? 'file'"
-						back="black"
-						ratio="1/1"
-					/>
-				</a>
-				<k-input
-					:value="$helper.file.name(original.filename)"
-					:disabled="true"
-					:after="'.' + file.extension"
-					class="k-upload-item-input"
-					type="text"
-				/>
-				<div class="k-upload-item-body">
-					<p class="k-upload-item-meta">
-						{{ file.niceSize }}
-						<template v-if="file.progress"> - {{ file.progress }}% </template>
-					</p>
-					<p class="k-upload-item-error">{{ file.error }}</p>
-				</div>
-				<div class="k-upload-item-progress">
-					<k-progress
-						v-if="file.progress > 0 && !file.error"
-						:value="file.progress"
-					/>
-				</div>
-				<div class="k-upload-item-toggle">
-					<k-button
-						v-if="file.completed"
-						icon="check"
-						theme="positive"
-						@click="$panel.upload.remove(file.id)"
-					/>
-					<div v-else-if="file.progress">
-						<k-icon type="loader" />
-					</div>
-				</div>
-			</li>
+			<k-upload-item
+				v-bind="file"
+				:color="original.image?.color"
+				:editable="false"
+				:icon="original.image?.icon"
+				:name="$helper.file.name(original.filename)"
+				:removable="false"
+			/>
 		</ul>
 	</k-dialog>
 </template>
@@ -101,6 +49,11 @@ export default {
 				};
 			}
 		}
+	},
+	computed: {
+		file() {
+			return this.$panel.upload.files[0];
+		}
 	}
 };
 </script>
diff --git a/panel/src/components/Dropdowns/DropdownItem.vue b/panel/src/components/Dropdowns/DropdownItem.vue
index 658bc530a0..5545b3b539 100644
--- a/panel/src/components/Dropdowns/DropdownItem.vue
+++ b/panel/src/components/Dropdowns/DropdownItem.vue
@@ -22,6 +22,7 @@ export default {
 	props: {
 		current: [Boolean, String],
 		disabled: Boolean,
+		download: Boolean,
 		icon: String,
 		link: String,
 		target: String
diff --git a/panel/src/components/Dropdowns/index.js b/panel/src/components/Dropdowns/index.js
index 3996ee66e7..7012e4e91a 100644
--- a/panel/src/components/Dropdowns/index.js
+++ b/panel/src/components/Dropdowns/index.js
@@ -1,7 +1,6 @@
 import DropdownContent from "./DropdownContent.vue";
 import DropdownItem from "./DropdownItem.vue";
 
-import LanguagesDropdown from "./LanguagesDropdown.vue";
 import OptionsDropdown from "./OptionsDropdown.vue";
 import PicklistDropdown from "./PicklistDropdown.vue";
 
@@ -10,7 +9,6 @@ export default {
 		app.component("k-dropdown-content", DropdownContent);
 		app.component("k-dropdown-item", DropdownItem);
 
-		app.component("k-languages-dropdown", LanguagesDropdown);
 		app.component("k-options-dropdown", OptionsDropdown);
 		app.component("k-picklist-dropdown", PicklistDropdown);
 	}
diff --git a/panel/src/components/Forms/Input/SelectInput.vue b/panel/src/components/Forms/Input/SelectInput.vue
index bb75958c1d..988ae27a93 100644
--- a/panel/src/components/Forms/Input/SelectInput.vue
+++ b/panel/src/components/Forms/Input/SelectInput.vue
@@ -13,13 +13,13 @@
 			:disabled="disabled"
 			:name="name"
 			:required="required"
-			:value="selected"
+			:value="value"
 			class="k-select-input-native"
-			@change="onInput($event.target.value)"
+			@change="$emit('input', $event.target.value)"
 			@click="onClick"
 		>
 			<option v-if="hasEmptyOption" :disabled="required" value="">
-				{{ emptyOption }}
+				{{ empty }}
 			</option>
 			<option
 				v-for="option in options"
@@ -42,14 +42,6 @@ export const props = {
 	mixins: [InputProps, options, placeholder],
 	props: {
 		ariaLabel: String,
-		default: String,
-		/**
-		 * The text, that is shown as the first empty option, when the field is not required.
-		 */
-		empty: {
-			type: [Boolean, String],
-			default: true
-		},
 		value: {
 			type: [String, Number, Boolean],
 			default: ""
@@ -60,44 +52,30 @@ export const props = {
 export default {
 	mixins: [Input, props],
 	emits: ["click", "input"],
-	data() {
-		return {
-			selected: this.value
-		};
-	},
 	computed: {
-		emptyOption() {
+		empty() {
 			return this.placeholder ?? "—";
 		},
 		hasEmptyOption() {
-			if (this.empty === false) {
-				return false;
-			}
-
-			return !(this.required && this.default);
+			// empty option is only displayed if the field is
+			// not required or currently has no value yet
+			return !this.required || this.isEmpty;
 		},
 		isEmpty() {
 			return (
-				this.selected === null ||
-				this.selected === undefined ||
-				this.selected === ""
+				this.value === null || this.value === undefined || this.value === ""
 			);
 		},
 		label() {
-			const label = this.text(this.selected);
+			const label = this.text(this.value);
 
-			if (this.selected === "" || this.selected === null || label === null) {
-				return this.emptyOption;
+			if (this.isEmpty || label === null) {
+				return this.empty;
 			}
 
 			return label;
 		}
 	},
-	watch: {
-		value(value) {
-			this.selected = value;
-		}
-	},
 	mounted() {
 		if (this.$props.autofocus) {
 			this.focus();
@@ -111,10 +89,6 @@ export default {
 			event.stopPropagation();
 			this.$emit("click", event);
 		},
-		onInput(value) {
-			this.selected = value;
-			this.$emit("input", this.selected);
-		},
 		select() {
 			this.focus();
 		},
diff --git a/panel/src/components/Forms/index.js b/panel/src/components/Forms/index.js
index a241ac5470..cc782db4b2 100644
--- a/panel/src/components/Forms/index.js
+++ b/panel/src/components/Forms/index.js
@@ -6,11 +6,6 @@ import FormButtons from "./FormButtons.vue";
 import Field from "./Field.vue";
 import Fieldset from "./Fieldset.vue";
 import Input from "./Input.vue";
-import Login from "./Login.vue";
-import LoginCode from "./LoginCode.vue";
-
-/** Form Helpers */
-import LoginAlert from "./LoginAlert.vue";
 
 /* Form parts */
 import Blocks from "./Blocks/index.js";
@@ -29,10 +24,6 @@ export default {
 		app.component("k-field", Field);
 		app.component("k-fieldset", Fieldset);
 		app.component("k-input", Input);
-		app.component("k-login", Login);
-		app.component("k-login-code", LoginCode);
-
-		app.component("k-login-alert", LoginAlert);
 
 		app.use(Blocks);
 		app.use(Inputs);
diff --git a/panel/src/components/Navigation/Link.vue b/panel/src/components/Navigation/Link.vue
index 9189809792..32c1342ef2 100644
--- a/panel/src/components/Navigation/Link.vue
+++ b/panel/src/components/Navigation/Link.vue
@@ -2,7 +2,7 @@
 	<a
 		v-if="to && !disabled"
 		ref="link"
-		:download="download"
+		:download="downloadAttr"
 		:href="href"
 		:rel="relAttr"
 		:tabindex="tabindex"
@@ -68,6 +68,9 @@ export default {
 	},
 	emits: ["click"],
 	computed: {
+		downloadAttr() {
+			return this.download ? this.href.split("/").pop() : undefined;
+		},
 		href() {
 			if (typeof this.to === "function") {
 				return "";
diff --git a/panel/src/components/Uploads/UploadItem.vue b/panel/src/components/Uploads/UploadItem.vue
new file mode 100644
index 0000000000..5906ebfa3e
--- /dev/null
+++ b/panel/src/components/Uploads/UploadItem.vue
@@ -0,0 +1,181 @@
+<template>
+	<li :data-completed="completed" class="k-upload-item">
+		<k-upload-item-preview
+			:color="color"
+			:icon="icon"
+			:type="type"
+			:url="url"
+		/>
+
+		<k-input
+			:disabled="completed || !editable"
+			:after="'.' + extension"
+			:required="true"
+			:value="name"
+			allow="a-z0-9@._-"
+			class="k-upload-item-input"
+			type="slug"
+			@input="$emit('rename', $event)"
+		/>
+
+		<div class="k-upload-item-body">
+			<p class="k-upload-item-meta">
+				{{ niceSize }}
+				<template v-if="progress"> - {{ progress }}% </template>
+			</p>
+			<p v-if="error" class="k-upload-item-error">
+				{{ error }}
+			</p>
+			<k-progress
+				v-else-if="progress"
+				:value="progress"
+				class="k-upload-item-progress"
+			/>
+		</div>
+
+		<div class="k-upload-item-toggle">
+			<k-button
+				v-if="!completed && !progress && removable"
+				icon="remove"
+				@click="$emit('remove')"
+			/>
+			<k-button
+				v-else-if="!completed && progress"
+				:disabled="true"
+				icon="loader"
+			/>
+			<k-button
+				v-else-if="completed"
+				icon="check"
+				theme="positive"
+				@click="$emit('remove')"
+			/>
+		</div>
+	</li>
+</template>
+
+<script>
+import { props as Preview } from "./UploadItemPreview.vue";
+
+/**
+ * Represents one file to upload in an upload dialog
+ * @since 4.3.0
+ */
+export default {
+	mixins: [Preview],
+	props: {
+		/**
+		 * Whether the upload is completed
+		 */
+		completed: Boolean,
+		/**
+		 * Whether the file name is editable
+		 */
+		editable: {
+			type: Boolean,
+			default: true
+		},
+		/**
+		 * Upload error to display
+		 */
+		error: [String, Boolean],
+		/**
+		 * File extension
+		 */
+		extension: String,
+		/**
+		 * Unique id of file
+		 */
+		id: String,
+		/**
+		 * Filename
+		 */
+		name: String,
+		/**
+		 * File size to display
+		 */
+		niceSize: String,
+		/**
+		 * Upload progress
+		 * @value 0-100
+		 */
+		progress: Number,
+		/**
+		 * Whether the file is removable
+		 */
+		removable: {
+			type: Boolean,
+			default: true
+		}
+	},
+	emits: ["remove", "rename"]
+};
+</script>
+
+<style>
+.k-upload-item {
+	accent-color: var(--color-focus);
+	display: grid;
+	grid-template-areas:
+		"preview input input"
+		"preview body toggle";
+	grid-template-columns: 6rem 1fr auto;
+	grid-template-rows: var(--input-height) 1fr;
+	border-radius: var(--rounded);
+	background: var(--color-white);
+	box-shadow: var(--shadow);
+	min-height: 6rem;
+}
+.k-upload-item-body {
+	grid-area: body;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	padding: var(--spacing-2) var(--spacing-3);
+	min-width: 0;
+}
+.k-upload-item-input.k-input {
+	--input-color-border: transparent;
+	--input-padding: var(--spacing-2) var(--spacing-3);
+	--input-rounded: 0;
+	grid-area: input;
+	font-size: var(--text-sm);
+	border-bottom: 1px solid var(--color-light);
+	border-start-end-radius: var(--rounded);
+}
+.k-upload-item-input.k-input:focus-within {
+	outline: 2px solid var(--color-focus);
+	z-index: 1;
+	border-radius: var(--rounded);
+}
+.k-upload-item-input.k-input[data-disabled="true"] {
+	--input-color-back: var(--color-white);
+}
+.k-upload-item-input .k-input-after {
+	color: var(--color-gray-600);
+}
+.k-upload-item-meta {
+	font-size: var(--text-xs);
+	color: var(--color-gray-600);
+}
+.k-upload-item-error {
+	font-size: var(--text-xs);
+	margin-top: 0.25rem;
+	color: var(--color-red-700);
+}
+.k-upload-item-progress {
+	--progress-height: 0.25rem;
+	--progress-color-back: var(--color-light);
+	margin-bottom: 0.3125rem;
+}
+.k-upload-item-toggle {
+	grid-area: toggle;
+	align-self: end;
+}
+.k-upload-item-toggle > * {
+	padding: var(--spacing-3);
+}
+.k-upload-item[data-completed="true"] .k-upload-item-progress {
+	--progress-color-value: var(--color-green-400);
+}
+</style>
diff --git a/panel/src/components/Uploads/UploadItemPreview.vue b/panel/src/components/Uploads/UploadItemPreview.vue
new file mode 100644
index 0000000000..205364849f
--- /dev/null
+++ b/panel/src/components/Uploads/UploadItemPreview.vue
@@ -0,0 +1,106 @@
+<template>
+	<a :href="url" class="k-upload-item-preview" target="_blank">
+		<k-image v-if="isPreviewable" :cover="true" :src="url" back="pattern" />
+		<k-icon-frame
+			v-else
+			:color="color ?? fallbackColor"
+			:icon="icon ?? fallbackIcon"
+			back="black"
+			ratio="1/1"
+		/>
+	</a>
+</template>
+
+<script>
+export const props = {
+	props: {
+		/**
+		 * Preview icon color
+		 */
+		color: String,
+		/**
+		 * Preview icon type
+		 */
+		icon: String,
+		/**
+		 * MIME type
+		 */
+		type: String,
+		/**
+		 * Upload URL
+		 */
+		url: String
+	}
+};
+
+/**
+ * Preview an upload with its image or
+ * a representative icon
+ * @since 4.3.0
+ */
+export default {
+	mixins: [props],
+	computed: {
+		fallbackColor() {
+			if (this.type?.startsWith("image/")) {
+				return "orange-500";
+			}
+
+			if (this.type?.startsWith("audio/")) {
+				return "aqua-500";
+			}
+
+			if (this.type?.startsWith("video/")) {
+				return "yellow-500";
+			}
+
+			return "white";
+		},
+		fallbackIcon() {
+			if (this.type?.startsWith("image/")) {
+				return "image";
+			}
+
+			if (this.type?.startsWith("audio/")) {
+				return "audio";
+			}
+
+			if (this.type?.startsWith("video/")) {
+				return "video";
+			}
+
+			return "file";
+		},
+		isPreviewable() {
+			return [
+				"image/jpeg",
+				"image/jpg",
+				"image/gif",
+				"image/png",
+				"image/webp",
+				"image/avif",
+				"image/svg+xml"
+			].includes(this.type);
+		}
+	}
+};
+</script>
+
+<style>
+.k-upload-item-preview {
+	--icon-size: 24px;
+	grid-area: preview;
+	display: flex;
+	aspect-ratio: 1/1;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	border-start-start-radius: var(--rounded);
+	border-end-start-radius: var(--rounded);
+}
+.k-upload-item-preview:focus {
+	border-radius: var(--rounded);
+	outline: 2px solid var(--color-focus);
+	z-index: 1;
+}
+</style>
diff --git a/panel/src/components/Uploads/UploadItems.vue b/panel/src/components/Uploads/UploadItems.vue
new file mode 100644
index 0000000000..07ddf9dfb8
--- /dev/null
+++ b/panel/src/components/Uploads/UploadItems.vue
@@ -0,0 +1,31 @@
+<template>
+	<ul class="k-upload-items">
+		<k-upload-item
+			v-for="item in items"
+			:key="item.id"
+			v-bind="item"
+			@rename="$emit('rename', item, $event)"
+			@remove="$emit('remove', item)"
+		/>
+	</ul>
+</template>
+
+<script>
+/**
+ * Represents multiple files to upload in an upload dialog
+ * @since 4.3.0
+ */
+export default {
+	props: {
+		items: Array
+	},
+	emits: ["remove", "rename"]
+};
+</script>
+
+<style>
+.k-upload-items {
+	display: grid;
+	gap: 0.25rem;
+}
+</style>
diff --git a/panel/src/components/Uploads/index.js b/panel/src/components/Uploads/index.js
new file mode 100644
index 0000000000..dadc4712a7
--- /dev/null
+++ b/panel/src/components/Uploads/index.js
@@ -0,0 +1,11 @@
+import UploadItem from "./UploadItem.vue";
+import UploadItemPreview from "./UploadItemPreview.vue";
+import UploadItems from "./UploadItems.vue";
+
+export default {
+	install(app) {
+		app.component("k-upload-item", UploadItem);
+		app.component("k-upload-item-preview", UploadItemPreview);
+		app.component("k-upload-items", UploadItems);
+	}
+};
diff --git a/panel/src/components/View/Buttons/AddButton.vue b/panel/src/components/View/Buttons/AddButton.vue
new file mode 100644
index 0000000000..ccdfe028ae
--- /dev/null
+++ b/panel/src/components/View/Buttons/AddButton.vue
@@ -0,0 +1,28 @@
+<template>
+	<component :is="component" v-if="component" />
+	<k-button
+		v-else
+		:text="$t('add')"
+		icon="add"
+		size="sm"
+		variant="filled"
+		@click="$emit('action', 'add')"
+	/>
+</template>
+
+<script>
+export default {
+	computed: {
+		component() {
+			const view = this.$panel.view.component.match(/^^k-(.*)-view$/)[1];
+			const component = `k-view-add-${view}-button`;
+
+			if (this.$helper.isComponent(component)) {
+				return component;
+			}
+
+			return null;
+		}
+	}
+};
+</script>
diff --git a/panel/src/components/View/Buttons/AddLanguagesButton.vue b/panel/src/components/View/Buttons/AddLanguagesButton.vue
new file mode 100644
index 0000000000..55e21147a6
--- /dev/null
+++ b/panel/src/components/View/Buttons/AddLanguagesButton.vue
@@ -0,0 +1,9 @@
+<template>
+	<k-button
+		:text="$t('language.create')"
+		icon="add"
+		size="sm"
+		variant="filled"
+		@click="$dialog('languages/create')"
+	/>
+</template>
diff --git a/panel/src/components/View/Buttons/AddUsersButton.vue b/panel/src/components/View/Buttons/AddUsersButton.vue
new file mode 100644
index 0000000000..ea104404e0
--- /dev/null
+++ b/panel/src/components/View/Buttons/AddUsersButton.vue
@@ -0,0 +1,17 @@
+<template>
+	<k-button
+		v-if="$panel.view.component === 'k-users-view'"
+		:disabled="!$panel.permissions.users.create"
+		:text="$t('user.create')"
+		icon="add"
+		size="sm"
+		variant="filled"
+		@click="
+			$dialog('users/create', {
+				query: {
+					role: $panel.view.props.role?.id
+				}
+			})
+		"
+	/>
+</template>
diff --git a/panel/src/components/View/Buttons/Buttons.vue b/panel/src/components/View/Buttons/Buttons.vue
new file mode 100644
index 0000000000..909ba6382b
--- /dev/null
+++ b/panel/src/components/View/Buttons/Buttons.vue
@@ -0,0 +1,24 @@
+<template>
+	<k-button-group class="k-view-buttons">
+		<component
+			:is="`k-view-${button}-button`"
+			v-for="button in buttons"
+			:key="button"
+			@action="$emit('action', $event)"
+		/>
+	</k-button-group>
+</template>
+
+<script>
+/**
+ * Wrapper button group that dynamically renders the
+ * respective view button components passed as `buttons` prop.
+ * @internal
+ */
+export default {
+	props: {
+		buttons: Array
+	},
+	emits: ["action"]
+};
+</script>
diff --git a/panel/src/components/Dropdowns/LanguagesDropdown.vue b/panel/src/components/View/Buttons/LanguagesButton.vue
similarity index 89%
rename from panel/src/components/Dropdowns/LanguagesDropdown.vue
rename to panel/src/components/View/Buttons/LanguagesButton.vue
index 3418b3883d..6650ddb798 100644
--- a/panel/src/components/Dropdowns/LanguagesDropdown.vue
+++ b/panel/src/components/View/Buttons/LanguagesButton.vue
@@ -1,5 +1,8 @@
 <template>
-	<div v-if="languages.length > 1" class="k-languages-dropdown">
+	<div
+		v-if="languages.length > 1"
+		class="k-view-languages-button k-languages-dropdown"
+	>
 		<k-button
 			:dropdown="true"
 			:text="code"
@@ -15,6 +18,7 @@
 
 <script>
 /**
+ * View header button to switch between content languages
  * @since 4.0.0
  */
 export default {
diff --git a/panel/src/components/View/Buttons/PreviewButton.vue b/panel/src/components/View/Buttons/PreviewButton.vue
new file mode 100644
index 0000000000..a19c1d0172
--- /dev/null
+++ b/panel/src/components/View/Buttons/PreviewButton.vue
@@ -0,0 +1,44 @@
+<template>
+	<k-button
+		v-if="isAvailable"
+		:link="link"
+		:title="$t('open')"
+		icon="open"
+		size="sm"
+		target="_blank"
+		variant="filled"
+		class="k-view-preview-button"
+	/>
+</template>
+
+<script>
+/**
+ * View header button to open the model's preview in a new tab
+ * @since 5.0.0
+ */
+export default {
+	computed: {
+		isAvailable() {
+			if (!this.link) {
+				return false;
+			}
+
+			if (Object.hasOwn(this.permissions, "preview") === false) {
+				return true;
+			}
+
+			return this.permissions.preview;
+		},
+		link() {
+			return (
+				this.$panel.view.props.model?.previewUrl ??
+				this.$panel.view.props.preview?.url ??
+				this.$panel.view.props.url
+			);
+		},
+		permissions() {
+			return this.$panel.view.props.permissions ?? {};
+		}
+	}
+};
+</script>
diff --git a/panel/src/components/View/Buttons/RemoveButton.vue b/panel/src/components/View/Buttons/RemoveButton.vue
new file mode 100644
index 0000000000..a2830272e9
--- /dev/null
+++ b/panel/src/components/View/Buttons/RemoveButton.vue
@@ -0,0 +1,28 @@
+<template>
+	<component :is="component" v-if="component" />
+	<k-button
+		v-else
+		:text="$t('delete')"
+		icon="trash"
+		size="sm"
+		variant="filled"
+		@click="$emit('action', 'remove')"
+	/>
+</template>
+
+<script>
+export default {
+	computed: {
+		component() {
+			const view = this.$panel.view.component.match(/^^k-(.*)-view$/)[1];
+			const component = `k-view-remove-${view}-button`;
+
+			if (this.$helper.isComponent(component)) {
+				return component;
+			}
+
+			return null;
+		}
+	}
+};
+</script>
diff --git a/panel/src/components/View/Buttons/RemoveLanguageButton.vue b/panel/src/components/View/Buttons/RemoveLanguageButton.vue
new file mode 100644
index 0000000000..c3a378caa7
--- /dev/null
+++ b/panel/src/components/View/Buttons/RemoveLanguageButton.vue
@@ -0,0 +1,12 @@
+<template>
+	<k-button
+		v-if="
+			$panel.view.component === 'k-language-view' && $panel.view.props.deletable
+		"
+		:title="$t('delete')"
+		icon="trash"
+		size="sm"
+		variant="filled"
+		@click="$dialog(`languages/${$panel.view.props.id}/delete`)"
+	/>
+</template>
diff --git a/panel/src/components/View/Buttons/SettingsButton.vue b/panel/src/components/View/Buttons/SettingsButton.vue
new file mode 100644
index 0000000000..24fd8e0720
--- /dev/null
+++ b/panel/src/components/View/Buttons/SettingsButton.vue
@@ -0,0 +1,49 @@
+<template>
+	<div>
+		<k-button
+			:disabled="$panel.view.isLocked"
+			:dropdown="true"
+			:title="$t('settings')"
+			icon="cog"
+			variant="filled"
+			size="sm"
+			class="k-view-settings-button k-view-options"
+			@click="onClick"
+		/>
+		<k-dropdown-content
+			v-if="dropdown"
+			ref="dropdown"
+			:options="$dropdown(dropdown)"
+			align-x="end"
+			@action="$emit('action', $event)"
+		/>
+	</div>
+</template>
+
+<script>
+/**
+ * View header button to open the model's settings dropdown
+ * @since 5.0.0
+ */
+export default {
+	inheritAttrs: false,
+	emits: ["action"],
+	computed: {
+		dropdown() {
+			return this.model?.link;
+		},
+		model() {
+			return this.$panel.view.props.model;
+		}
+	},
+	methods: {
+		onClick() {
+			if (this.dropdown) {
+				return this.$refs.dropdown.toggle();
+			}
+
+			this.$emit("action", "settings");
+		}
+	}
+};
+</script>
diff --git a/panel/src/components/View/Buttons/StatusButton.vue b/panel/src/components/View/Buttons/StatusButton.vue
new file mode 100644
index 0000000000..57e1cc70b9
--- /dev/null
+++ b/panel/src/components/View/Buttons/StatusButton.vue
@@ -0,0 +1,40 @@
+<template>
+	<k-button
+		v-if="$panel.view.component === 'k-page-view' && status"
+		v-bind="button"
+		:responsive="true"
+		:text="status.label"
+		size="sm"
+		variant="filled"
+		class="k-view-status-button k-page-status-button"
+		@click="$dialog(model.link + '/changeStatus')"
+	/>
+</template>
+
+<script>
+/**
+ * View header button to change the page status
+ * @since 5.0.0
+ */
+export default {
+	inheritAttrs: false,
+	computed: {
+		button() {
+			return this.$helper.page.status.call(
+				this,
+				this.model.status,
+				!this.permissions.changeStatus || this.$panel.view.isLocked
+			);
+		},
+		model() {
+			return this.$panel.view.props.model;
+		},
+		permissions() {
+			return this.$panel.view.props.permissions;
+		},
+		status() {
+			return this.$panel.view.props.status;
+		}
+	}
+};
+</script>
diff --git a/panel/src/components/Views/Users/AccountThemeButton.vue b/panel/src/components/View/Buttons/ThemeButton.vue
similarity index 73%
rename from panel/src/components/Views/Users/AccountThemeButton.vue
rename to panel/src/components/View/Buttons/ThemeButton.vue
index 0fc0a7ee34..58c1cf4b04 100644
--- a/panel/src/components/Views/Users/AccountThemeButton.vue
+++ b/panel/src/components/View/Buttons/ThemeButton.vue
@@ -1,14 +1,20 @@
 <template>
 	<k-button
+		v-if="$panel.view.id === 'account'"
 		:icon="icon"
 		:text="text"
 		size="sm"
 		variant="filled"
+		class="k-view-theme-button"
 		@click="$panel.theme.toggle()"
 	/>
 </template>
 
 <script>
+/**
+ * View header button to toggle the Panel theme
+ * @since 5.0.0
+ */
 export default {
 	computed: {
 		icon() {
diff --git a/panel/src/components/View/Buttons/index.js b/panel/src/components/View/Buttons/index.js
new file mode 100644
index 0000000000..9d69d5d753
--- /dev/null
+++ b/panel/src/components/View/Buttons/index.js
@@ -0,0 +1,32 @@
+import Add from "./AddButton.vue";
+import AddLanguages from "./AddLanguagesButton.vue";
+import AddUsers from "./AddUsersButton.vue";
+import Languages from "./LanguagesButton.vue";
+import Preview from "./PreviewButton.vue";
+import Remove from "./RemoveButton.vue";
+import RemoveLanguage from "./RemoveLanguageButton.vue";
+import Settings from "./SettingsButton.vue";
+import Status from "./StatusButton.vue";
+import Theme from "./ThemeButton.vue";
+
+import Buttons from "./Buttons.vue";
+
+export default {
+	install(app) {
+		app.component("k-view-add-button", Add);
+		app.component("k-view-add-languages-button", AddLanguages);
+		app.component("k-view-add-users-button", AddUsers);
+		app.component("k-view-languages-button", Languages);
+		app.component("k-view-preview-button", Preview);
+		app.component("k-view-remove-button", Remove);
+		app.component("k-view-remove-language-button", RemoveLanguage);
+		app.component("k-view-settings-button", Settings);
+		app.component("k-view-status-button", Status);
+		app.component("k-view-theme-button", Theme);
+
+		app.component("k-view-buttons", Buttons);
+
+		// @deprecated
+		app.component("k-languages-dropdown", Languages);
+	}
+};
diff --git a/panel/src/components/View/index.js b/panel/src/components/View/index.js
index 44a1e055b0..a2f0985ff7 100644
--- a/panel/src/components/View/index.js
+++ b/panel/src/components/View/index.js
@@ -1,4 +1,5 @@
 import Activation from "./Activation.vue";
+import Buttons from "./Buttons/index.js";
 import Inside from "./Inside.vue";
 import Menu from "./Menu.vue";
 import Outside from "./Outside.vue";
@@ -7,6 +8,8 @@ import Topbar from "./Topbar.vue";
 
 export default {
 	install(app) {
+		app.use(Buttons);
+
 		app.component("k-activation", Activation);
 		app.component("k-panel", Panel);
 		app.component("k-panel-inside", Inside);
diff --git a/panel/src/components/Views/Files/FileView.vue b/panel/src/components/Views/Files/FileView.vue
index 04414c8246..66a1ab72f0 100644
--- a/panel/src/components/Views/Files/FileView.vue
+++ b/panel/src/components/Views/Files/FileView.vue
@@ -16,39 +16,9 @@
 			@edit="$dialog(id + '/changeName')"
 		>
 			{{ model.filename }}
-			<template #buttons>
-				<k-button-group>
-					<k-button
-						:link="preview.url"
-						:responsive="true"
-						:title="$t('open')"
-						class="k-file-view-options"
-						icon="open"
-						size="sm"
-						target="_blank"
-						variant="filled"
-					/>
-
-					<k-button
-						:disabled="isLocked"
-						:dropdown="true"
-						:title="$t('settings')"
-						icon="cog"
-						size="sm"
-						variant="filled"
-						class="k-file-view-options"
-						@click="$refs.settings.toggle()"
-					/>
-					<k-dropdown-content
-						ref="settings"
-						:options="$dropdown(id)"
-						align-x="end"
-						@action="action"
-					/>
-
-					<k-languages-dropdown />
-				</k-button-group>
 
+			<template #buttons>
+				<k-view-buttons :buttons="buttons" @action="onAction" />
 				<k-form-buttons :lock="lock" />
 			</template>
 		</k-header>
@@ -89,7 +59,7 @@ export default {
 		}
 	},
 	methods: {
-		action(action) {
+		onAction(action) {
 			switch (action) {
 				case "replace":
 					return this.$panel.upload.replace({
diff --git a/panel/src/components/Views/Files/index.js b/panel/src/components/Views/Files/index.js
new file mode 100644
index 0000000000..4455c8f31b
--- /dev/null
+++ b/panel/src/components/Views/Files/index.js
@@ -0,0 +1,11 @@
+import FileView from "./FileView.vue";
+import FileFocusButton from "./FileFocusButton.vue";
+import FilePreview from "./FilePreview.vue";
+
+export default {
+	install(app) {
+		app.component("k-file-view", FileView);
+		app.component("k-file-preview", FilePreview);
+		app.component("k-file-focus-button", FileFocusButton);
+	}
+};
diff --git a/panel/src/components/Views/Login/InstallationView.vue b/panel/src/components/Views/Installation/InstallationView.vue
similarity index 100%
rename from panel/src/components/Views/Login/InstallationView.vue
rename to panel/src/components/Views/Installation/InstallationView.vue
diff --git a/panel/src/components/Views/Installation/index.js b/panel/src/components/Views/Installation/index.js
new file mode 100644
index 0000000000..011e397754
--- /dev/null
+++ b/panel/src/components/Views/Installation/index.js
@@ -0,0 +1,7 @@
+import InstallationView from "./InstallationView.vue";
+
+export default {
+	install(app) {
+		app.component("k-installation-view", InstallationView);
+	}
+};
diff --git a/panel/src/components/Views/Languages/LanguageView.vue b/panel/src/components/Views/Languages/LanguageView.vue
index d2fe42e239..447a1475c7 100644
--- a/panel/src/components/Views/Languages/LanguageView.vue
+++ b/panel/src/components/Views/Languages/LanguageView.vue
@@ -8,31 +8,7 @@
 			{{ name }}
 
 			<template #buttons>
-				<k-button-group>
-					<k-button
-						:link="url"
-						:title="$t('open')"
-						icon="open"
-						size="sm"
-						target="_blank"
-						variant="filled"
-					/>
-					<k-button
-						:title="$t('settings')"
-						icon="cog"
-						size="sm"
-						variant="filled"
-						@click="update()"
-					/>
-					<k-button
-						v-if="deletable"
-						:title="$t('delete')"
-						icon="trash"
-						size="sm"
-						variant="filled"
-						@click="remove()"
-					/>
-				</k-button-group>
+				<k-view-buttons :buttons="buttons" @action="onAction" />
 			</template>
 		</k-header>
 
@@ -84,6 +60,7 @@
  */
 export default {
 	props: {
+		buttons: Array,
 		code: String,
 		deletable: Boolean,
 		direction: String,
@@ -99,6 +76,12 @@ export default {
 		createTranslation() {
 			this.$dialog(`languages/${this.id}/translations/create`);
 		},
+		onAction(action) {
+			switch (action) {
+				case "settings":
+					return this.update();
+			}
+		},
 		option(option, row) {
 			// for the compatibility of the encoded url in different environments,
 			// it is also encoded with base64 to reduce special characters
@@ -108,9 +91,6 @@ export default {
 				)}/${option}`
 			);
 		},
-		remove() {
-			this.$dialog(`languages/${this.id}/delete`);
-		},
 		update(focus) {
 			this.$dialog(`languages/${this.id}/update`, {
 				on: {
diff --git a/panel/src/components/Views/Languages/LanguagesView.vue b/panel/src/components/Views/Languages/LanguagesView.vue
index 6ae4dd7f20..148a9b815e 100644
--- a/panel/src/components/Views/Languages/LanguagesView.vue
+++ b/panel/src/components/Views/Languages/LanguagesView.vue
@@ -3,15 +3,9 @@
 		<k-header>
 			{{ $t("view.languages") }}
 
-			<k-button-group slot="buttons">
-				<k-button
-					:text="$t('language.create')"
-					icon="add"
-					size="sm"
-					variant="filled"
-					@click="$dialog('languages/create')"
-				/>
-			</k-button-group>
+			<template #buttons>
+				<k-view-buttons :buttons="buttons" />
+			</template>
 		</k-header>
 
 		<template v-if="languages.length > 0">
@@ -44,6 +38,7 @@
  */
 export default {
 	props: {
+		buttons: Array,
 		languages: {
 			type: Array,
 			default: () => []
diff --git a/panel/src/components/Views/Languages/index.js b/panel/src/components/Views/Languages/index.js
new file mode 100644
index 0000000000..271facc6ac
--- /dev/null
+++ b/panel/src/components/Views/Languages/index.js
@@ -0,0 +1,9 @@
+import LanguagesView from "./LanguagesView.vue";
+import LanguageView from "./LanguageView.vue";
+
+export default {
+	install(app) {
+		app.component("k-languages-view", LanguagesView);
+		app.component("k-language-view", LanguageView);
+	}
+};
diff --git a/panel/src/components/Forms/LoginAlert.vue b/panel/src/components/Views/Login/LoginAlert.vue
similarity index 100%
rename from panel/src/components/Forms/LoginAlert.vue
rename to panel/src/components/Views/Login/LoginAlert.vue
diff --git a/panel/src/components/Forms/LoginCode.vue b/panel/src/components/Views/Login/LoginCodeForm.vue
similarity index 72%
rename from panel/src/components/Forms/LoginCode.vue
rename to panel/src/components/Views/Login/LoginCodeForm.vue
index 19605a47cf..795f2c8296 100644
--- a/panel/src/components/Forms/LoginCode.vue
+++ b/panel/src/components/Views/Login/LoginCodeForm.vue
@@ -1,6 +1,6 @@
 <template>
 	<form class="k-login-form k-login-code-form" @submit.prevent="login">
-		<k-user-info :user="pending.email" />
+		<k-user-info v-if="pending.email" :user="pending.email" />
 
 		<k-text-field
 			:autofocus="true"
@@ -16,15 +16,15 @@
 			@input="code = $event"
 		/>
 
-		<div class="k-login-buttons">
+		<footer class="k-login-buttons">
 			<k-button
 				class="k-login-button k-login-back-button"
 				icon="angle-left"
+				link="/logout"
 				size="lg"
 				variant="filled"
-				@click="back"
 			>
-				{{ $t("back") }} <template v-if="isLoadingBack"> … </template>
+				{{ $t("back") }}
 			</k-button>
 
 			<k-button
@@ -35,10 +35,9 @@
 				theme="positive"
 				variant="filled"
 			>
-				{{ $t("login" + (mode === "password-reset" ? ".reset" : "")) }}
-				<template v-if="isLoadingLogin"> … </template>
+				{{ submitText }}
 			</k-button>
-		</div>
+		</footer>
 	</form>
 </template>
 
@@ -48,12 +47,18 @@ export const props = {
 		/**
 		 * List of available login method names
 		 */
-		methods: Array,
+		methods: {
+			type: Array,
+			default: () => []
+		},
 		/**
 		 * Pending login data (user email, challenge type)
 		 * @value { email: String, challenge: String }
 		 */
-		pending: Object,
+		pending: {
+			type: Object,
+			default: () => ({ challenge: "email" })
+		},
 		/**
 		 * Code value to prefill the input
 		 */
@@ -67,27 +72,29 @@ export default {
 	data() {
 		return {
 			code: this.value ?? "",
-			isLoadingBack: false,
-			isLoadingLogin: false
+			isLoading: false
 		};
 	},
 	computed: {
 		mode() {
-			if (this.methods.includes("password-reset") === true) {
-				return "password-reset";
+			return this.methods.includes("password-reset")
+				? "password-reset"
+				: "login";
+		},
+		submitText() {
+			const suffix = this.isLoading ? " …" : "";
+
+			if (this.mode === "password-reset") {
+				return this.$t("login.reset") + suffix;
 			}
 
-			return "login";
+			return this.$t("login") + suffix;
 		}
 	},
 	methods: {
-		async back() {
-			this.isLoadingBack = true;
-			this.$go("/logout");
-		},
 		async login() {
 			this.$emit("error", null);
-			this.isLoadingLogin = true;
+			this.isLoading = true;
 
 			try {
 				await this.$api.auth.verifyCode(this.code);
@@ -105,7 +112,7 @@ export default {
 			} catch (error) {
 				this.$emit("error", error);
 			} finally {
-				this.isLoadingLogin = false;
+				this.isLoading = false;
 			}
 		}
 	}
diff --git a/panel/src/components/Forms/Login.vue b/panel/src/components/Views/Login/LoginForm.vue
similarity index 57%
rename from panel/src/components/Forms/Login.vue
rename to panel/src/components/Views/Login/LoginForm.vue
index 9791a2a977..a167c36883 100644
--- a/panel/src/components/Forms/Login.vue
+++ b/panel/src/components/Views/Login/LoginForm.vue
@@ -5,7 +5,7 @@
 				v-if="canToggle === true"
 				class="k-login-toggler"
 				type="button"
-				@click="toggleForm"
+				@click="toggle"
 			>
 				{{ toggleText }}
 			</button>
@@ -18,14 +18,15 @@
 			/>
 		</div>
 
-		<div class="k-login-buttons">
-			<span v-if="isResetForm === false" class="k-login-checkbox">
-				<k-checkbox-input
-					:value="user.remember"
-					:label="$t('login.remember')"
-					@input="user.remember = $event"
-				/>
-			</span>
+		<footer class="k-login-buttons">
+			<k-checkbox-input
+				v-if="isResetForm === false"
+				:label="$t('login.remember')"
+				:checked="user.remember"
+				:value="user.remember"
+				@input="user.remember = $event"
+			/>
+
 			<k-button
 				class="k-login-button"
 				icon="check"
@@ -34,10 +35,9 @@
 				type="submit"
 				variant="filled"
 			>
-				{{ $t("login" + (isResetForm ? ".reset" : "")) }}
-				<template v-if="isLoading"> … </template>
+				{{ submitText }}
 			</k-button>
-		</div>
+		</footer>
 	</form>
 </template>
 
@@ -47,12 +47,18 @@ export const props = {
 		/**
 		 * List of available login method names
 		 */
-		methods: Array,
+		methods: {
+			type: Array,
+			default: () => []
+		},
 		/**
 		 * Values to prefill the inputs
-		 * @value { email: String, password: String }
+		 * @value { email: String, password: String, remember: Boolean }
 		 */
-		value: Object
+		value: {
+			type: Object,
+			default: () => ({})
+		}
 	}
 };
 
@@ -61,22 +67,36 @@ export default {
 	emits: ["error"],
 	data() {
 		return {
-			currentForm: null,
+			mode: null,
 			isLoading: false,
 			user: {
-				email: this.value.email ?? "",
-				password: this.value.password ?? "",
-				remember: false
+				email: "",
+				password: "",
+				remember: false,
+				...this.value
 			}
 		};
 	},
 	computed: {
+		alternateMode() {
+			if (this.form === "email-password") {
+				return "email";
+			}
+
+			return "email-password";
+		},
 		canToggle() {
+			if (this.codeMode === null) {
+				return false;
+			}
+
+			if (this.methods.includes("password") === false) {
+				return false;
+			}
+
 			return (
-				this.codeMode !== null &&
-				this.methods.includes("password") === true &&
-				(this.methods.includes("password-reset") === true ||
-					this.methods.includes("code") === true)
+				this.methods.includes("password-reset") === true ||
+				this.methods.includes("code") === true
 			);
 		},
 		codeMode() {
@@ -89,7 +109,7 @@ export default {
 			return null;
 		},
 		fields() {
-			let fields = {
+			const fields = {
 				email: {
 					autofocus: true,
 					label: this.$t("email"),
@@ -113,8 +133,8 @@ export default {
 			return fields;
 		},
 		form() {
-			if (this.currentForm) {
-				return this.currentForm;
+			if (this.mode) {
+				return this.mode;
 			}
 
 			if (this.methods[0] === "password") {
@@ -126,28 +146,30 @@ export default {
 		isResetForm() {
 			return this.codeMode === "password-reset" && this.form === "email";
 		},
+		submitText() {
+			const suffix = this.isLoading ? " …" : "";
+
+			if (this.isResetForm) {
+				return this.$t("login.reset") + suffix;
+			}
+
+			return this.$t("login") + suffix;
+		},
 		toggleText() {
 			return this.$t(
-				"login.toggleText." + this.codeMode + "." + this.formOpposite(this.form)
+				"login.toggleText." + this.codeMode + "." + this.alternateMode
 			);
 		}
 	},
 	methods: {
-		formOpposite(input) {
-			if (input === "email-password") {
-				return "email";
-			} else {
-				return "email-password";
-			}
-		},
 		async login() {
 			this.$emit("error", null);
 			this.isLoading = true;
 
 			// clear field data that is not needed for login
-			let user = Object.assign({}, this.user);
+			const user = { ...this.user };
 
-			if (this.currentForm === "email") {
+			if (this.mode === "email") {
 				user.password = null;
 			}
 
@@ -172,10 +194,35 @@ export default {
 				this.isLoading = false;
 			}
 		},
-		toggleForm() {
-			this.currentForm = this.formOpposite(this.form);
+		toggle() {
+			this.mode = this.alternateMode;
 			this.$refs.fieldset.focus("email");
 		}
 	}
 };
 </script>
+
+<style>
+.k-login-form {
+	position: relative;
+}
+
+.k-login-form label abbr {
+	visibility: hidden;
+}
+
+.k-login-toggler {
+	position: absolute;
+	top: -2px;
+	inset-inline-end: calc(var(--spacing-2) * -1);
+	color: var(--link-color);
+	text-decoration: underline;
+	text-decoration-color: var(--link-color);
+	text-underline-offset: 1px;
+	height: var(--height-xs);
+	line-height: 1;
+	padding-inline: var(--spacing-2);
+	border-radius: var(--rounded);
+	z-index: 1;
+}
+</style>
diff --git a/panel/src/components/Views/Login/LoginView.vue b/panel/src/components/Views/Login/LoginView.vue
index 0b2758a8df..fe42e69aeb 100644
--- a/panel/src/components/Views/Login/LoginView.vue
+++ b/panel/src/components/Views/Login/LoginView.vue
@@ -1,7 +1,9 @@
 <template>
-	<k-panel-outside :class="viewClass">
+	<k-panel-outside
+		:class="form === 'code' ? 'k-login-code-view' : 'k-login-view'"
+	>
 		<!-- <div> as single child for grid layout -->
-		<div class="k-dialog k-login-dialog">
+		<div class="k-dialog k-login k-login-dialog">
 			<h1 class="sr-only">
 				{{ $t("login") }}
 			</h1>
@@ -11,29 +13,34 @@
 			</k-login-alert>
 
 			<k-dialog-body>
-				<k-login-code
+				<k-login-code-form
 					v-if="form === 'code'"
 					v-bind="{ methods, pending, value: value.code }"
 					@error="onError"
 				/>
-				<k-login-plugin v-else v-bind="{ methods, value }" @error="onError" />
+				<component
+					:is="component"
+					v-else
+					v-bind="{ methods, value }"
+					@error="onError"
+				/>
 			</k-dialog-body>
 		</div>
 	</k-panel-outside>
 </template>
 
 <script>
-import { props as LoginCodeProps } from "@/components/Forms/LoginCode.vue";
-import LoginForm, { props as LoginProps } from "@/components/Forms/Login.vue";
+import { props as LoginCodeFormProps } from "./LoginCodeForm.vue";
+import { props as LoginFormProps } from "./LoginForm.vue";
 
 /**
  * @internal
  */
 export default {
 	components: {
-		"k-login-plugin": window.panel.plugins.login ?? LoginForm
+		"k-login-plugin-form": window.panel.plugins.login
 	},
-	mixins: [LoginCodeProps, LoginProps],
+	mixins: [LoginCodeFormProps, LoginFormProps],
 	props: {
 		/**
 		 * Values to prefill the inputs
@@ -53,19 +60,13 @@ export default {
 		};
 	},
 	computed: {
-		form() {
-			if (this.pending.email) {
-				return "code";
-			}
-
-			return "login";
+		component() {
+			return window.panel.plugins.login
+				? "k-login-plugin-form"
+				: "k-login-form";
 		},
-		viewClass() {
-			if (this.form === "code") {
-				return "k-login-code-view";
-			}
-
-			return "k-login-view";
+		form() {
+			return this.pending.email ? "code" : "login";
 		}
 	},
 	mounted() {
@@ -92,33 +93,11 @@ export default {
 </script>
 
 <style>
-.k-login-dialog {
+.k-login {
 	--dialog-color-back: var(--color-white);
 	--dialog-shadow: var(--shadow);
-	container-type: inline-size;
-}
-
-.k-login-fields {
-	position: relative;
-}
 
-.k-login-toggler {
-	position: absolute;
-	top: -2px;
-	inset-inline-end: calc(var(--spacing-2) * -1);
-	z-index: 1;
-	color: var(--link-color);
-	padding-inline: var(--spacing-2);
-	text-decoration: underline;
-	text-decoration-color: var(--link-color);
-	text-underline-offset: 1px;
-	height: var(--height-xs);
-	line-height: 1;
-	border-radius: var(--rounded);
-}
-
-.k-login-form label abbr {
-	visibility: hidden;
+	container-type: inline-size;
 }
 
 .k-login-buttons {
diff --git a/panel/src/components/Views/Login/index.js b/panel/src/components/Views/Login/index.js
new file mode 100644
index 0000000000..bf8422e64b
--- /dev/null
+++ b/panel/src/components/Views/Login/index.js
@@ -0,0 +1,17 @@
+import LoginAlert from "./LoginAlert.vue";
+import LoginCodeForm from "./LoginCodeForm.vue";
+import LoginForm from "./LoginForm.vue";
+import LoginView from "./LoginView.vue";
+
+export default {
+	install(app) {
+		app.component("k-login-alert", LoginAlert);
+		app.component("k-login-code-form", LoginCodeForm);
+		app.component("k-login-form", LoginForm);
+		app.component("k-login-view", LoginView);
+
+		/** deprecated */
+		app.component("k-login", LoginForm);
+		app.component("k-login-code", LoginCodeForm);
+	}
+};
diff --git a/panel/src/components/Views/ModelView.vue b/panel/src/components/Views/ModelView.vue
index cf9f41c466..42509e9d8a 100644
--- a/panel/src/components/Views/ModelView.vue
+++ b/panel/src/components/Views/ModelView.vue
@@ -5,6 +5,7 @@
 export default {
 	props: {
 		blueprint: String,
+		buttons: Array,
 		next: Object,
 		prev: Object,
 		permissions: {
@@ -36,7 +37,7 @@ export default {
 			return this.model.link;
 		},
 		isLocked() {
-			return this.lock?.state === "lock";
+			return this.$panel.view.isLocked;
 		},
 		protectedFields() {
 			return [];
diff --git a/panel/src/components/Views/Pages/PageView.vue b/panel/src/components/Views/Pages/PageView.vue
index 8fc70db8c0..6d08311763 100644
--- a/panel/src/components/Views/Pages/PageView.vue
+++ b/panel/src/components/Views/Pages/PageView.vue
@@ -16,45 +16,9 @@
 			@edit="$dialog(id + '/changeTitle')"
 		>
 			{{ model.title }}
-			<template #buttons>
-				<k-button-group>
-					<k-button
-						v-if="permissions.preview && model.previewUrl"
-						:link="model.previewUrl"
-						:title="$t('open')"
-						icon="open"
-						target="_blank"
-						variant="filled"
-						size="sm"
-						class="k-page-view-preview"
-					/>
-
-					<k-button
-						:disabled="isLocked === true"
-						:dropdown="true"
-						:title="$t('settings')"
-						icon="cog"
-						variant="filled"
-						size="sm"
-						class="k-page-view-options"
-						@click="$refs.settings.toggle()"
-					/>
-					<k-dropdown-content
-						ref="settings"
-						:options="$dropdown(id)"
-						align-x="end"
-					/>
-
-					<k-languages-dropdown />
-
-					<k-button
-						v-if="status"
-						v-bind="statusBtn"
-						class="k-page-view-status"
-						@click="$dialog(id + '/changeStatus')"
-					/>
-				</k-button-group>
 
+			<template #buttons>
+				<k-view-buttons :buttons="buttons" />
 				<k-form-buttons :lock="lock" />
 			</template>
 		</k-header>
@@ -82,19 +46,6 @@ export default {
 	computed: {
 		protectedFields() {
 			return ["title"];
-		},
-		statusBtn() {
-			return {
-				...this.$helper.page.status.call(
-					this,
-					this.model.status,
-					!this.permissions.changeStatus || this.isLocked
-				),
-				responsive: true,
-				size: "sm",
-				text: this.status.label,
-				variant: "filled"
-			};
 		}
 	}
 };
diff --git a/panel/src/components/Views/Pages/SiteView.vue b/panel/src/components/Views/Pages/SiteView.vue
index edd71c4038..b4ba07b957 100644
--- a/panel/src/components/Views/Pages/SiteView.vue
+++ b/panel/src/components/Views/Pages/SiteView.vue
@@ -12,20 +12,9 @@
 			@edit="$dialog('site/changeTitle')"
 		>
 			{{ model.title }}
-			<template #buttons>
-				<k-button-group>
-					<k-button
-						:link="model.previewUrl"
-						:title="$t('open')"
-						icon="open"
-						target="_blank"
-						variant="filled"
-						size="sm"
-						class="k-site-view-preview"
-					/>
-					<k-languages-dropdown />
-				</k-button-group>
 
+			<template #buttons>
+				<k-view-buttons :buttons="buttons" />
 				<k-form-buttons :lock="lock" />
 			</template>
 		</k-header>
diff --git a/panel/src/components/Views/Pages/index.js b/panel/src/components/Views/Pages/index.js
new file mode 100644
index 0000000000..98ac2a67bf
--- /dev/null
+++ b/panel/src/components/Views/Pages/index.js
@@ -0,0 +1,9 @@
+import PageView from "./PageView.vue";
+import SiteView from "./SiteView.vue";
+
+export default {
+	install(app) {
+		app.component("k-page-view", PageView);
+		app.component("k-site-view", SiteView);
+	}
+};
diff --git a/panel/src/components/Views/System/SystemView.vue b/panel/src/components/Views/System/SystemView.vue
index c74c7fdc86..0859b91603 100644
--- a/panel/src/components/Views/System/SystemView.vue
+++ b/panel/src/components/Views/System/SystemView.vue
@@ -2,6 +2,10 @@
 	<k-panel-inside class="k-system-view">
 		<k-header>
 			{{ $t("view.system") }}
+
+			<template #buttons>
+				<k-view-buttons :buttons="buttons" />
+			</template>
 		</k-header>
 
 		<k-section
@@ -36,6 +40,7 @@ export default {
 		Security
 	},
 	props: {
+		buttons: Array,
 		environment: Array,
 		exceptions: Array,
 		info: Object,
diff --git a/panel/src/components/Views/System/index.js b/panel/src/components/Views/System/index.js
new file mode 100644
index 0000000000..b1f9d41260
--- /dev/null
+++ b/panel/src/components/Views/System/index.js
@@ -0,0 +1,9 @@
+import SystemView from "./SystemView.vue";
+import TableUpdateStatusCell from "./TableUpdateStatusCell.vue";
+
+export default {
+	install(app) {
+		app.component("k-system-view", SystemView);
+		app.component("k-table-update-status-cell", TableUpdateStatusCell);
+	}
+};
diff --git a/panel/src/components/Views/Login/ResetPasswordView.vue b/panel/src/components/Views/Users/ResetPasswordView.vue
similarity index 100%
rename from panel/src/components/Views/Login/ResetPasswordView.vue
rename to panel/src/components/Views/Users/ResetPasswordView.vue
diff --git a/panel/src/components/Views/Login/UserInfo.vue b/panel/src/components/Views/Users/UserInfo.vue
similarity index 100%
rename from panel/src/components/Views/Login/UserInfo.vue
rename to panel/src/components/Views/Users/UserInfo.vue
diff --git a/panel/src/components/Views/Users/UserView.vue b/panel/src/components/Views/Users/UserView.vue
index 37f37fc5e0..da450d613d 100644
--- a/panel/src/components/Views/Users/UserView.vue
+++ b/panel/src/components/Views/Users/UserView.vue
@@ -26,27 +26,7 @@
 			</template>
 
 			<template #buttons>
-				<k-account-theme-button v-if="$panel.view.id === 'account'" />
-
-				<k-button-group>
-					<k-button
-						:disabled="isLocked"
-						:dropdown="true"
-						:title="$t('settings')"
-						icon="cog"
-						size="sm"
-						variant="filled"
-						class="k-user-view-options"
-						@click="$refs.settings.toggle()"
-					/>
-					<k-dropdown-content
-						ref="settings"
-						align-x="end"
-						:options="$dropdown(id)"
-					/>
-					<k-languages-dropdown />
-				</k-button-group>
-
+				<k-view-buttons :buttons="buttons" />
 				<k-form-buttons :lock="lock" />
 			</template>
 		</k-header>
diff --git a/panel/src/components/Views/Users/UsersView.vue b/panel/src/components/Views/Users/UsersView.vue
index 117415ce8d..ddb4af1e44 100644
--- a/panel/src/components/Views/Users/UsersView.vue
+++ b/panel/src/components/Views/Users/UsersView.vue
@@ -4,14 +4,7 @@
 			{{ $t("view.users") }}
 
 			<template #buttons>
-				<k-button
-					:disabled="!$panel.permissions.users.create"
-					:text="$t('user.create')"
-					icon="add"
-					size="sm"
-					variant="filled"
-					@click="create"
-				/>
+				<k-view-buttons :buttons="buttons" />
 			</template>
 		</k-header>
 		<k-tabs :tab="role?.id ?? 'all'" :tabs="tabs" />
@@ -30,6 +23,7 @@
  */
 export default {
 	props: {
+		buttons: Array,
 		role: Object,
 		roles: Array,
 		search: String,
diff --git a/panel/src/components/Views/Users/index.js b/panel/src/components/Views/Users/index.js
new file mode 100644
index 0000000000..ccd5d0e3d0
--- /dev/null
+++ b/panel/src/components/Views/Users/index.js
@@ -0,0 +1,19 @@
+import AccountView from "./AccountView.vue";
+import ResetPasswordView from "./ResetPasswordView.vue";
+import UserAvatar from "./UserAvatar.vue";
+import UserInfo from "./UserInfo.vue";
+import UserProfile from "./UserProfile.vue";
+import UserView from "./UserView.vue";
+import UsersView from "./UsersView.vue";
+
+export default {
+	install(app) {
+		app.component("k-account-view", AccountView);
+		app.component("k-reset-password-view", ResetPasswordView);
+		app.component("k-user-avatar", UserAvatar);
+		app.component("k-user-info", UserInfo);
+		app.component("k-user-profile", UserProfile);
+		app.component("k-user-view", UserView);
+		app.component("k-users-view", UsersView);
+	}
+};
diff --git a/panel/src/components/Views/index.js b/panel/src/components/Views/index.js
index 76581d60a3..e19f91a66c 100644
--- a/panel/src/components/Views/index.js
+++ b/panel/src/components/Views/index.js
@@ -1,59 +1,25 @@
 import ErrorView from "./ErrorView.vue";
 import SearchView from "./SearchView.vue";
 
-import FileView from "./Files/FileView.vue";
-import FilePreview from "./Files/FilePreview.vue";
-import FileFocusButton from "./Files/FileFocusButton.vue";
-
-import LanguagesView from "./Languages/LanguagesView.vue";
-import LanguageView from "./Languages/LanguageView.vue";
-
-import LoginView from "./Login/LoginView.vue";
-import InstallationView from "./Login/InstallationView.vue";
-import ResetPasswordView from "./Login/ResetPasswordView.vue";
-import UserInfo from "./Login/UserInfo.vue";
-
-import PageView from "./Pages/PageView.vue";
-import SiteView from "./Pages/SiteView.vue";
-
-import SystemView from "./System/SystemView.vue";
-import TableUpdateStatusCell from "./System/TableUpdateStatusCell.vue";
-
-import AccountView from "./Users/AccountView.vue";
-import AccountThemeButton from "./Users/AccountThemeButton.vue";
-import UserAvatar from "./Users/UserAvatar.vue";
-import UserProfile from "./Users/UserProfile.vue";
-import UserView from "./Users/UserView.vue";
-import UsersView from "./Users/UsersView.vue";
+import Files from "./Files/index.js";
+import Installation from "./Installation/index.js";
+import Languages from "./Languages/index.js";
+import Login from "./Login/index.js";
+import Pages from "./Pages/index.js";
+import Users from "./Users/index.js";
+import System from "./System/index.js";
 
 export default {
 	install(app) {
 		app.component("k-error-view", ErrorView);
 		app.component("k-search-view", SearchView);
 
-		app.component("k-file-view", FileView);
-		app.component("k-file-preview", FilePreview);
-		app.component("k-file-focus-button", FileFocusButton);
-
-		app.component("k-languages-view", LanguagesView);
-		app.component("k-language-view", LanguageView);
-
-		app.component("k-login-view", LoginView);
-		app.component("k-installation-view", InstallationView);
-		app.component("k-reset-password-view", ResetPasswordView);
-		app.component("k-user-info", UserInfo);
-
-		app.component("k-page-view", PageView);
-		app.component("k-site-view", SiteView);
-
-		app.component("k-system-view", SystemView);
-		app.component("k-table-update-status-cell", TableUpdateStatusCell);
-
-		app.component("k-account-view", AccountView);
-		app.component("k-account-theme-button", AccountThemeButton);
-		app.component("k-user-avatar", UserAvatar);
-		app.component("k-user-profile", UserProfile);
-		app.component("k-user-view", UserView);
-		app.component("k-users-view", UsersView);
+		app.use(Files);
+		app.use(Installation);
+		app.use(Languages);
+		app.use(Login);
+		app.use(Pages);
+		app.use(System);
+		app.use(Users);
 	}
 };
diff --git a/panel/src/components/index.js b/panel/src/components/index.js
index 46c188258f..5118805a3c 100644
--- a/panel/src/components/index.js
+++ b/panel/src/components/index.js
@@ -9,6 +9,7 @@ import Misc from "@/components/Misc/index.js";
 import Navigation from "@/components/Navigation/index.js";
 import Sections from "@/components/Sections/index.js";
 import Text from "@/components/Text/index.js";
+import Uploads from "@/components/Uploads/index.js";
 import View from "@/components/View/index.js";
 import Views from "@/components/Views/index.js";
 
@@ -25,6 +26,7 @@ export default {
 		app.use(Navigation);
 		app.use(Sections);
 		app.use(Text);
+		app.use(Uploads);
 		app.use(View);
 		app.use(Views);
 	}
diff --git a/panel/src/helpers/page.js b/panel/src/helpers/page.js
index af2a6bc0ad..7fa8a91511 100644
--- a/panel/src/helpers/page.js
+++ b/panel/src/helpers/page.js
@@ -8,7 +8,6 @@
  */
 export function status(status, disabled = false) {
 	const button = {
-		class: "k-status-icon",
 		icon: "status-" + status,
 		title:
 			window.panel.$t("page.status") +
diff --git a/panel/src/helpers/string.js b/panel/src/helpers/string.js
index 62a2662cb4..aaed54478a 100644
--- a/panel/src/helpers/string.js
+++ b/panel/src/helpers/string.js
@@ -210,8 +210,8 @@ export function slug(string, rules = [], allowed = "", separator = "-") {
 	string = string.replace("/", separator);
 
 	// trim leading and trailing non-word-chars
-	string = string.replace(new RegExp("^[^" + allowed + "]+", "g"), "");
-	string = string.replace(new RegExp("[^" + allowed + "]+$", "g"), "");
+	string = string.replace(new RegExp("^[^a-z0-9]+", "g"), "");
+	string = string.replace(new RegExp("[^a-z0-9]+$", "g"), "");
 
 	return string;
 }
diff --git a/panel/src/helpers/string.slug.test.js b/panel/src/helpers/string.slug.test.js
index 267074be1a..f84d0e9e3f 100644
--- a/panel/src/helpers/string.slug.test.js
+++ b/panel/src/helpers/string.slug.test.js
@@ -70,6 +70,11 @@ describe.concurrent("$helper.string.slug()", () => {
 		expect(resultB).toBe("a-b");
 	});
 
+	it("should produces safe filenames", () => {
+		const result = slug("-what a view@2x.png_", [], "a-z0-9@._-");
+		expect(result).toBe("what-a-view@2x.png");
+	});
+
 	it("should return empty string when no param sent", () => {
 		const result = slug();
 		expect(result).toBe("");
diff --git a/panel/src/panel/modal.test.js b/panel/src/panel/modal.test.js
index 7a8a50e5e5..f2eb71a252 100644
--- a/panel/src/panel/modal.test.js
+++ b/panel/src/panel/modal.test.js
@@ -147,8 +147,8 @@ describe.concurrent("panel/modal.js", () => {
 			message: "Test"
 		});
 
-		expect(panel.notification.type).toStrictEqual("success");
 		expect(panel.notification.message).toStrictEqual("Test");
+		expect(panel.notification.theme).toStrictEqual("positive");
 	});
 
 	it("should emit panel events after submit", async () => {
diff --git a/panel/src/panel/notification.js b/panel/src/panel/notification.js
index f68c43d26c..cff9596b7c 100644
--- a/panel/src/panel/notification.js
+++ b/panel/src/panel/notification.js
@@ -12,6 +12,7 @@ export const defaults = () => {
 		icon: null,
 		isOpen: false,
 		message: null,
+		theme: null,
 		timeout: null,
 		type: null
 	};
@@ -90,8 +91,7 @@ export default (panel = {}) => {
 			// convert strings to full error objects
 			if (typeof error === "string") {
 				error = {
-					message: error,
-					type: "error"
+					message: error
 				};
 			}
 
@@ -106,16 +106,36 @@ export default (panel = {}) => {
 			if (panel.context === "view") {
 				panel.dialog.open({
 					component: "k-error-dialog",
-					props: error,
-					type: "error"
+					props: error
 				});
 			}
 
 			// show the error notification bar
 			return this.open({
 				message: error.message,
-				type: "error",
-				icon: "alert"
+				icon: "alert",
+				theme: "negative",
+				type: "error"
+			});
+		},
+
+		/**
+		 * Shortcut to create an info
+		 * notification. You can pass a simple
+		 * string or a state object.
+		 *
+		 * @param {Object|String} info
+		 * @returns {Object} The notification state
+		 */
+		info(info = {}) {
+			if (typeof info === "string") {
+				info = { message: info };
+			}
+
+			return this.open({
+				icon: "info",
+				theme: "info",
+				...info
 			});
 		},
 
@@ -175,6 +195,11 @@ export default (panel = {}) => {
 				return this.success(notification);
 			}
 
+			// add timeout if not error or fatal notification
+			if (notification.type !== "error" && notification.type !== "fatal") {
+				notification.timeout ??= 4000;
+			}
+
 			// set the new state
 			this.set({
 				// add the current editing context
@@ -200,33 +225,18 @@ export default (panel = {}) => {
 		 * @param {Object|String} success
 		 * @returns {Object} The notification state
 		 */
-		success(success) {
-			if (!success) {
-				success = {};
-			}
-
+		success(success = {}) {
 			if (typeof success === "string") {
 				success = { message: success };
 			}
 
 			return this.open({
-				timeout: 4000,
-				type: "success",
 				icon: "check",
+				theme: "positive",
 				...success
 			});
 		},
 
-		/**
-		 * Getter that converts the notification type
-		 * into the matching notification component theme
-		 *
-		 * @returns {String}
-		 */
-		get theme() {
-			return this.type === "error" ? "negative" : "positive";
-		},
-
 		/**
 		 * Holds the timer object
 		 */
diff --git a/panel/src/panel/notification.test.js b/panel/src/panel/notification.test.js
index 44c3814e74..d53d91c1a1 100644
--- a/panel/src/panel/notification.test.js
+++ b/panel/src/panel/notification.test.js
@@ -19,6 +19,7 @@ describe("panel.notification", () => {
 			icon: null,
 			isOpen: false,
 			message: null,
+			theme: null,
 			timeout: null,
 			type: null
 		};
@@ -99,12 +100,16 @@ describe("panel.notification", () => {
 		const notification = Notification(panel);
 
 		notification.success("Test");
-
 		expect(notification.theme).toStrictEqual("positive");
 
-		notification.error("Test");
+		notification.info("Test");
+		expect(notification.theme).toStrictEqual("info");
 
+		notification.error("Test");
 		expect(notification.theme).toStrictEqual("negative");
+
+		notification.open({ theme: "love" });
+		expect(notification.theme).toStrictEqual("love");
 	});
 
 	it("should set a timer for success notifications", async () => {
diff --git a/panel/src/panel/plugins.js b/panel/src/panel/plugins.js
index 74944e4775..f6b19ad10a 100644
--- a/panel/src/panel/plugins.js
+++ b/panel/src/panel/plugins.js
@@ -160,8 +160,9 @@ export default (app, plugins = {}) => {
 		icons: {},
 		login: null,
 		textareaButtons: {},
-		use: [],
 		thirdParty: {},
+		use: [],
+		viewButtons: {},
 		writerMarks: {},
 		writerNodes: {},
 		...plugins
diff --git a/panel/src/panel/plugins.test.js b/panel/src/panel/plugins.test.js
index 709b82aebd..5cfda0cff6 100644
--- a/panel/src/panel/plugins.test.js
+++ b/panel/src/panel/plugins.test.js
@@ -19,8 +19,9 @@ describe.concurrent("panel.plugins", () => {
 			icons: {},
 			login: null,
 			textareaButtons: {},
-			use: [],
 			thirdParty: {},
+			use: [],
+			viewButtons: {},
 			writerMarks: {},
 			writerNodes: {}
 		};
diff --git a/panel/src/panel/view.js b/panel/src/panel/view.js
index 681620733a..eda1812251 100644
--- a/panel/src/panel/view.js
+++ b/panel/src/panel/view.js
@@ -23,6 +23,10 @@ export default (panel) => {
 	return reactive({
 		...parent,
 
+		get isLocked() {
+			return this.props.lock?.state === "lock";
+		},
+
 		/**
 		 * Setting the active view state
 		 * will also change the document title
diff --git a/src/Cms/App.php b/src/Cms/App.php
index 5dc59fda9b..11a09367b8 100644
--- a/src/Cms/App.php
+++ b/src/Cms/App.php
@@ -30,6 +30,7 @@
 use Kirby\Toolkit\Config;
 use Kirby\Toolkit\Controller;
 use Kirby\Toolkit\LazyValue;
+use Kirby\Toolkit\Locale;
 use Kirby\Toolkit\Str;
 use Kirby\Uuid\Uuid;
 use Throwable;
@@ -435,10 +436,11 @@ public function contentIgnore(): array
 	 */
 	public function contentToken(mixed $model, string $value): string
 	{
-		$default = match (method_exists($model, 'root')) {
-			true  => $model->root(),
-			false => $this->root('content')
-		};
+		$default = $this->root('content');
+
+		if (method_exists($model, 'id') === true) {
+			$default .= '/' . $model->id();
+		}
 
 		$salt = $this->option('content.salt', $default);
 
@@ -562,6 +564,14 @@ public function csrf(string|null $check = null): string|bool
 		return false;
 	}
 
+	/**
+	 * Returns the current language, if set by `static::setCurrentLanguage`
+	 */
+	public function currentLanguage(): Language|null
+	{
+		return $this->language ??= $this->defaultLanguage();
+	}
+
 	/**
 	 * Returns the default language object
 	 */
@@ -900,7 +910,8 @@ public function kirbytext(string|null $text = null, array $options = []): string
 	}
 
 	/**
-	 * Returns the current language
+	 * Returns the language by code or shortcut (`default`, `current`).
+	 * Passing `null` is an alias for passing `current`
 	 */
 	public function language(string|null $code = null): Language|null
 	{
@@ -908,19 +919,11 @@ public function language(string|null $code = null): Language|null
 			return null;
 		}
 
-		if ($code === 'default') {
-			return $this->defaultLanguage();
-		}
-
-		// if requesting a non-default language,
-		// find it but don't cache it
-		if ($code !== null) {
-			return $this->languages()->find($code);
-		}
-
-		// otherwise return language set by `AppTranslation::setCurrentLanguage`
-		// or default language
-		return $this->language ??= $this->defaultLanguage();
+		return match ($code ?? 'current') {
+			'default' => $this->defaultLanguage(),
+			'current' => $this->currentLanguage(),
+			default   => $this->languages()->find($code)
+		};
 	}
 
 	/**
@@ -1445,6 +1448,31 @@ public function sessionHandler(): AutoSession
 		);
 	}
 
+	/**
+	 * Load and set the current language if it exists
+	 * Otherwise fall back to the default language
+	 *
+	 * @internal
+	 */
+	public function setCurrentLanguage(
+		string|null $languageCode = null
+	): Language|null {
+		if ($this->multilang() === false) {
+			Locale::set($this->option('locale', 'en_US.utf-8'));
+			return $this->language = null;
+		}
+
+		$this->language   = $this->language($languageCode);
+		$this->language ??= $this->defaultLanguage();
+
+		Locale::set($this->language->locale());
+
+		// add language slug rules to Str class
+		Str::$language = $this->language->rules();
+
+		return $this->language;
+	}
+
 	/**
 	 * Create your own set of languages
 	 *
diff --git a/src/Cms/AppPlugins.php b/src/Cms/AppPlugins.php
index e5d125bab3..fae10d7bce 100644
--- a/src/Cms/AppPlugins.php
+++ b/src/Cms/AppPlugins.php
@@ -848,17 +848,25 @@ public function nativeComponent(string $component): Closure|false
 	 */
 	public static function plugin(
 		string $name,
-		array|null $extends = null
+		array|null $extends = null,
+		array $info = [],
+		string|null $root = null,
+		string|null $version = null
 	): PLugin|null {
 		if ($extends === null) {
 			return static::$plugins[$name] ?? null;
 		}
 
-		// get the correct root for the plugin
-		$extends['root'] ??= dirname(debug_backtrace()[0]['file']);
+		$plugin = new Plugin(
+			name:    $name,
+			extends: $extends,
+			info:    $info,
+			// TODO: Remove fallback to $extends in v7
+			root:    $root ?? $extends['root'] ?? dirname(debug_backtrace()[0]['file']),
+			version: $version
+		);
 
-		$plugin = new Plugin($name, $extends);
-		$name   = $plugin->name();
+		$name = $plugin->name();
 
 		if (isset(static::$plugins[$name]) === true) {
 			throw new DuplicateException('The plugin "' . $name . '" has already been registered');
@@ -927,7 +935,11 @@ protected function pluginsLoader(): array
 				// register as anonymous plugin (without actual extensions)
 				// to be picked up by the Panel\Document class when
 				// rendering the Panel view
-				static::plugin('plugins/' . $dirname, ['root' => $dir]);
+				static::plugin(
+					name: 'plugins/' . $dirname,
+					extends: [],
+					root: $dir
+				);
 			} else {
 				continue;
 			}
diff --git a/src/Cms/AppTranslations.php b/src/Cms/AppTranslations.php
index 02db6b7169..896c0e7498 100644
--- a/src/Cms/AppTranslations.php
+++ b/src/Cms/AppTranslations.php
@@ -3,7 +3,6 @@
 namespace Kirby\Cms;
 
 use Kirby\Toolkit\I18n;
-use Kirby\Toolkit\Locale;
 use Kirby\Toolkit\Str;
 
 /**
@@ -104,33 +103,6 @@ public function panelLanguage(): string
 		return $this->option('panel.language', $defaultCode);
 	}
 
-	/**
-	 * Load and set the current language if it exists
-	 * Otherwise fall back to the default language
-	 *
-	 * @internal
-	 */
-	public function setCurrentLanguage(
-		string|null $languageCode = null
-	): Language|null {
-		if ($this->multilang() === false) {
-			Locale::set($this->option('locale', 'en_US.utf-8'));
-			return $this->language = null;
-		}
-
-		$this->language   = $this->language($languageCode);
-		$this->language ??= $this->defaultLanguage();
-
-		if ($this->language) {
-			Locale::set($this->language->locale());
-		}
-
-		// add language slug rules to Str class
-		Str::$language = $this->language->rules();
-
-		return $this->language;
-	}
-
 	/**
 	 * Set the current translation
 	 *
diff --git a/src/Cms/Auth/Status.php b/src/Cms/Auth/Status.php
index 10879d72ec..49bdc2e41e 100644
--- a/src/Cms/Auth/Status.php
+++ b/src/Cms/Auth/Status.php
@@ -5,7 +5,7 @@
 use Kirby\Cms\App;
 use Kirby\Cms\User;
 use Kirby\Exception\InvalidArgumentException;
-use Kirby\Toolkit\Properties;
+use Stringable;
 
 /**
  * Information container for the
@@ -18,7 +18,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class Status
+class Status implements Stringable
 {
 	/**
 	 * Type of the active challenge
diff --git a/src/Cms/Block.php b/src/Cms/Block.php
index 6515a48f34..226ac91384 100644
--- a/src/Cms/Block.php
+++ b/src/Cms/Block.php
@@ -6,6 +6,7 @@
 use Kirby\Content\Field;
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Toolkit\Str;
+use Stringable;
 use Throwable;
 
 /**
@@ -22,7 +23,7 @@
  *
  * @extends \Kirby\Cms\Item<\Kirby\Cms\Blocks>
  */
-class Block extends Item
+class Block extends Item implements Stringable
 {
 	use HasMethods;
 
diff --git a/src/Cms/Blueprint.php b/src/Cms/Blueprint.php
index 4c239aa356..13a026eb19 100644
--- a/src/Cms/Blueprint.php
+++ b/src/Cms/Blueprint.php
@@ -210,6 +210,14 @@ protected function acceptedFileTemplatesFromFieldUploads(array $uploads): array
 		return [($uploads['template'] ?? 'default')];
 	}
 
+	/**
+	 * Gathers custom config for Panel view buttons
+	 */
+	public function buttons(): array|null
+	{
+		return $this->props['buttons'] ?? null;
+	}
+
 	/**
 	 * Converts all column definitions, that
 	 * are not wrapped in a tab, into a generic tab
diff --git a/src/Cms/Event.php b/src/Cms/Event.php
index 7bffba912f..333aeffbc4 100644
--- a/src/Cms/Event.php
+++ b/src/Cms/Event.php
@@ -5,6 +5,7 @@
 use Closure;
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Toolkit\Controller;
+use Stringable;
 
 /**
  * The Event object is created whenever the `$kirby->trigger()`
@@ -19,7 +20,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class Event
+class Event implements Stringable
 {
 	/**
 	 * The full event name
diff --git a/src/Cms/File.php b/src/Cms/File.php
index 2d4288b83d..43ef18479a 100644
--- a/src/Cms/File.php
+++ b/src/Cms/File.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use IntlDateFormatter;
+use Kirby\Content\VersionId;
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Filesystem\F;
 use Kirby\Filesystem\IsFile;
@@ -425,7 +426,7 @@ public function modified(
 	 */
 	protected function modifiedContent(string|null $languageCode = null): int
 	{
-		return $this->storage()->modified('published', $languageCode) ?? 0;
+		return $this->storage()->modified(VersionId::published(), $languageCode) ?? 0;
 	}
 
 	/**
diff --git a/src/Cms/FileActions.php b/src/Cms/FileActions.php
index 242cce718c..967afb9c86 100644
--- a/src/Cms/FileActions.php
+++ b/src/Cms/FileActions.php
@@ -47,7 +47,9 @@ public function changeName(
 		string|null $extension = null
 	): static {
 		if ($sanitize === true) {
-			$name = F::safeName($name);
+			// sanitize the basename part only
+			// as the extension isn't included in $name
+			$name = F::safeBasename($name, false);
 		}
 
 		// if no extension is passed, make sure to maintain current one
@@ -139,8 +141,8 @@ public function changeTemplate(string|null $template): static
 
 			// rename and/or resize the file if configured by new blueprint
 			$create = $file->blueprint()->create();
+			$file = $file->manipulate($create);
 			$file = $file->changeExtension($file, $create['format'] ?? null);
-			$file->manipulate($create);
 
 			return $file;
 		});
@@ -266,7 +268,6 @@ public static function create(array $props, bool $move = false): File
 		// we need to already rename it so that the correct file rules
 		// are applied
 		$create = $file->blueprint()->create();
-		$file = $file->changeExtension($file, $create['format'] ?? null);
 
 		// run the hook
 		$arguments = compact('file', 'upload');
@@ -284,6 +285,7 @@ public static function create(array $props, bool $move = false): File
 
 			// resize the file on upload if configured
 			$file = $file->manipulate($create);
+			$file = $file->changeExtension($file, $create['format'] ?? null);
 
 			// store the content if necessary
 			// (always create files in the default language)
@@ -384,8 +386,8 @@ public function replace(string $source, bool $move = false): static
 
 			// apply the resizing/crop options from the blueprint
 			$create = $file->blueprint()->create();
-			$file   = $file->changeExtension($file, $create['format'] ?? null);
 			$file   = $file->manipulate($create);
+			$file   = $file->changeExtension($file, $create['format'] ?? null);
 
 			// return a fresh clone
 			return $file->clone();
diff --git a/src/Cms/Helpers.php b/src/Cms/Helpers.php
index ca905a961f..9e27f426bc 100644
--- a/src/Cms/Helpers.php
+++ b/src/Cms/Helpers.php
@@ -29,6 +29,15 @@ class Helpers
 	 * ```
 	 */
 	public static $deprecations = [
+		// The internal `$model->contentFile*()` methods have been deprecated
+		'model-content-file' => true,
+
+		// Passing an `info` array inside the `extends` array
+		// has been deprecated. Pass the individual entries (e.g. root, version)
+		// directly as named arguments.
+		// TODO: switch to true in v6
+		'plugin-extends-root' => false,
+
 		// Passing a single space as value to `Xml::attr()` has been
 		// deprecated. In a future version, passing a single space won't
 		// render an empty value anymore but a single space.
diff --git a/src/Cms/Language.php b/src/Cms/Language.php
index 834e2dcf19..e91026d7d7 100644
--- a/src/Cms/Language.php
+++ b/src/Cms/Language.php
@@ -9,6 +9,7 @@
 use Kirby\Filesystem\F;
 use Kirby\Toolkit\Locale;
 use Kirby\Toolkit\Str;
+use Stringable;
 use Throwable;
 
 /**
@@ -27,7 +28,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class Language
+class Language implements Stringable
 {
 	/**
 	 * @use \Kirby\Cms\HasSiblings<\Kirby\Cms\Languages>
diff --git a/src/Cms/Media.php b/src/Cms/Media.php
index 3fe61dd4e9..8150201e8d 100644
--- a/src/Cms/Media.php
+++ b/src/Cms/Media.php
@@ -57,7 +57,12 @@ public static function link(
 		}
 
 		// try to generate a thumb for the file
-		return static::thumb($model, $hash, $filename);
+		try {
+			return static::thumb($model, $hash, $filename);
+		} catch (NotFoundException) {
+			// render the error page if there is no job for this filename
+			return false;
+		}
 	}
 
 	/**
diff --git a/src/Cms/ModelWithContent.php b/src/Cms/ModelWithContent.php
index f01ed46c8c..7c817b9afa 100644
--- a/src/Cms/ModelWithContent.php
+++ b/src/Cms/ModelWithContent.php
@@ -7,6 +7,7 @@
 use Kirby\Content\ContentStorage;
 use Kirby\Content\ContentTranslation;
 use Kirby\Content\PlainTextContentStorageHandler;
+use Kirby\Content\VersionId;
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Exception\NotFoundException;
 use Kirby\Form\Form;
@@ -15,6 +16,7 @@
 use Kirby\Uuid\Identifiable;
 use Kirby\Uuid\Uuid;
 use Kirby\Uuid\Uuids;
+use Stringable;
 use Throwable;
 
 /**
@@ -26,7 +28,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-abstract class ModelWithContent implements Identifiable
+abstract class ModelWithContent implements Identifiable, Stringable
 {
 	/**
 	 * Each model must define a CLASS_ALIAS
@@ -186,7 +188,7 @@ protected function convertTo(string $blueprint): static
 		$new = $this->clone(['template' => $blueprint]);
 
 		// temporary compatibility change (TODO: also convert changes)
-		$identifier = $this->storage()->defaultVersion();
+		$identifier = VersionId::default($this);
 
 		// for multilang, we go through all translations and
 		// covnert the content for each of them, remove the content file
@@ -417,7 +419,7 @@ public function readContent(string|null $languageCode = null): array
 	{
 		try {
 			return $this->storage()->read(
-				$this->storage()->defaultVersion(),
+				VersionId::default($this),
 				$languageCode
 			);
 		} catch (NotFoundException) {
@@ -642,7 +644,7 @@ public function toString(
 	 */
 	public function __toString(): string
 	{
-		return $this->id();
+		return (string)$this->id();
 	}
 
 	/**
@@ -736,7 +738,7 @@ public function uuid(): Uuid|null
 	public function writeContent(array $data, string|null $languageCode = null): bool
 	{
 		$data = $this->contentFileData($data, $languageCode);
-		$id   = $this->storage()->defaultVersion();
+		$id   = VersionId::default($this);
 
 		try {
 			// we can only update if the version already exists
diff --git a/src/Cms/Page.php b/src/Cms/Page.php
index 335cce0b0a..06d7f721b0 100644
--- a/src/Cms/Page.php
+++ b/src/Cms/Page.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Kirby\Content\Field;
+use Kirby\Content\VersionId;
 use Kirby\Exception\Exception;
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Exception\NotFoundException;
@@ -826,10 +827,8 @@ public function modified(
 		string|null $handler = null,
 		string|null $languageCode = null
 	): int|string|false|null {
-		$identifier = $this->isDraft() === true ? 'changes' : 'published';
-
 		$modified = $this->storage()->modified(
-			$identifier,
+			VersionId::default($this),
 			$languageCode
 		);
 
diff --git a/src/Cms/PageActions.php b/src/Cms/PageActions.php
index 26e8b6f094..aad8b7c5a1 100644
--- a/src/Cms/PageActions.php
+++ b/src/Cms/PageActions.php
@@ -3,6 +3,7 @@
 namespace Kirby\Cms;
 
 use Closure;
+use Kirby\Content\VersionId;
 use Kirby\Exception\DuplicateException;
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Exception\LogicException;
@@ -471,8 +472,8 @@ public function copy(array $options = []): static
 				$ignore[] = $file->root();
 
 				// append all content files
-				array_push($ignore, ...$file->storage()->contentFiles('published'));
-				array_push($ignore, ...$file->storage()->contentFiles('changes'));
+				array_push($ignore, ...$file->storage()->contentFiles(VersionId::published()));
+				array_push($ignore, ...$file->storage()->contentFiles(VersionId::changes()));
 			}
 		}
 
diff --git a/src/Cms/Plugin.php b/src/Cms/Plugin.php
index 0c886b2805..cc6cc8fc56 100644
--- a/src/Cms/Plugin.php
+++ b/src/Cms/Plugin.php
@@ -26,12 +26,6 @@
 class Plugin
 {
 	protected PluginAssets $assets;
-	protected array $extends;
-	protected string $name;
-	protected string $root;
-
-	// caches
-	protected array|null $info = null;
 	protected UpdateStatus|null $updateStatus = null;
 
 	/**
@@ -40,16 +34,44 @@ class Plugin
 	 *
 	 * @throws \Kirby\Exception\InvalidArgumentException If the plugin name has an invalid format
 	 */
-	public function __construct(string $name, array $extends = [])
-	{
+	public function __construct(
+		protected string $name,
+		protected array $extends = [],
+		protected array $info = [],
+		protected string|null $root = null,
+		protected string|null $version = null,
+	) {
 		static::validateName($name);
 
-		$this->name    = $name;
-		$this->extends = $extends;
-		$this->root    = $extends['root'] ?? dirname(debug_backtrace()[0]['file']);
-		$this->info    = empty($extends['info']) === false && is_array($extends['info']) ? $extends['info'] : null;
+		// TODO: Remove in v7
+		if ($root = $extends['root'] ?? null) {
+			Helpers::deprecated('Plugin "' . $name . '": Passing the `root` inside the `extends` array has been deprecated. Pass it directly as named argument `root`.', 'plugin-extends-root');
+			$this->root ??= $root;
+			unset($this->extends['root']);
+		}
+
+		$this->root ??= dirname(debug_backtrace()[0]['file']);
+
+		// TODO: Remove in v7
+		if ($info = $extends['info'] ?? null) {
+			Helpers::deprecated('Plugin "' . $name . '": Passing an `info` array inside the `extends` array has been deprecated. Pass the individual entries directly as named `info` argument.', 'plugin-extends-root');
+
+			if (empty($info) === false && is_array($info) === true) {
+				$this->info = [...$info, ...$this->info];
+			}
+
+			unset($this->extends['info']);
+		}
 
-		unset($this->extends['root'], $this->extends['info']);
+		// read composer.json and use as info fallback
+		try {
+			$info = Data::read($this->manifest());
+		} catch (Exception) {
+			// there is no manifest file or it is invalid
+			$info = [];
+		}
+
+		$this->info = [...$info, ...$this->info];
 	}
 
 	/**
@@ -117,22 +139,11 @@ public function id(): string
 	}
 
 	/**
-	 * Returns the raw data from composer.json
+	 * Returns the info data (from composer.json)
 	 */
 	public function info(): array
 	{
-		if (is_array($this->info) === true) {
-			return $this->info;
-		}
-
-		try {
-			$info = Data::read($this->manifest());
-		} catch (Exception) {
-			// there is no manifest file or it is invalid
-			$info = [];
-		}
-
-		return $this->info = $info;
+		return $this->info;
 	}
 
 	/**
@@ -295,17 +306,20 @@ public static function validateName(string $name): void
 	 */
 	public function version(): string|null
 	{
-		$composerName = $this->info()['name'] ?? null;
-		$version      = $this->info()['version'] ?? null;
+		$name = $this->info()['name'] ?? null;
 
 		try {
-			// if plugin doesn't have version key in composer.json file
-			// try to get version from "vendor/composer/installed.php"
-			$version ??= InstalledVersions::getPrettyVersion($composerName);
+			// try to get version from "vendor/composer/installed.php",
+			// this is the most reliable source for the version
+			$version = InstalledVersions::getPrettyVersion($name);
 		} catch (Throwable) {
-			return null;
+			$version = null;
 		}
 
+		// fallback to the version provided in the plugin's index.php: as named
+		// argument, entry in the info array or from the composer.json file
+		$version ??= $this->version ?? $this->info()['version'] ?? null;
+
 		if (
 			is_string($version) !== true ||
 			$version === '' ||
diff --git a/src/Cms/PluginAsset.php b/src/Cms/PluginAsset.php
index f5f7f69279..1016888234 100644
--- a/src/Cms/PluginAsset.php
+++ b/src/Cms/PluginAsset.php
@@ -3,6 +3,7 @@
 namespace Kirby\Cms;
 
 use Kirby\Filesystem\F;
+use Stringable;
 
 /**
  * Representing a plugin asset with methods
@@ -15,7 +16,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class PluginAsset
+class PluginAsset implements Stringable
 {
 	public function __construct(
 		protected string $path,
diff --git a/src/Cms/Responder.php b/src/Cms/Responder.php
index 782c22f17c..b86e504af6 100644
--- a/src/Cms/Responder.php
+++ b/src/Cms/Responder.php
@@ -5,6 +5,7 @@
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Filesystem\Mime;
 use Kirby\Toolkit\Str;
+use Stringable;
 
 /**
  * Global response configuration
@@ -15,7 +16,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class Responder
+class Responder implements Stringable
 {
 	/**
 	 * Timestamp when the response expires
diff --git a/src/Cms/Role.php b/src/Cms/Role.php
index 3579b623cc..dc9ff73d50 100644
--- a/src/Cms/Role.php
+++ b/src/Cms/Role.php
@@ -6,6 +6,7 @@
 use Kirby\Data\Data;
 use Kirby\Filesystem\F;
 use Kirby\Toolkit\I18n;
+use Stringable;
 
 /**
  * Represents a User role with attached
@@ -17,7 +18,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class Role
+class Role implements Stringable
 {
 	protected string|null $description;
 	protected string $name;
diff --git a/src/Cms/System.php b/src/Cms/System.php
index 8088cfb049..55ccee0f84 100644
--- a/src/Cms/System.php
+++ b/src/Cms/System.php
@@ -3,6 +3,7 @@
 namespace Kirby\Cms;
 
 use Kirby\Cms\System\UpdateStatus;
+use Kirby\Content\VersionId;
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Exception\PermissionException;
 use Kirby\Filesystem\Dir;
@@ -76,7 +77,7 @@ public function exposedFileUrl(string $folder): string|null
 		switch ($folder) {
 			case 'content':
 				return $url . '/' . basename($this->app->site()->storage()->contentFile(
-					'published',
+					VersionId::published(),
 					'default'
 				));
 			case 'git':
diff --git a/src/Cms/User.php b/src/Cms/User.php
index fa9e66b75e..90836f4943 100644
--- a/src/Cms/User.php
+++ b/src/Cms/User.php
@@ -5,6 +5,7 @@
 use Closure;
 use Exception;
 use Kirby\Content\Field;
+use Kirby\Content\VersionId;
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Exception\NotFoundException;
 use Kirby\Exception\PermissionException;
@@ -204,7 +205,7 @@ public function email(): string|null
 	public function exists(): bool
 	{
 		return $this->storage()->exists(
-			'published',
+			VersionId::published(),
 			'default'
 		);
 	}
@@ -468,7 +469,7 @@ public function modified(
 		string|null $handler = null,
 		string|null $languageCode = null
 	): int|string|false {
-		$modifiedContent = $this->storage()->modified('published', $languageCode);
+		$modifiedContent = $this->storage()->modified(VersionId::published(), $languageCode);
 		$modifiedIndex   = F::modified($this->root() . '/index.php');
 		$modifiedTotal   = max([$modifiedContent, $modifiedIndex]);
 
diff --git a/src/Content/ContentStorage.php b/src/Content/ContentStorage.php
index 23eab40639..b202cde56b 100644
--- a/src/Content/ContentStorage.php
+++ b/src/Content/ContentStorage.php
@@ -53,9 +53,9 @@ public function __call(string $name, array $args): mixed
 	public function all(): Generator
 	{
 		foreach ($this->model->kirby()->languages()->codes() as $lang) {
-			foreach ($this->dynamicVersions() as $version) {
-				if ($this->exists($version, $lang) === true) {
-					yield $version => $lang;
+			foreach ($this->dynamicVersions() as $versionId) {
+				if ($this->exists($versionId, $lang) === true) {
+					yield $versionId => $lang;
 				}
 			}
 		}
@@ -71,12 +71,12 @@ public function all(): Generator
 	 * @throws \Kirby\Exception\LogicException If the model type doesn't have a known content filename
 	 */
 	public function contentFile(
-		string $version,
+		VersionId $versionId,
 		string $lang,
 		bool $force = false
 	): string {
 		$lang = $this->language($lang, $force);
-		return $this->handler->contentFile($version, $lang);
+		return $this->handler->contentFile($versionId, $lang);
 	}
 
 	/**
@@ -88,8 +88,8 @@ public function convertLanguage(string $from, string $to): void
 		$from = $this->language($from, true);
 		$to   = $this->language($to, true);
 
-		foreach ($this->dynamicVersions() as $version) {
-			$this->handler->move($version, $from, $version, $to);
+		foreach ($this->dynamicVersions() as $versionId) {
+			$this->handler->move($versionId, $from, $versionId, $to);
 		}
 	}
 
@@ -100,28 +100,12 @@ public function convertLanguage(string $from, string $to): void
 	 * @param array<string, string> $fields Content fields
 	 */
 	public function create(
-		string $versionType,
+		VersionId $versionId,
 		string|null $lang,
 		array $fields
 	): void {
 		$lang = $this->language($lang);
-		$this->handler->create($versionType, $lang, $fields);
-	}
-
-	/**
-	 * Returns the default version identifier for the model
-	 * @internal
-	 */
-	public function defaultVersion(): string
-	{
-		if (
-			$this->model instanceof Page === true &&
-			$this->model->isDraft() === true
-		) {
-			return 'changes';
-		}
-
-		return 'published';
+		$this->handler->create($versionId, $lang, $fields);
 	}
 
 	/**
@@ -130,12 +114,12 @@ public function defaultVersion(): string
 	 * @param string $lang Code `'default'` in a single-lang installation
 	 */
 	public function delete(
-		string $version,
+		VersionId $versionId,
 		string|null $lang = null,
 		bool $force = false
 	): void {
 		$lang = $this->language($lang, $force);
-		$this->handler->delete($version, $lang);
+		$this->handler->delete($versionId, $lang);
 	}
 
 	/**
@@ -157,13 +141,13 @@ public function deleteLanguage(string|null $lang): void
 	 */
 	public function dynamicVersions(): array
 	{
-		$versions = ['changes'];
+		$versions = [VersionId::changes()];
 
 		if (
 			$this->model instanceof Page === false ||
 			$this->model->isDraft() === false
 		) {
-			$versions[] = 'published';
+			$versions[] = VersionId::published();
 		}
 
 		return $versions;
@@ -172,18 +156,13 @@ public function dynamicVersions(): array
 	/**
 	 * Checks if a version exists
 	 *
-	 * @param string|null $lang Code `'default'` in a single-lang installation;
-	 *                          checks for "any language" if not provided
+	 * @param string $lang Code `'default'` in a single-lang installation
 	 */
 	public function exists(
-		string $version,
-		string|null $lang
+		VersionId $versionId,
+		string $lang
 	): bool {
-		if ($lang !== null) {
-			$lang = $this->language($lang);
-		}
-
-		return $this->handler->exists($version, $lang);
+		return $this->handler->exists($versionId, $this->language($lang));
 	}
 
 	/**
@@ -193,11 +172,11 @@ public function exists(
 	 * @param string $lang Code `'default'` in a single-lang installation
 	 */
 	public function modified(
-		string $version,
+		VersionId $versionId,
 		string|null $lang = null
 	): int|null {
 		$lang = $this->language($lang);
-		return $this->handler->modified($version, $lang);
+		return $this->handler->modified($versionId, $lang);
 	}
 
 	/**
@@ -209,12 +188,12 @@ public function modified(
 	 * @throws \Kirby\Exception\NotFoundException If the version does not exist
 	 */
 	public function read(
-		string $version,
+		VersionId $versionId,
 		string|null $lang = null
 	): array {
 		$lang = $this->language($lang);
-		$this->ensureExistingVersion($version, $lang);
-		return $this->handler->read($version, $lang);
+		$this->ensureExistingVersion($versionId, $lang);
+		return $this->handler->read($versionId, $lang);
 	}
 
 	/**
@@ -225,12 +204,12 @@ public function read(
 	 * @throws \Kirby\Exception\NotFoundException If the version does not exist
 	 */
 	public function touch(
-		string $version,
+		VersionId $versionId,
 		string|null $lang = null
 	): void {
 		$lang = $this->language($lang);
-		$this->ensureExistingVersion($version, $lang);
-		$this->handler->touch($version, $lang);
+		$this->ensureExistingVersion($versionId, $lang);
+		$this->handler->touch($versionId, $lang);
 	}
 
 	/**
@@ -257,24 +236,24 @@ public function touchLanguage(string|null $lang): void
 	 * @throws \Kirby\Exception\NotFoundException If the version does not exist
 	 */
 	public function update(
-		string $version,
+		VersionId $versionId,
 		string|null $lang = null,
 		array $fields = []
 	): void {
 		$lang = $this->language($lang);
-		$this->ensureExistingVersion($version, $lang);
-		$this->handler->update($version, $lang, $fields);
+		$this->ensureExistingVersion($versionId, $lang);
+		$this->handler->update($versionId, $lang, $fields);
 	}
 
 	/**
 	 * @throws \Kirby\Exception\NotFoundException If the version does not exist
 	 */
 	protected function ensureExistingVersion(
-		string $version,
+		VersionId $versionId,
 		string $lang
 	): void {
-		if ($this->exists($version, $lang) !== true) {
-			throw new NotFoundException('Version "' . $version . ' (' . $lang . ')" does not already exist');
+		if ($this->exists($versionId, $lang) !== true) {
+			throw new NotFoundException('Version "' . $versionId . ' (' . $lang . ')" does not already exist');
 		}
 	}
 
diff --git a/src/Content/ContentStorageHandler.php b/src/Content/ContentStorageHandler.php
index 6f39d11e4f..43498add43 100644
--- a/src/Content/ContentStorageHandler.php
+++ b/src/Content/ContentStorageHandler.php
@@ -28,29 +28,28 @@ public function __construct(ModelWithContent $model);
 	 * @param string $lang Code `'default'` in a single-lang installation
 	 * @param array<string, string> $fields Content fields
 	 */
-	public function create(string $versionType, string $lang, array $fields): void;
+	public function create(VersionId $versionId, string $lang, array $fields): void;
 
 	/**
 	 * Deletes an existing version in an idempotent way if it was already deleted
 	 *
 	 * @param string $lang Code `'default'` in a single-lang installation
 	 */
-	public function delete(string $version, string $lang): void;
+	public function delete(VersionId $versionId, string $lang): void;
 
 	/**
 	 * Checks if a version exists
 	 *
-	 * @param string|null $lang Code `'default'` in a single-lang installation;
-	 *                          checks for "any language" if not provided
+	 * @param string $lang Code `'default'` in a single-lang installation
 	 */
-	public function exists(string $version, string|null $lang): bool;
+	public function exists(VersionId $versionId, string $lang): bool;
 
 	/**
 	 * Returns the modification timestamp of a version if it exists
 	 *
 	 * @param string $lang Code `'default'` in a single-lang installation
 	 */
-	public function modified(string $version, string $lang): int|null;
+	public function modified(VersionId $versionId, string $lang): int|null;
 
 	/**
 	 * Moves content from one version-language combination to another
@@ -59,9 +58,9 @@ public function modified(string $version, string $lang): int|null;
 	 * @param string $toLang Code `'default'` in a single-lang installation
 	 */
 	public function move(
-		string $fromVersion,
+		VersionId $fromVersionId,
 		string $fromLang,
-		string $toVersion,
+		VersionId $toVersionId,
 		string $toLang
 	): void;
 
@@ -73,7 +72,7 @@ public function move(
 	 *
 	 * @throws \Kirby\Exception\NotFoundException If the version does not exist
 	 */
-	public function read(string $version, string $lang): array;
+	public function read(VersionId $versionId, string $lang): array;
 
 	/**
 	 * Updates the modification timestamp of an existing version
@@ -82,7 +81,7 @@ public function read(string $version, string $lang): array;
 	 *
 	 * @throws \Kirby\Exception\NotFoundException If the version does not exist
 	 */
-	public function touch(string $version, string $lang): void;
+	public function touch(VersionId $versionId, string $lang): void;
 
 	/**
 	 * Updates the content fields of an existing version
@@ -92,5 +91,5 @@ public function touch(string $version, string $lang): void;
 	 *
 	 * @throws \Kirby\Exception\NotFoundException If the version does not exist
 	 */
-	public function update(string $version, string $lang, array $fields): void;
+	public function update(VersionId $versionId, string $lang, array $fields): void;
 }
diff --git a/src/Content/ContentTranslation.php b/src/Content/ContentTranslation.php
index e95fd85dfe..49475e17f9 100644
--- a/src/Content/ContentTranslation.php
+++ b/src/Content/ContentTranslation.php
@@ -85,13 +85,8 @@ public function content(): array
 	 */
 	public function contentFile(): string
 	{
-		// temporary compatibility change (TODO: take this from the parent `ModelVersion` object)
-		$identifier = $this->parent::CLASS_ALIAS === 'page' && $this->parent->isDraft() === true ?
-			'changes' :
-			'published';
-
 		return $this->contentFile = $this->parent->storage()->contentFile(
-			$identifier,
+			VersionId::default($this->parent),
 			$this->code,
 			true
 		);
diff --git a/src/Content/Field.php b/src/Content/Field.php
index 38f6a9180b..fe46c61b99 100644
--- a/src/Content/Field.php
+++ b/src/Content/Field.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Kirby\Cms\ModelWithContent;
+use Stringable;
 
 /**
  * Every field in a Kirby content text file
@@ -25,7 +26,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class Field
+class Field implements Stringable
 {
 	/**
 	 * Field method aliases
diff --git a/src/Content/PlainTextContentStorageHandler.php b/src/Content/PlainTextContentStorageHandler.php
index 756816aa10..432cc9c030 100644
--- a/src/Content/PlainTextContentStorageHandler.php
+++ b/src/Content/PlainTextContentStorageHandler.php
@@ -2,10 +2,13 @@
 
 namespace Kirby\Content;
 
+use Kirby\Cms\File;
 use Kirby\Cms\ModelWithContent;
+use Kirby\Cms\Page;
+use Kirby\Cms\Site;
+use Kirby\Cms\User;
 use Kirby\Data\Data;
 use Kirby\Exception\Exception;
-use Kirby\Exception\InvalidArgumentException;
 use Kirby\Exception\LogicException;
 use Kirby\Filesystem\Dir;
 use Kirby\Filesystem\F;
@@ -29,20 +32,142 @@ public function __construct(protected ModelWithContent $model)
 	}
 
 	/**
-	 * Creates a new version
+	 * Creates the absolute directory path for the model
+	 */
+	protected function contentDirectory(VersionId $versionId): string
+	{
+		$directory = match (true) {
+			$this->model instanceof File
+				=> dirname($this->model->root()),
+			default
+			=> $this->model->root()
+		};
+
+		if ($versionId->is(VersionId::CHANGES)) {
+			$directory .= '/_changes';
+		}
+
+		return $directory;
+	}
+
+	/**
+	 * Returns the absolute path to the content file
+	 * @internal To be made `protected` when the CMS core no longer relies on it
 	 *
 	 * @param string $lang Code `'default'` in a single-lang installation
-	 * @param array<string, string> $fields Content fields
 	 */
-	public function create(string $versionType, string $lang, array $fields): void
+	public function contentFile(VersionId $versionId, string $lang): string
 	{
-		$success = Data::write($this->contentFile($versionType, $lang), $fields);
+		// get the filename without extension and language code
+		return match (true) {
+			$this->model instanceof File => $this->contentFileForFile($this->model, $versionId, $lang),
+			$this->model instanceof Page => $this->contentFileForPage($this->model, $versionId, $lang),
+			$this->model instanceof Site => $this->contentFileForSite($this->model, $versionId, $lang),
+			$this->model instanceof User => $this->contentFileForUser($this->model, $versionId, $lang),
+			// @codeCoverageIgnoreStart
+			default => throw new LogicException('Cannot determine content file for model type "' . $this->model::CLASS_ALIAS . '"')
+			// @codeCoverageIgnoreEnd
+		};
+	}
 
-		// @codeCoverageIgnoreStart
-		if ($success !== true) {
-			throw new Exception('Could not write new content file');
+	/**
+	 * Returns the absolute path to the content file of a file model
+	 *
+	 * @param string $lang Code `'default'` in a single-lang installation
+	 */
+	protected function contentFileForFile(File $model, VersionId $versionId, string $lang): string
+	{
+		return $this->contentDirectory($versionId) . '/' . $this->contentFilename($model->filename(), $lang);
+	}
+
+	/**
+	 * Returns the absolute path to the content file of a page model
+	 *
+	 * @param string $lang Code `'default'` in a single-lang installation
+	 */
+	protected function contentFileForPage(Page $model, VersionId $versionId, string $lang): string
+	{
+		$directory = $this->contentDirectory($versionId);
+
+		if ($model->isDraft() === true) {
+			if ($versionId->is(Versionid::PUBLISHED) === true) {
+				throw new LogicException('Drafts cannot have a published content file');
+			}
+
+			// drafts already have the `_drafts` prefix in their root.
+			// `_changes` must not be added to it in addition to that.
+			$directory = $this->model->root();
 		}
-		// @codeCoverageIgnoreEnd
+
+		return $directory . '/' . $this->contentFilename($model->intendedTemplate()->name(), $lang);
+	}
+
+	/**
+	 * Returns the absolute path to the content file of a site model
+	 *
+	 * @param string $lang Code `'default'` in a single-lang installation
+	 */
+	protected function contentFileForSite(Site $model, VersionId $versionId, string $lang): string
+	{
+		return $this->contentDirectory($versionId) . '/' . $this->contentFilename('site', $lang);
+	}
+
+	/**
+	 * Returns the absolute path to the content file of a user model
+	 *
+	 * @param string $lang Code `'default'` in a single-lang installation
+	 */
+	protected function contentFileForUser(User $model, VersionId $versionId, string $lang): string
+	{
+		return $this->contentDirectory($versionId) . '/' . $this->contentFilename('user', $lang);
+	}
+
+	/**
+	 * Creates a filename with extension and optional language code
+	 * in a multi-language installation
+	 *
+	 * @param string $lang Code `'default'` in a single-lang installation
+	 */
+	protected function contentFilename(string $name, string $lang): string
+	{
+		$kirby     = $this->model->kirby();
+		$extension = $kirby->contentExtension();
+
+		if ($lang !== 'default') {
+			return $name . '.' . $lang . '.' . $extension;
+		}
+
+		return $name . '.' . $extension;
+	}
+
+	/**
+	 * Returns an array with content files of all languages
+	 * @internal To be made `protected` when the CMS core no longer relies on it
+	 */
+	public function contentFiles(VersionId $versionId): array
+	{
+		if ($this->model->kirby()->multilang() === true) {
+			return $this->model->kirby()->languages()->values(
+				fn ($lang) => $this->contentFile($versionId, $lang)
+			);
+		}
+
+		return [
+			$this->contentFile($versionId, 'default')
+		];
+	}
+
+	/**
+	 * Creates a new version
+	 *
+	 * @param string $lang Code `'default'` in a single-lang installation
+	 * @param array<string, string> $fields Content fields
+	 *
+	 * @throws \Kirby\Exception\Exception If the file cannot be written
+	 */
+	public function create(VersionId $versionId, string $lang, array $fields): void
+	{
+		$this->write($versionId, $lang, $fields);
 	}
 
 	/**
@@ -50,9 +175,9 @@ public function create(string $versionType, string $lang, array $fields): void
 	 *
 	 * @param string $lang Code `'default'` in a single-lang installation
 	 */
-	public function delete(string $version, string $lang): void
+	public function delete(VersionId $versionId, string $lang): void
 	{
-		$contentFile = $this->contentFile($version, $lang);
+		$contentFile = $this->contentFile($versionId, $lang);
 		$success = F::unlink($contentFile);
 
 		// @codeCoverageIgnoreStart
@@ -80,22 +205,11 @@ public function delete(string $version, string $lang): void
 	/**
 	 * Checks if a version exists
 	 *
-	 * @param string|null $lang Code `'default'` in a single-lang installation;
-	 *                          checks for "any language" if not provided
+	 * @param string $lang Code `'default'` in a single-lang installation
 	 */
-	public function exists(string $version, string|null $lang): bool
+	public function exists(VersionId $versionId, string $lang): bool
 	{
-		if ($lang === null) {
-			foreach ($this->contentFiles($version) as $file) {
-				if (is_file($file) === true) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		return is_file($this->contentFile($version, $lang)) === true;
+		return is_file($this->contentFile($versionId, $lang)) === true;
 	}
 
 	/**
@@ -104,9 +218,9 @@ public function exists(string $version, string|null $lang): bool
 	 *
 	 * @param string $lang Code `'default'` in a single-lang installation
 	 */
-	public function modified(string $version, string $lang): int|null
+	public function modified(VersionId $versionId, string $lang): int|null
 	{
-		$modified = F::modified($this->contentFile($version, $lang));
+		$modified = F::modified($this->contentFile($versionId, $lang));
 
 		if (is_int($modified) === true) {
 			return $modified;
@@ -115,17 +229,33 @@ public function modified(string $version, string $lang): int|null
 		return null;
 	}
 
+	/**
+	 * Moves content from one version-language combination to another
+	 *
+	 * @param string $fromLang Code `'default'` in a single-lang installation
+	 * @param string $toLang Code `'default'` in a single-lang installation
+	 */
+	public function move(
+		VersionId $fromVersionId,
+		string $fromLang,
+		VersionId $toVersionId,
+		string $toLang
+	): void {
+		F::move(
+			$this->contentFile($fromVersionId, $fromLang),
+			$this->contentFile($toVersionId, $toLang)
+		);
+	}
+
 	/**
 	 * Returns the stored content fields
 	 *
 	 * @param string $lang Code `'default'` in a single-lang installation
 	 * @return array<string, string>
-	 *
-	 * @throws \Kirby\Exception\NotFoundException If the version does not exist
 	 */
-	public function read(string $version, string $lang): array
+	public function read(VersionId $versionId, string $lang): array
 	{
-		return Data::read($this->contentFile($version, $lang));
+		return Data::read($this->contentFile($versionId, $lang));
 	}
 
 	/**
@@ -133,11 +263,11 @@ public function read(string $version, string $lang): array
 	 *
 	 * @param string $lang Code `'default'` in a single-lang installation
 	 *
-	 * @throws \Kirby\Exception\NotFoundException If the version does not exist
+	 * @throws \Kirby\Exception\Exception If the file cannot be touched
 	 */
-	public function touch(string $version, string $lang): void
+	public function touch(VersionId $versionId, string $lang): void
 	{
-		$success = touch($this->contentFile($version, $lang));
+		$success = touch($this->contentFile($versionId, $lang));
 
 		// @codeCoverageIgnoreStart
 		if ($success !== true) {
@@ -152,102 +282,30 @@ public function touch(string $version, string $lang): void
 	 * @param string $lang Code `'default'` in a single-lang installation
 	 * @param array<string, string> $fields Content fields
 	 *
-	 * @throws \Kirby\Exception\NotFoundException If the version does not exist
+	 * @throws \Kirby\Exception\Exception If the file cannot be written
 	 */
-	public function update(string $version, string $lang, array $fields): void
+	public function update(VersionId $versionId, string $lang, array $fields): void
 	{
-		$success = Data::write($this->contentFile($version, $lang), $fields);
-
-		// @codeCoverageIgnoreStart
-		if ($success !== true) {
-			throw new Exception('Could not write existing content file');
-		}
-		// @codeCoverageIgnoreEnd
+		$this->write($versionId, $lang, $fields);
 	}
 
 	/**
-	 * Returns the absolute path to the content file
-	 * @internal To be made `protected` when the CMS core no longer relies on it
+	 * Writes the content fields of an existing version
 	 *
 	 * @param string $lang Code `'default'` in a single-lang installation
+	 * @param array<string, string> $fields Content fields
 	 *
-	 * @throws \Kirby\Exception\LogicException If the model type doesn't have a known content filename
+	 * @throws \Kirby\Exception\Exception If the content cannot be written
 	 */
-	public function contentFile(string $version, string $lang): string
+	protected function write(VersionId $versionId, string $lang, array $fields): void
 	{
-		if (in_array($version, ['published', 'changes']) !== true) {
-			throw new InvalidArgumentException('Invalid version identifier "' . $version . '"');
-		}
-
-		$extension = $this->model->kirby()->contentExtension();
-		$directory = $this->model->root();
-
-		$directory = match ($this->model::CLASS_ALIAS) {
-			'file'  => dirname($this->model->root()),
-			default => $this->model->root()
-		};
-
-		$filename = match ($this->model::CLASS_ALIAS) {
-			'file'  => $this->model->filename(),
-			'page'  => $this->model->intendedTemplate()->name(),
-			'site',
-			'user'  => $this->model::CLASS_ALIAS,
-			// @codeCoverageIgnoreStart
-			default => throw new LogicException('Cannot determine content filename for model type "' . $this->model::CLASS_ALIAS . '"')
-			// @codeCoverageIgnoreEnd
-		};
-
-		if ($this->model::CLASS_ALIAS === 'page' && $this->model->isDraft() === true) {
-			// changes versions don't need anything extra
-			// (drafts already have the `_drafts` prefix in their root),
-			// but a published version is not possible
-			if ($version === 'published') {
-				throw new LogicException('Drafts cannot have a published content file');
-			}
-		} elseif ($version === 'changes') {
-			// other model type or published page that has a changes subfolder
-			$directory .= '/_changes';
-		}
-
-		if ($lang !== 'default') {
-			return $directory . '/' . $filename . '.' . $lang . '.' . $extension;
-		}
-
-		return $directory . '/' . $filename . '.' . $extension;
-	}
+		$success = Data::write($this->contentFile($versionId, $lang), $fields);
 
-	/**
-	 * Returns an array with content files of all languages
-	 * @internal To be made `protected` when the CMS core no longer relies on it
-	 */
-	public function contentFiles(string $version): array
-	{
-		if ($this->model->kirby()->multilang() === true) {
-			return $this->model->kirby()->languages()->values(
-				fn ($lang) => $this->contentFile($version, $lang)
-			);
+		// @codeCoverageIgnoreStart
+		if ($success !== true) {
+			throw new Exception('Could not write the content file');
 		}
-
-		return [
-			$this->contentFile($version, 'default')
-		];
+		// @codeCoverageIgnoreEnd
 	}
 
-	/**
-	 * Moves content from one version-language combination to another
-	 *
-	 * @param string $fromLang Code `'default'` in a single-lang installation
-	 * @param string $toLang Code `'default'` in a single-lang installation
-	 */
-	public function move(
-		string $fromVersion,
-		string $fromLang,
-		string $toVersion,
-		string $toLang
-	): void {
-		F::move(
-			$this->contentFile($fromVersion, $fromLang),
-			$this->contentFile($toVersion, $toLang)
-		);
-	}
 }
diff --git a/src/Content/VersionId.php b/src/Content/VersionId.php
new file mode 100644
index 0000000000..3c35a27fe9
--- /dev/null
+++ b/src/Content/VersionId.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Kirby\Content;
+
+use Kirby\Cms\ModelWithContent;
+use Kirby\Cms\Page;
+use Kirby\Exception\InvalidArgumentException;
+use Stringable;
+
+/**
+ * The Version ID identifies a version of content.
+ * This can be the currently published version or changes
+ * to the content. In the future, we also plan to use this
+ * for older revisions of the content.
+ *
+ * @internal
+ * @since 5.0.0
+ *
+ * @package   Kirby Content
+ * @author    Bastian Allgeier <bastian@getkirby.com>
+ * @link      https://getkirby.com
+ * @copyright Bastian Allgeier
+ * @license   https://getkirby.com/license
+ */
+class VersionId implements Stringable
+{
+	/**
+	 * Latest stable version of the content
+	 */
+	public const PUBLISHED = 'published';
+
+	/**
+	 * Latest changes to the content (optional)
+	 */
+	public const CHANGES   = 'changes';
+
+	/**
+	 * @throws \Kirby\Exception\InvalidArgumentException If the version ID is not valid
+	 */
+	public function __construct(
+		public string $value
+	) {
+		if (in_array($value, [static::CHANGES, static::PUBLISHED]) === false) {
+			throw new InvalidArgumentException('Invalid Version ID');
+		}
+	}
+
+	/**
+	 * Converts the VersionId instance to a simple string value
+	 */
+	public function __toString(): string
+	{
+		return $this->value;
+	}
+
+	/**
+	 * Creates a VersionId instance for the latest content changes
+	 */
+	public static function changes(): static
+	{
+		return new static(static::CHANGES);
+	}
+
+	/**
+	 * Returns the default version id for the model
+	 */
+	public static function default(ModelWithContent $model): static
+	{
+		if (
+			$model instanceof Page === true &&
+			$model->isDraft() === true
+		) {
+			return VersionId::changes();
+		}
+
+		return VersionId::published();
+	}
+
+	/**
+	 * Creates a VersionId instance from a simple string value
+	 */
+	public static function from(string $value): static
+	{
+		return new static($value);
+	}
+
+	/**
+	 * Compares a string value with the id value
+	 */
+	public function is(string $value): bool
+	{
+		return $value === $this->value;
+	}
+
+	/**
+	 * Creates a VersionId instance for the latest stable version of the content
+	 */
+	public static function published(): static
+	{
+		return new static(static::PUBLISHED);
+	}
+
+	/**
+	 * Returns the ID value
+	 */
+	public function value(): string
+	{
+		return $this->value;
+	}
+}
diff --git a/src/Filesystem/F.php b/src/Filesystem/F.php
index 0f4a98359c..2f7e6e6def 100644
--- a/src/Filesystem/F.php
+++ b/src/Filesystem/F.php
@@ -756,20 +756,32 @@ public static function safeName(string $string): string
 	 * Sanitize a file's name (without extension)
 	 * @since 4.0.0
 	 */
-	public static function safeBasename(string $string): string
-	{
-		$name = static::name($string);
-		return Str::slug($name, '-', 'a-z0-9@._-');
+	public static function safeBasename(
+		string $string,
+		bool $extract = true
+	): string {
+		// extract only the name part from whole filename string
+		if ($extract === true) {
+			$string = static::name($string);
+		}
+
+		return Str::slug($string, '-', 'a-z0-9@._-');
 	}
 
 	/**
 	 * Sanitize a file's extension
 	 * @since 4.0.0
 	 */
-	public static function safeExtension(string $string): string
-	{
-		$extension = static::extension($string);
-		return Str::slug($extension);
+	public static function safeExtension(
+		string $string,
+		bool $extract = true
+	): string {
+		// extract only the extension part from whole filename string
+		if ($extract === true) {
+			$string = static::extension($string);
+		}
+
+		return Str::slug($string);
 	}
 
 	/**
diff --git a/src/Filesystem/File.php b/src/Filesystem/File.php
index fc9beec610..769a7b4d77 100644
--- a/src/Filesystem/File.php
+++ b/src/Filesystem/File.php
@@ -11,6 +11,7 @@
 use Kirby\Toolkit\Escape;
 use Kirby\Toolkit\Html;
 use Kirby\Toolkit\V;
+use Stringable;
 
 /**
  * Flexible File object with a set of helpful
@@ -24,7 +25,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class File
+class File implements Stringable
 {
 	/**
 	 * Parent file model
diff --git a/src/Filesystem/Filename.php b/src/Filesystem/Filename.php
index a73891ebed..dab05dcbef 100644
--- a/src/Filesystem/Filename.php
+++ b/src/Filesystem/Filename.php
@@ -3,6 +3,7 @@
 namespace Kirby\Filesystem;
 
 use Kirby\Toolkit\Str;
+use Stringable;
 
 /**
  * The `Filename` class handles complex
@@ -26,7 +27,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class Filename
+class Filename implements Stringable
 {
 	/**
 	 * List of all applicable attributes
diff --git a/src/Http/Params.php b/src/Http/Params.php
index 4067a0ff11..67349650bd 100644
--- a/src/Http/Params.php
+++ b/src/Http/Params.php
@@ -4,6 +4,7 @@
 
 use Kirby\Toolkit\Obj;
 use Kirby\Toolkit\Str;
+use Stringable;
 
 /**
  * A wrapper around a URL params
@@ -16,7 +17,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class Params extends Obj
+class Params extends Obj implements Stringable
 {
 	public static string|null $separator = null;
 
diff --git a/src/Http/Query.php b/src/Http/Query.php
index 410e2f0798..9d85657e1b 100644
--- a/src/Http/Query.php
+++ b/src/Http/Query.php
@@ -3,6 +3,7 @@
 namespace Kirby\Http;
 
 use Kirby\Toolkit\Obj;
+use Stringable;
 
 /**
  * A wrapper around a URL query string
@@ -15,7 +16,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class Query extends Obj
+class Query extends Obj implements Stringable
 {
 	public function __construct(string|array|null $query)
 	{
diff --git a/src/Http/Request/Auth.php b/src/Http/Request/Auth.php
index e73f4da8b4..5b8175d3a3 100644
--- a/src/Http/Request/Auth.php
+++ b/src/Http/Request/Auth.php
@@ -3,6 +3,7 @@
 namespace Kirby\Http\Request;
 
 use SensitiveParameter;
+use Stringable;
 
 /**
  * Base class for auth types
@@ -13,7 +14,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-abstract class Auth
+abstract class Auth implements Stringable
 {
 	/**
 	 * @param string $data Raw authentication data after the first space in the `Authorization` header
diff --git a/src/Http/Request/Body.php b/src/Http/Request/Body.php
index 53bcdd0207..efae5c7487 100644
--- a/src/Http/Request/Body.php
+++ b/src/Http/Request/Body.php
@@ -2,6 +2,8 @@
 
 namespace Kirby\Http\Request;
 
+use Stringable;
+
 /**
  * The Body class parses the
  * request body and provides a nice
@@ -14,7 +16,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class Body
+class Body implements Stringable
 {
 	use Data;
 
diff --git a/src/Http/Request/Query.php b/src/Http/Request/Query.php
index 51b004aab4..ac54457dd1 100644
--- a/src/Http/Request/Query.php
+++ b/src/Http/Request/Query.php
@@ -2,6 +2,8 @@
 
 namespace Kirby\Http\Request;
 
+use Stringable;
+
 /**
  * The Query class helps to
  * parse and inspect URL queries
@@ -13,7 +15,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class Query
+class Query implements Stringable
 {
 	use Data;
 
diff --git a/src/Http/Response.php b/src/Http/Response.php
index 880f3b8237..3271a72289 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -6,6 +6,7 @@
 use Exception;
 use Kirby\Exception\LogicException;
 use Kirby\Filesystem\F;
+use Stringable;
 
 /**
  * Representation of an Http response,
@@ -18,7 +19,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class Response
+class Response implements Stringable
 {
 	/**
 	 * Store for all registered headers,
diff --git a/src/Http/Uri.php b/src/Http/Uri.php
index 1fda817f26..a4b7d2a72e 100644
--- a/src/Http/Uri.php
+++ b/src/Http/Uri.php
@@ -5,6 +5,7 @@
 use Kirby\Cms\App;
 use Kirby\Exception\InvalidArgumentException;
 use SensitiveParameter;
+use Stringable;
 use Throwable;
 
 /**
@@ -16,7 +17,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class Uri
+class Uri implements Stringable
 {
 	/**
 	 * Cache for the current Uri object
diff --git a/src/Image/Camera.php b/src/Image/Camera.php
index c149c2ebff..dd5e044011 100644
--- a/src/Image/Camera.php
+++ b/src/Image/Camera.php
@@ -2,6 +2,8 @@
 
 namespace Kirby\Image;
 
+use Stringable;
+
 /**
  * Small class which hold info about the camera
  *
@@ -11,7 +13,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class Camera
+class Camera implements Stringable
 {
 	protected string|null $make;
 	protected string|null $model;
diff --git a/src/Image/Dimensions.php b/src/Image/Dimensions.php
index cf6d334485..ee03030cfa 100644
--- a/src/Image/Dimensions.php
+++ b/src/Image/Dimensions.php
@@ -3,6 +3,7 @@
 namespace Kirby\Image;
 
 use Kirby\Toolkit\Str;
+use Stringable;
 
 /**
  * The Dimension class is used to provide additional
@@ -16,7 +17,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class Dimensions
+class Dimensions implements Stringable
 {
 	public function __construct(
 		public int $width,
diff --git a/src/Image/Location.php b/src/Image/Location.php
index 0eddb683b5..3e8c7d53d4 100644
--- a/src/Image/Location.php
+++ b/src/Image/Location.php
@@ -2,6 +2,8 @@
 
 namespace Kirby\Image;
 
+use Stringable;
+
 /**
  * Returns the latitude and longitude values
  * for exif location data if available
@@ -12,7 +14,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class Location
+class Location implements Stringable
 {
 	protected float|null $lat = null;
 	protected float|null $lng = null;
diff --git a/src/Image/QrCode.php b/src/Image/QrCode.php
index 48c5efb923..15bfe9ae1c 100644
--- a/src/Image/QrCode.php
+++ b/src/Image/QrCode.php
@@ -7,6 +7,7 @@
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Exception\LogicException;
 use Kirby\Filesystem\F;
+use Stringable;
 
 /**
  * Creates a QR code
@@ -47,7 +48,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-class QrCode
+class QrCode implements Stringable
 {
 	public function __construct(public string $data)
 	{
@@ -59,13 +60,15 @@ public function __construct(public string $data)
 	 * @param int|null $size Image width/height in pixels, defaults to a size per module of 4x4
 	 * @param string $color Foreground color in hex format
 	 * @param string $back Background color in hex format
+	 * @param int $border Border size in number of modules
 	 */
 	public function toDataUri(
 		int|null $size = null,
 		string $color = '#000000',
-		string $back = '#ffffff'
+		string $back = '#ffffff',
+		int $border = 4
 	): string {
-		$image = $this->toImage($size, $color, $back);
+		$image = $this->toImage($size, $color, $back, $border);
 
 		ob_start();
 		imagepng($image);
@@ -82,14 +85,16 @@ public function toDataUri(
 	 * @param int|null $size Image width/height in pixels, defaults to a size per module of 4x4
 	 * @param string $color Foreground color in hex format
 	 * @param string $back Background color in hex format
+	 * @param int $border Border size in number of modules
 	 */
 	public function toImage(
 		int|null $size = null,
 		string $color = '#000000',
-		string $back = '#ffffff'
+		string $back = '#ffffff',
+		int $border = 4
 	): GdImage {
 		// get code and size measurements
-		$code   = $this->encode();
+		$code   = $this->encode($border);
 		[$width, $height] = $this->measure($code);
 		$size ??= ceil($width * 4);
 		$ws     = $size / $width;
@@ -132,13 +137,15 @@ public function toImage(
 	 * @param int|string|null $size Optional CSS width of the `<svg>` element
 	 * @param string $color Foreground color in hex format
 	 * @param string $back Background color in hex format
+	 * @param int $border Border size in number of modules
 	 */
 	public function toSvg(
 		int|string|null $size = null,
 		string $color = '#000000',
-		string $back = '#ffffff'
+		string $back = '#ffffff',
+		int $border = 4
 	): string {
-		$code = $this->encode();
+		$code = $this->encode($border);
 		[$vbw, $vbh] = $this->measure($code);
 
 		$modules = $this->eachModuleGroup(
@@ -167,15 +174,17 @@ public function __toString(): string
 	 * @param int|string|null $size Optional image width/height in pixels (defaults to a size per module of 4x4) or CSS width of the `<svg>` element
 	 * @param string $color Foreground color in hex format
 	 * @param string $back Background color in hex format
+	 * @param int $border Border size in number of modules
 	 */
 	public function write(
 		string $file,
 		int|string|null $size = null,
 		string $color = '#000000',
-		string $back = '#ffffff'
+		string $back = '#ffffff',
+		int $border = 4
 	): void {
 		$format = F::extension($file);
-		$args    = [$size, $color, $back];
+		$args    = [$size, $color, $back, $border];
 
 		match ($format) {
 			'gif'   => imagegif($this->toImage(...$args), $file),
@@ -395,7 +404,7 @@ protected function eachModuleGroup(array $code, Closure $action): array
 		return $result;
 	}
 
-	protected function encode(): array
+	protected function encode(int $q = 4): array
 	{
 		[$data, $version, $ecl, $ec] = $this->encodeData();
 		$data = $this->encodeErrorCorrection($data, $ec, $version);
@@ -404,7 +413,7 @@ protected function encode(): array
 		$mtx = $this->finalizeMatrix($mtx, $size, $ecl, $mask, $version);
 
 		return [
-			'q'    => [4, 4, 4, 4],
+			'q'    => [$q, $q, $q, $q],
 			'size' => [$size, $size],
 			'bits' => $mtx
 		];
diff --git a/src/Panel/File.php b/src/Panel/File.php
index 08e2af9869..f9928fa1e8 100644
--- a/src/Panel/File.php
+++ b/src/Panel/File.php
@@ -64,6 +64,21 @@ public function breadcrumb(): array
 		return $breadcrumb;
 	}
 
+	/**
+	 * Returns header button names which should be displayed
+	 * on the file view
+	 */
+	public function buttons(): array
+	{
+		return
+			$this->model->blueprint()->buttons() ??
+			$this->model->kirby()->option('panel.viewButtons.file', [
+				'preview',
+				'settings',
+				'languages'
+			]);
+	}
+
 	/**
 	 * Provides a kirbytag or markdown
 	 * tag for the file, which will be
diff --git a/src/Panel/Model.php b/src/Panel/Model.php
index 41e074f316..a66c3db3b8 100644
--- a/src/Panel/Model.php
+++ b/src/Panel/Model.php
@@ -27,6 +27,11 @@ public function __construct(
 	) {
 	}
 
+	/**
+	 * Returns header button names which should be displayed
+	 */
+	abstract public function buttons(): array;
+
 	/**
 	 * Get the content values for the model
 	 */
@@ -352,6 +357,7 @@ public function props(): array
 		$tab       = $blueprint->tab($request->get('tab')) ?? $tabs[0] ?? null;
 
 		$props = [
+			'buttons'     => $this->buttons(),
 			'lock'        => $this->lock(),
 			'permissions' => $this->model->permissions()->toArray(),
 			'tabs'        => $tabs,
diff --git a/src/Panel/Page.php b/src/Panel/Page.php
index 1f2231db19..eeec62348f 100644
--- a/src/Panel/Page.php
+++ b/src/Panel/Page.php
@@ -39,6 +39,22 @@ public function breadcrumb(): array
 		);
 	}
 
+	/**
+	 * Returns header button names which should be displayed
+	 * on the page view
+	 */
+	public function buttons(): array
+	{
+		return
+			$this->model->blueprint()->buttons() ??
+			$this->model->kirby()->option('panel.viewButtons.page', [
+				'preview',
+				'settings',
+				'languages',
+				'status'
+			]);
+	}
+
 	/**
 	 * Provides a kirbytag or markdown
 	 * tag for the page, which will be
diff --git a/src/Panel/Site.php b/src/Panel/Site.php
index b35e4db3aa..dcd4a4f786 100644
--- a/src/Panel/Site.php
+++ b/src/Panel/Site.php
@@ -23,6 +23,20 @@ class Site extends Model
 	 */
 	protected ModelWithContent $model;
 
+	/**
+	 * Returns header button names which should be displayed
+	 * on the site view
+	 */
+	public function buttons(): array
+	{
+		return
+			$this->model->blueprint()->buttons() ??
+			$this->model->kirby()->option('panel.viewButtons.site', [
+				'preview',
+				'languages'
+			]);
+	}
+
 	/**
 	 * Returns the setup for a dropdown option
 	 * which is used in the changes dropdown
diff --git a/src/Panel/User.php b/src/Panel/User.php
index 505f1a1c99..7b69bad355 100644
--- a/src/Panel/User.php
+++ b/src/Panel/User.php
@@ -39,6 +39,21 @@ public function breadcrumb(): array
 		];
 	}
 
+	/**
+	 * Returns header button names which should be displayed
+	 * on the site view
+	 */
+	public function buttons(): array
+	{
+		return
+			$this->model->blueprint()->buttons() ??
+			$this->model->kirby()->option('panel.viewButtons.user', [
+				'theme',
+				'settings',
+				'languages'
+			]);
+	}
+
 	/**
 	 * Provides options for the user dropdown
 	 */
diff --git a/src/Template/Slot.php b/src/Template/Slot.php
index 69d63d46e8..be9f411bb5 100644
--- a/src/Template/Slot.php
+++ b/src/Template/Slot.php
@@ -3,6 +3,7 @@
 namespace Kirby\Template;
 
 use Kirby\Exception\LogicException;
+use Stringable;
 
 /**
  * The slot class catches all content
@@ -16,7 +17,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class Slot
+class Slot implements Stringable
 {
 	/**
 	 * The captured slot content
diff --git a/src/Template/Template.php b/src/Template/Template.php
index 6a0ebeb941..f8270ec808 100644
--- a/src/Template/Template.php
+++ b/src/Template/Template.php
@@ -6,6 +6,7 @@
 use Kirby\Cms\App;
 use Kirby\Filesystem\F;
 use Kirby\Toolkit\Tpl;
+use Stringable;
 
 /**
  * Represents a Kirby template and takes care
@@ -17,7 +18,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class Template
+class Template implements Stringable
 {
 	/**
 	 * Global template data
diff --git a/src/Toolkit/Collection.php b/src/Toolkit/Collection.php
index 51bfdff573..01fcdce8c3 100644
--- a/src/Toolkit/Collection.php
+++ b/src/Toolkit/Collection.php
@@ -5,6 +5,7 @@
 use Closure;
 use Countable;
 use Exception;
+use Stringable;
 
 /**
  * The collection class provides a nicer
@@ -20,7 +21,7 @@
  * @template TValue
  * @extends \Kirby\Toolkit\Iterator<string, TValue>
  */
-class Collection extends Iterator implements Countable
+class Collection extends Iterator implements Countable, Stringable
 {
 	/**
 	 * All registered collection filters
diff --git a/src/Toolkit/Date.php b/src/Toolkit/Date.php
index 361046349c..7b41bb85dd 100644
--- a/src/Toolkit/Date.php
+++ b/src/Toolkit/Date.php
@@ -9,6 +9,7 @@
 use Exception;
 use IntlDateFormatter;
 use Kirby\Exception\InvalidArgumentException;
+use Stringable;
 
 /**
  * Extension for PHP's `DateTime` class
@@ -21,7 +22,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class Date extends DateTime
+class Date extends DateTime implements Stringable
 {
 	/**
 	 * Class constructor
diff --git a/src/Toolkit/View.php b/src/Toolkit/View.php
index 9471396df8..aa52ca7b0e 100644
--- a/src/Toolkit/View.php
+++ b/src/Toolkit/View.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use Kirby\Filesystem\F;
+use Stringable;
 use Throwable;
 
 /**
@@ -15,7 +16,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
-class View
+class View implements Stringable
 {
 	/**
 	 * Creates a new view object
diff --git a/src/Uuid/Uuid.php b/src/Uuid/Uuid.php
index b8f310a24b..28ad6c433b 100644
--- a/src/Uuid/Uuid.php
+++ b/src/Uuid/Uuid.php
@@ -13,6 +13,7 @@
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Exception\LogicException;
 use Kirby\Toolkit\Str;
+use Stringable;
 
 /**
  * The `Uuid` classes provide an interface to connect
@@ -40,7 +41,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-abstract class Uuid
+abstract class Uuid implements Stringable
 {
 	protected const TYPE = 'uuid';
 
diff --git a/tests/Cms/App/AppTest.php b/tests/Cms/App/AppTest.php
index 684d3cbbdf..a25b0218d7 100644
--- a/tests/Cms/App/AppTest.php
+++ b/tests/Cms/App/AppTest.php
@@ -274,7 +274,7 @@ public function testContentToken()
 			]
 		]);
 		$this->assertSame(hash_hmac('sha1', 'test', '/dev/null/content'), $app->contentToken('model', 'test'));
-		$this->assertSame(hash_hmac('sha1', 'test', '/dev/null'), $app->contentToken($app, 'test'));
+		$this->assertSame(hash_hmac('sha1', 'test', '/dev/null/content'), $app->contentToken($app, 'test'));
 
 		// with custom static salt
 		$app = new App([
diff --git a/tests/Cms/Blueprints/BlueprintTest.php b/tests/Cms/Blueprints/BlueprintTest.php
index 978f2bfe0d..5c0f9509ad 100644
--- a/tests/Cms/Blueprints/BlueprintTest.php
+++ b/tests/Cms/Blueprints/BlueprintTest.php
@@ -338,6 +338,20 @@ public function testAcceptedFileTemplatesFromSections()
 		$this->assertSame(['a', 'b'], $blueprint->acceptedFileTemplates());
 	}
 
+	/**
+	 * @covers ::buttons
+	 */
+	public function testButtons()
+	{
+		$blueprint = new Blueprint([
+			'model' => $this->model,
+			'name'  => 'default',
+			'buttons' => ['foo', 'bar']
+		]);
+
+		$this->assertSame(['foo', 'bar'], $blueprint->buttons());
+	}
+
 	/**
 	 * @covers ::__debugInfo
 	 */
diff --git a/tests/Cms/Files/FileActionsTest.php b/tests/Cms/Files/FileActionsTest.php
index 3d8b91aaa7..322b60fb1d 100644
--- a/tests/Cms/Files/FileActionsTest.php
+++ b/tests/Cms/Files/FileActionsTest.php
@@ -2,6 +2,7 @@
 
 namespace Kirby\Cms;
 
+use Kirby\Content\VersionId;
 use Kirby\Exception\LogicException;
 use Kirby\Filesystem\Dir;
 use Kirby\Filesystem\F;
@@ -105,19 +106,19 @@ public function testChangeName(File $file)
 		// create an empty dummy file
 		F::write($file->root(), '');
 		// ...and an empty content file for it
-		F::write($file->storage()->contentFile('published', 'default'), '');
+		F::write($file->storage()->contentFile(VersionId::published(), 'default'), '');
 
 		$this->assertFileExists($file->root());
-		$this->assertFileExists($file->storage()->contentFile('published', 'default'));
+		$this->assertFileExists($file->storage()->contentFile(VersionId::published(), 'default'));
 
 		$result = $file->changeName('test');
 
 		$this->assertNotSame($file->root(), $result->root());
 		$this->assertSame('test.csv', $result->filename());
 		$this->assertFileExists($result->root());
-		$this->assertFileExists($result->storage()->contentFile('published', 'default'));
+		$this->assertFileExists($result->storage()->contentFile(VersionId::published(), 'default'));
 		$this->assertFileDoesNotExist($file->root());
-		$this->assertFileDoesNotExist($file->storage()->contentFile('published', 'default'));
+		$this->assertFileDoesNotExist($file->storage()->contentFile(VersionId::published(), 'default'));
 	}
 
 	public static function fileProviderMultiLang(): array
@@ -141,20 +142,20 @@ public function testChangeNameMultiLang(File $file)
 		// create an empty dummy file
 		F::write($file->root(), '');
 		// ...and empty content files for it
-		F::write($file->storage()->contentFile('published', 'en'), '');
-		F::write($file->storage()->contentFile('published', 'de'), '');
+		F::write($file->storage()->contentFile(VersionId::published(), 'en'), '');
+		F::write($file->storage()->contentFile(VersionId::published(), 'de'), '');
 
 		$this->assertFileExists($file->root());
-		$this->assertFileExists($file->storage()->contentFile('published', 'en'));
-		$this->assertFileExists($file->storage()->contentFile('published', 'de'));
+		$this->assertFileExists($file->storage()->contentFile(VersionId::published(), 'en'));
+		$this->assertFileExists($file->storage()->contentFile(VersionId::published(), 'de'));
 
 		$result = $file->changeName('test');
 
 		$this->assertNotEquals($file->root(), $result->root());
 		$this->assertSame('test.csv', $result->filename());
 		$this->assertFileExists($result->root());
-		$this->assertFileExists($result->storage()->contentFile('published', 'en'));
-		$this->assertFileExists($result->storage()->contentFile('published', 'de'));
+		$this->assertFileExists($result->storage()->contentFile(VersionId::published(), 'en'));
+		$this->assertFileExists($result->storage()->contentFile(VersionId::published(), 'de'));
 	}
 
 	public function testChangeTemplate()
@@ -376,9 +377,9 @@ public function testChangeTemplateMultilang()
 		$this->assertNull($modified->caption()->value());
 		$this->assertSame('Das ist der Text', $modified->text()->value());
 
-		$this->assertFileExists($modified->storage()->contentFile('published', 'en'));
-		$this->assertFileExists($modified->storage()->contentFile('published', 'de'));
-		$this->assertFileDoesNotExist($modified->storage()->contentFile('published', 'fr'));
+		$this->assertFileExists($modified->storage()->contentFile(VersionId::published(), 'en'));
+		$this->assertFileExists($modified->storage()->contentFile(VersionId::published(), 'de'));
+		$this->assertFileDoesNotExist($modified->storage()->contentFile(VersionId::published(), 'fr'));
 	}
 
 	public function testChangeTemplateDefault()
@@ -754,17 +755,17 @@ public function testDelete(File $file)
 		// create an empty dummy file
 		F::write($file->root(), '');
 		// ...and an empty content file for it
-		F::write($file->storage()->contentFile('published', 'default'), '');
+		F::write($file->storage()->contentFile(VersionId::published(), 'default'), '');
 
 		$this->assertFileExists($file->root());
-		$this->assertFileExists($file->storage()->contentFile('published', 'default'));
+		$this->assertFileExists($file->storage()->contentFile(VersionId::published(), 'default'));
 
 		$result = $file->delete();
 
 		$this->assertTrue($result);
 
 		$this->assertFileDoesNotExist($file->root());
-		$this->assertFileDoesNotExist($file->storage()->contentFile('published', 'default'));
+		$this->assertFileDoesNotExist($file->storage()->contentFile(VersionId::published(), 'default'));
 	}
 
 	/**
@@ -874,11 +875,11 @@ public function testSave($file)
 		F::write($file->root(), '');
 
 		$this->assertFileExists($file->root());
-		$this->assertFileDoesNotExist($file->storage()->contentFile('published', 'default'));
+		$this->assertFileDoesNotExist($file->storage()->contentFile(VersionId::published(), 'default'));
 
 		$file = $file->clone(['content' => ['caption' => 'save']])->save();
 
-		$this->assertFileExists($file->storage()->contentFile('published', 'default'));
+		$this->assertFileExists($file->storage()->contentFile(VersionId::published(), 'default'));
 	}
 
 	/**
diff --git a/tests/Cms/Media/MediaTest.php b/tests/Cms/Media/MediaTest.php
index 0e866c4af5..787d2ebad1 100644
--- a/tests/Cms/Media/MediaTest.php
+++ b/tests/Cms/Media/MediaTest.php
@@ -57,6 +57,11 @@ public function testLinkWithoutModel()
 		$this->assertFalse(Media::link(null, 'hash', 'filename.jpg'));
 	}
 
+	public function testLinkNonExistingFile()
+	{
+		$this->assertFalse(Media::link($this->app->site(), 'hash', 'filename.jpg'));
+	}
+
 	public function testPublish()
 	{
 		$site = new Site();
diff --git a/tests/Cms/Pages/PageActionsTest.php b/tests/Cms/Pages/PageActionsTest.php
index f6e384548e..15d7f2d93a 100644
--- a/tests/Cms/Pages/PageActionsTest.php
+++ b/tests/Cms/Pages/PageActionsTest.php
@@ -3,6 +3,7 @@
 namespace Kirby\Cms;
 
 use Kirby\Content\ContentTranslation;
+use Kirby\Content\VersionId;
 use Kirby\Filesystem\Dir;
 use Kirby\Filesystem\F;
 use Kirby\TestCase;
@@ -423,9 +424,9 @@ public function testChangeTemplateMultilang()
 		$this->assertSame('article', $modified->intendedTemplate()->name());
 		$this->assertSame(2, $calls);
 
-		$this->assertFileExists($modified->storage()->contentFile('published', 'en'));
-		$this->assertFileExists($modified->storage()->contentFile('published', 'de'));
-		$this->assertFileDoesNotExist($modified->storage()->contentFile('published', 'fr'));
+		$this->assertFileExists($modified->storage()->contentFile(VersionId::published(), 'en'));
+		$this->assertFileExists($modified->storage()->contentFile(VersionId::published(), 'de'));
+		$this->assertFileDoesNotExist($modified->storage()->contentFile(VersionId::published(), 'fr'));
 		$this->assertNull($modified->caption()->value());
 		$this->assertSame('Text', $modified->text()->value());
 		$this->assertNull($modified->content('de')->get('caption')->value());
@@ -890,15 +891,15 @@ public function testDuplicateMultiLang()
 			'parent' => $page,
 			'code'   => 'en',
 		]);
-		$this->assertFileExists($page->storage()->contentFile('changes', 'en'));
+		$this->assertFileExists($page->storage()->contentFile(VersionId::changes(), 'en'));
 
 		$drafts = $app->site()->drafts();
 		$childrenAndDrafts = $app->site()->childrenAndDrafts();
 
 		$copy = $page->duplicate('test-copy');
 
-		$this->assertFileExists($copy->storage()->contentFile('changes', 'en'));
-		$this->assertFileDoesNotExist($copy->storage()->contentFile('changes', 'de'));
+		$this->assertFileExists($copy->storage()->contentFile(VersionId::changes(), 'en'));
+		$this->assertFileDoesNotExist($copy->storage()->contentFile(VersionId::changes(), 'de'));
 
 		$this->assertIsPage($page, $drafts->find('test'));
 		$this->assertIsPage($page, $childrenAndDrafts->find('test'));
@@ -930,8 +931,8 @@ public function testDuplicateMultiLangSlug()
 			'slug'  => 'test-de'
 		], 'de');
 
-		$this->assertFileExists($page->storage()->contentFile('changes', 'en'));
-		$this->assertFileExists($page->storage()->contentFile('changes', 'de'));
+		$this->assertFileExists($page->storage()->contentFile(VersionId::changes(), 'en'));
+		$this->assertFileExists($page->storage()->contentFile(VersionId::changes(), 'de'));
 		$this->assertSame('test', $page->slug());
 		$this->assertSame('test-de', $page->slug('de'));
 
@@ -1045,8 +1046,8 @@ public function testDuplicateChildrenMultiLang()
 
 		$copy = $page->duplicate('test-copy', ['children' => true]);
 
-		$this->assertFileExists($copy->storage()->contentFile('changes', 'en'));
-		$this->assertFileDoesNotExist($copy->storage()->contentFile('changes', 'de'));
+		$this->assertFileExists($copy->storage()->contentFile(VersionId::changes(), 'en'));
+		$this->assertFileDoesNotExist($copy->storage()->contentFile(VersionId::changes(), 'de'));
 
 
 		$this->assertNotSame($page->uuid()->id(), $copy->uuid()->id());
diff --git a/tests/Cms/Pages/PageTest.php b/tests/Cms/Pages/PageTest.php
index 25a4b17ca7..5a4ac5d251 100644
--- a/tests/Cms/Pages/PageTest.php
+++ b/tests/Cms/Pages/PageTest.php
@@ -636,7 +636,11 @@ public function testCustomPreviewUrl($input, $expected, $draft)
 		]);
 
 		if ($draft === true && $expected !== null) {
-			$expected = str_replace('{token}', 'token=' . hash_hmac('sha1', $page->id() . $page->template(), $page->root()), $expected);
+			$expected = str_replace(
+				'{token}',
+				'token=' . hash_hmac('sha1', $page->id() . $page->template(), $page->kirby()->root('content') . '/' . $page->id()),
+				$expected
+			);
 		}
 
 		$this->assertSame($expected, $page->previewUrl());
@@ -650,16 +654,25 @@ public function testSlug()
 
 	public function testToken()
 	{
+		$app = new App([
+			'roots' => [
+				'index' => '/dev/null'
+			]
+		]);
+
 		$page = new Page([
 			'slug'     => 'test',
-			'root'     => '/var/www/content/test',
 			'template' => 'default'
 		]);
 
 		$method = new ReflectionMethod(Page::class, 'token');
 		$method->setAccessible(true);
 
-		$expected = hash_hmac('sha1', 'test' . 'default', '/var/www/content/test');
+		$expected = hash_hmac(
+			'sha1',
+			'testdefault',
+			'/dev/null/content/test'
+		);
 		$this->assertSame($expected, $method->invoke($page));
 	}
 
diff --git a/tests/Cms/Plugins/PluginTest.php b/tests/Cms/Plugins/PluginTest.php
index 3d9e03fdb5..7d334445cb 100644
--- a/tests/Cms/Plugins/PluginTest.php
+++ b/tests/Cms/Plugins/PluginTest.php
@@ -61,9 +61,10 @@ public function tearDown(): void
 	 */
 	public function test__call()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => static::FIXTURES . '/plugin'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin'
+		);
 
 		$this->assertSame('MIT', $plugin->license());
 	}
@@ -73,13 +74,16 @@ public function test__call()
 	 */
 	public function testAsset()
 	{
-		$root = static::FIXTURES . '/plugin-assets';
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'assets' => [
-				'c.css' => $a = $root . '/a.css',
-				'd.css' => $b = $root . '/foo/b.css'
+		$root   = static::FIXTURES . '/plugin-assets';
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			extends: [
+				'assets' => [
+					'c.css' => $a = $root . '/a.css',
+					'd.css' => $b = $root . '/foo/b.css'
+				]
 			]
-		]);
+		);
 
 		$this->assertSame($a, $plugin->asset('c.css')->root());
 		$this->assertSame($b, $plugin->asset('d.css')->root());
@@ -93,12 +97,15 @@ public function testAssets()
 		$root = static::FIXTURES . '/plugin-assets';
 
 		// assets defined in plugin config
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root'   => $root,
-			'assets' => [
-				'c.css' => $root . '/a.css',
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: $root,
+			extends: [
+				'assets' => [
+					'c.css' => $root . '/a.css',
+				]
 			]
-		]);
+		);
 
 		$this->assertInstanceOf(PluginAssets::class, $plugin->assets());
 		$this->assertSame($root . '/a.css', $plugin->asset('c.css')->root());
@@ -109,9 +116,10 @@ public function testAssets()
 	 */
 	public function testAuthors()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => static::FIXTURES . '/plugin'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root:  static::FIXTURES . '/plugin'
+		);
 
 		$authors = [
 			[
@@ -132,9 +140,10 @@ public function testAuthors()
 	 */
 	public function testAuthorsNames()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => static::FIXTURES . '/plugin'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin'
+		);
 
 		$this->assertSame('A, B', $plugin->authorsNames());
 	}
@@ -144,11 +153,14 @@ public function testAuthorsNames()
 	 */
 	public function testExtends()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', $extends = [
-			'fields' => [
-				'test' => []
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			extends: $extends = [
+				'fields' => [
+					'test' => []
+				]
 			]
-		]);
+		);
 
 		$this->assertSame($extends, $plugin->extends());
 	}
@@ -158,8 +170,7 @@ public function testExtends()
 	 */
 	public function testId()
 	{
-		$plugin = new Plugin($id = 'abc-1234/DEF-56789', []);
-
+		$plugin = new Plugin($id = 'abc-1234/DEF-56789');
 		$this->assertSame($id, $plugin->id());
 	}
 
@@ -168,9 +179,10 @@ public function testId()
 	 */
 	public function testInfo()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin-version'
+		);
 
 		$authors = [
 			[
@@ -196,23 +208,44 @@ public function testInfo()
 	 */
 	public function testInfoFromProps()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'info' => [
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			info: [
 				'license' => 'MIT'
 			]
-		]);
+		);
 
 		$this->assertSame('MIT', $plugin->info()['license']);
 	}
 
+	/**
+	 * @covers ::info
+	 */
+	public function testInfoFromPropAndManifest()
+	{
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin-version',
+			info: [
+				'version' => '2.1.0'
+			],
+			version: '5.3.0'
+		);
+
+		$this->assertSame('MIT', $plugin->info()['license']);
+		$this->assertSame('2.1.0', $plugin->info()['version']);
+		$this->assertSame('5.3.0', $plugin->version());
+	}
+
 	/**
 	 * @covers ::info
 	 */
 	public function testInfoWhenEmpty()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => __DIR__
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: __DIR__
+		);
 
 		$this->assertSame([], $plugin->info());
 	}
@@ -222,11 +255,12 @@ public function testInfoWhenEmpty()
 	 */
 	public function testLinkFromHomepage()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'info' => [
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			info: [
 				'homepage' => 'https://getkirby.com'
 			]
-		]);
+		);
 
 		$this->assertSame('https://getkirby.com', $plugin->link());
 	}
@@ -236,11 +270,12 @@ public function testLinkFromHomepage()
 	 */
 	public function testLinkFromInvalidHomepage()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'info' => [
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			info: [
 				'homepage' => 'test'
 			]
-		]);
+		);
 
 		$this->assertNull($plugin->link());
 	}
@@ -250,13 +285,14 @@ public function testLinkFromInvalidHomepage()
 	 */
 	public function testLinkFromSupportDocs()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'info' => [
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			info: [
 				'support' => [
 					'docs' => 'https://getkirby.com'
 				]
 			]
-		]);
+		);
 
 		$this->assertSame('https://getkirby.com', $plugin->link());
 	}
@@ -266,13 +302,14 @@ public function testLinkFromSupportDocs()
 	 */
 	public function testLinkFromSupportSource()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'info' => [
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			info: [
 				'support' => [
 					'source' => 'https://getkirby.com'
 				]
 			]
-		]);
+		);
 
 		$this->assertSame('https://getkirby.com', $plugin->link());
 	}
@@ -323,9 +360,10 @@ public function testMediaUrl()
 	 */
 	public function testManifest()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => __DIR__
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: __DIR__
+		);
 
 		$this->assertSame(__DIR__ . '/composer.json', $plugin->manifest());
 	}
@@ -336,8 +374,7 @@ public function testManifest()
 	 */
 	public function testName()
 	{
-		$plugin = new Plugin($name = 'abc-1234/DEF-56789', []);
-
+		$plugin = new Plugin($name = 'abc-1234/DEF-56789');
 		$this->assertSame($name, $plugin->name());
 	}
 
@@ -348,8 +385,7 @@ public function testName()
 	public function testNameWithInvalidInput()
 	{
 		$this->expectException(InvalidArgumentException::class);
-
-		new Plugin('äöü/!!!', []);
+		new Plugin('äöü/!!!');
 	}
 
 	/**
@@ -357,11 +393,14 @@ public function testNameWithInvalidInput()
 	 */
 	public function testOption()
 	{
-		App::plugin('developer/plugin', [
-			'options' => [
-				'foo' => 'bar'
+		App::plugin(
+			name: 'developer/plugin',
+			extends: [
+				'options' => [
+					'foo' => 'bar'
+				]
 			]
-		]);
+		);
 
 		$app = $this->app->clone();
 
@@ -374,8 +413,7 @@ public function testOption()
 	 */
 	public function testPrefix()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', []);
-
+		$plugin = new Plugin('getkirby/test-plugin');
 		$this->assertSame('getkirby.test-plugin', $plugin->prefix());
 	}
 
@@ -385,7 +423,6 @@ public function testPrefix()
 	public function testRoot()
 	{
 		$plugin = new Plugin('getkirby/test-plugin');
-
 		$this->assertSame(__DIR__, $plugin->root());
 	}
 
@@ -394,9 +431,10 @@ public function testRoot()
 	 */
 	public function testRootWithCustomSetup()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => $custom = __DIR__ . '/test',
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: $custom = __DIR__ . '/test'
+		);
 
 		$this->assertSame($custom, $plugin->root());
 	}
@@ -406,9 +444,10 @@ public function testRootWithCustomSetup()
 	 */
 	public function testToArray()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => $root = static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: $root = static::FIXTURES . '/plugin-version'
+		);
 
 		$expected = [
 			'authors' => [
@@ -431,9 +470,10 @@ public function testToArray()
 	 */
 	public function testUpdateStatus()
 	{
-		$plugin = new Plugin('getkirby/public', [
-			'root' => static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/public',
+			root: static::FIXTURES . '/plugin-version'
+		);
 		$updateStatus = $plugin->updateStatus();
 
 		$this->assertInstanceOf(UpdateStatus::class, $updateStatus);
@@ -453,9 +493,10 @@ public function testUpdateStatus()
 	 */
 	public function testUpdateStatusWithPrefix()
 	{
-		$plugin = new Plugin('getkirby/public', [
-			'root' => static::FIXTURES . '/plugin-version-prefix'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/public',
+			root: static::FIXTURES . '/plugin-version-prefix'
+		);
 		$updateStatus = $plugin->updateStatus();
 
 		$this->assertInstanceOf(UpdateStatus::class, $updateStatus);
@@ -475,9 +516,11 @@ public function testUpdateStatusWithPrefix()
 	 */
 	public function testUpdateStatusWithoutVersion()
 	{
-		$plugin = new Plugin('getkirby/public', [
-			'root' => static::FIXTURES . '/plugin'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/public',
+			root: static::FIXTURES . '/plugin'
+		);
+
 		$updateStatus = $plugin->updateStatus();
 
 		$this->assertInstanceOf(UpdateStatus::class, $updateStatus);
@@ -498,9 +541,11 @@ public function testUpdateStatusWithoutVersion()
 	 */
 	public function testUpdateStatusUnknownPlugin()
 	{
-		$plugin = new Plugin('getkirby/unknown', [
-			'root' => static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/unknown',
+			root: static::FIXTURES . '/plugin-version'
+		);
+
 		$updateStatus = $plugin->updateStatus();
 
 		$this->assertInstanceOf(UpdateStatus::class, $updateStatus);
@@ -532,9 +577,10 @@ public function testUpdateStatusDisabled1()
 			]
 		]);
 
-		$plugin = new Plugin('getkirby/public', [
-			'root' => static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/public',
+			root: static::FIXTURES . '/plugin-version'
+		);
 		$updateStatus = $plugin->updateStatus();
 
 		$this->assertNull($updateStatus);
@@ -558,9 +604,11 @@ public function testUpdateStatusDisabled2()
 			]
 		]);
 
-		$plugin = new Plugin('getkirby/public', [
-			'root' => static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/public',
+			root: static::FIXTURES . '/plugin-version'
+		);
+
 		$updateStatus = $plugin->updateStatus();
 
 		$this->assertNull($updateStatus);
@@ -577,9 +625,11 @@ public function testUpdateStatusDisabled3()
 			]
 		]);
 
-		$plugin = new Plugin('getkirby/public', [
-			'root' => static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/public',
+			root: static::FIXTURES . '/plugin-version'
+		);
+
 		$updateStatus = $plugin->updateStatus();
 
 		$this->assertNull($updateStatus);
@@ -600,9 +650,11 @@ public function testUpdateStatusDisabled4()
 			]
 		]);
 
-		$plugin = new Plugin('getkirby/public', [
-			'root' => static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/public',
+			root: static::FIXTURES . '/plugin-version'
+		);
+
 		$updateStatus = $plugin->updateStatus();
 
 		$this->assertNull($updateStatus);
@@ -623,9 +675,10 @@ public function testUpdateStatusNoCustomConfig()
 			]
 		]);
 
-		$plugin = new Plugin('getkirby/public', [
-			'root' => static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/public',
+			root: static::FIXTURES . '/plugin-version'
+		);
 		$updateStatus = $plugin->updateStatus();
 
 		$this->assertInstanceOf(UpdateStatus::class, $updateStatus);
@@ -645,9 +698,11 @@ public function testUpdateStatusNoCustomConfig()
 	 */
 	public function testUpdateStatusCustomData()
 	{
-		$plugin = new Plugin('getkirby/public', [
-			'root' => static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/public',
+			root: static::FIXTURES . '/plugin-version'
+		);
+
 		$updateStatus = $plugin->updateStatus([
 			'latest' => '87654.3.2',
 			'versions' => [
@@ -682,21 +737,53 @@ public function testUpdateStatusCustomData()
 	 */
 	public function testVersion()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => static::FIXTURES . '/plugin-version'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin-version'
+		);
 
 		$this->assertSame('1.0.0', $plugin->version());
 	}
 
+	/**
+	 * @covers ::version
+	 */
+	public function testVersionFromArgument()
+	{
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin-version',
+			version: '1.2.0'
+		);
+
+		$this->assertSame('1.2.0', $plugin->version());
+	}
+
+	/**
+	 * @covers ::version
+	 */
+	public function testVersionFromInfo()
+	{
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin-version',
+			info: [
+				'version' => '1.1.0'
+			]
+		);
+
+		$this->assertSame('1.1.0', $plugin->version());
+	}
+
 	/**
 	 * @covers ::version
 	 */
 	public function testVersionMissing()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => static::FIXTURES . '/plugin'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin'
+		);
 
 		$this->assertNull($plugin->version());
 	}
@@ -706,9 +793,10 @@ public function testVersionMissing()
 	 */
 	public function testVersionPrefixed()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => static::FIXTURES . '/plugin-version-prefix'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin-version-prefix'
+		);
 
 		$this->assertSame('1.0.0', $plugin->version());
 	}
@@ -718,9 +806,10 @@ public function testVersionPrefixed()
 	 */
 	public function testVersionInvalid()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => static::FIXTURES . '/plugin-version-invalid'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin-version-invalid'
+		);
 
 		$this->assertNull($plugin->version());
 	}
@@ -730,9 +819,10 @@ public function testVersionInvalid()
 	 */
 	public function testVersionComposer()
 	{
-		$plugin = new Plugin('getkirby/test-plugin-composer', [
-			'root' => static::FIXTURES . '/plugin-version-composer'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin-composer',
+			root: static::FIXTURES . '/plugin-version-composer'
+		);
 
 		$this->assertSame('5.2.3', $plugin->version());
 	}
@@ -742,9 +832,10 @@ public function testVersionComposer()
 	 */
 	public function testVersionComposerNoVersionSet()
 	{
-		$plugin = new Plugin('getkirby/test-plugin', [
-			'root' => static::FIXTURES . '/plugin-version-composer-noversionset'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin',
+			root: static::FIXTURES . '/plugin-version-composer-noversionset'
+		);
 
 		$this->assertNull($plugin->version());
 	}
@@ -754,10 +845,11 @@ public function testVersionComposerNoVersionSet()
 	 */
 	public function testVersionComposerOverride()
 	{
-		$plugin = new Plugin('getkirby/test-plugin-composer', [
-			'root' => static::FIXTURES . '/plugin-version-composer-override'
-		]);
+		$plugin = new Plugin(
+			name: 'getkirby/test-plugin-composer',
+			root: static::FIXTURES . '/plugin-version-composer-override'
+		);
 
-		$this->assertSame('3.1.2', $plugin->version());
+		$this->assertSame('5.2.3', $plugin->version());
 	}
 }
diff --git a/tests/Content/ContentStorageTest.php b/tests/Content/ContentStorageTest.php
index 2a3c1eb9c1..086c0a3ec0 100644
--- a/tests/Content/ContentStorageTest.php
+++ b/tests/Content/ContentStorageTest.php
@@ -50,9 +50,9 @@ public function testCreateChangesMultiLang()
 			'text'  => 'Bar'
 		];
 
-		$this->assertFalse($this->storage->exists('changes', 'en'));
-		$this->storage->create('changes', 'en', $fields);
-		$this->assertTrue($this->storage->exists('changes', 'en'));
+		$this->assertFalse($this->storage->exists(VersionId::changes(), 'en'));
+		$this->storage->create(VersionId::changes(), 'en', $fields);
+		$this->assertTrue($this->storage->exists(VersionId::changes(), 'en'));
 	}
 
 	/**
@@ -65,9 +65,9 @@ public function testCreateChangesSingleLang()
 			'text'  => 'Bar'
 		];
 
-		$this->assertFalse($this->storage->exists('changes', 'default'));
-		$this->storage->create('changes', 'default', $fields);
-		$this->assertTrue($this->storage->exists('changes', 'default'));
+		$this->assertFalse($this->storage->exists(VersionId::changes(), 'default'));
+		$this->storage->create(VersionId::changes(), 'default', $fields);
+		$this->assertTrue($this->storage->exists(VersionId::changes(), 'default'));
 	}
 
 	/**
@@ -79,7 +79,7 @@ public function testReadDoesNotExist()
 		$this->expectException(NotFoundException::class);
 		$this->expectExceptionMessage('Version "published (default)" does not already exist');
 
-		$this->storage->read('published', 'default');
+		$this->storage->read(VersionId::published(), 'default');
 	}
 
 	/**
@@ -91,7 +91,7 @@ public function testTouchDoesNotExist()
 		$this->expectException(NotFoundException::class);
 		$this->expectExceptionMessage('Version "published (default)" does not already exist');
 
-		$this->storage->touch('published', 'default');
+		$this->storage->touch(VersionId::published(), 'default');
 	}
 
 	/**
@@ -108,7 +108,7 @@ public function testUpdateDoesNotExist()
 			'text'  => 'Bar'
 		];
 
-		$this->storage->update('published', 'default', $fields);
+		$this->storage->update(VersionId::published(), 'default', $fields);
 	}
 
 	/**
diff --git a/tests/Content/PlainTextContentStorageHandlerTest.php b/tests/Content/PlainTextContentStorageHandlerTest.php
index d654c03e85..a2b52747a9 100644
--- a/tests/Content/PlainTextContentStorageHandlerTest.php
+++ b/tests/Content/PlainTextContentStorageHandlerTest.php
@@ -7,7 +7,6 @@
 use Kirby\Cms\Page;
 use Kirby\Cms\User;
 use Kirby\Data\Data;
-use Kirby\Exception\InvalidArgumentException;
 use Kirby\Exception\LogicException;
 use Kirby\Filesystem\Dir;
 use Kirby\TestCase;
@@ -53,7 +52,7 @@ public function testCreateChangesMultiLang()
 			'text'  => 'Bar'
 		];
 
-		$this->storage->create('changes', 'en', $fields);
+		$this->storage->create(VersionId::changes(), 'en', $fields);
 		$this->assertSame($fields, Data::read(static::TMP . '/_changes/article.en.txt'));
 	}
 
@@ -67,7 +66,7 @@ public function testCreateChangesSingleLang()
 			'text'  => 'Bar'
 		];
 
-		$this->storage->create('changes', 'default', $fields);
+		$this->storage->create(VersionId::changes(), 'default', $fields);
 		$this->assertSame($fields, Data::read(static::TMP . '/_changes/article.txt'));
 	}
 
@@ -81,7 +80,7 @@ public function testCreatePublishedMultiLang()
 			'text'  => 'Bar'
 		];
 
-		$this->storage->create('published', 'en', $fields);
+		$this->storage->create(VersionId::published(), 'en', $fields);
 		$this->assertSame($fields, Data::read(static::TMP . '/article.en.txt'));
 	}
 
@@ -95,28 +94,17 @@ public function testCreatePublishedSingleLang()
 			'text'  => 'Bar'
 		];
 
-		$this->storage->create('published', 'default', $fields);
+		$this->storage->create(VersionId::published(), 'default', $fields);
 		$this->assertSame($fields, Data::read(static::TMP . '/article.txt'));
 	}
 
-	/**
-	 * @covers ::create
-	 */
-	public function testCreateInvalidType()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid version identifier "invalid"');
-
-		$this->storage->create('invalid', 'default', []);
-	}
-
 	/**
 	 * @covers ::delete
 	 */
 	public function testDeleteNonExisting()
 	{
 		// test idempotency
-		$this->storage->delete('published', 'default');
+		$this->storage->delete(VersionId::published(), 'default');
 		$this->assertDirectoryDoesNotExist(static::TMP);
 	}
 
@@ -129,7 +117,7 @@ public function testDeleteChangesMultiLang()
 		touch(static::TMP . '/article.en.txt');
 		touch(static::TMP . '/_changes/article.en.txt');
 
-		$this->storage->delete('changes', 'en');
+		$this->storage->delete(VersionId::changes(), 'en');
 		$this->assertFileDoesNotExist(static::TMP . '/_changes/article.en.txt');
 		$this->assertDirectoryDoesNotExist(static::TMP . '/_changes');
 		$this->assertDirectoryExists(static::TMP);
@@ -144,7 +132,7 @@ public function testDeleteChangesSingleLang()
 		touch(static::TMP . '/article.txt');
 		touch(static::TMP . '/_changes/article.txt');
 
-		$this->storage->delete('changes', 'default');
+		$this->storage->delete(VersionId::changes(), 'default');
 		$this->assertFileDoesNotExist(static::TMP . '/_changes/article.txt');
 		$this->assertDirectoryDoesNotExist(static::TMP . '/_changes');
 	}
@@ -158,7 +146,7 @@ public function testDeletePublishedMultiLang()
 		touch(static::TMP . '/article.en.txt');
 		touch(static::TMP . '/_changes/article.en.txt');
 
-		$this->storage->delete('published', 'en');
+		$this->storage->delete(VersionId::published(), 'en');
 		$this->assertFileDoesNotExist(static::TMP . '/article.en.txt');
 		$this->assertDirectoryExists(static::TMP);
 	}
@@ -172,97 +160,35 @@ public function testDeletePublishedSingleLang()
 		touch(static::TMP . '/article.txt');
 		touch(static::TMP . '/_changes/article.txt');
 
-		$this->storage->delete('published', 'default');
+		$this->storage->delete(VersionId::published(), 'default');
 		$this->assertFileDoesNotExist(static::TMP . '/article.txt');
 		$this->assertDirectoryExists(static::TMP);
 	}
 
-	/**
-	 * @covers ::delete
-	 */
-	public function testDeleteInvalidId()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid version identifier "invalid"');
-
-		$this->storage->delete('invalid', 'default');
-	}
-
 	/**
 	 * @covers ::exists
 	 * @dataProvider existsProvider
 	 */
-	public function testExistsNoneExisting(string $id, string|null $language)
+	public function testExistsNoneExisting(VersionId $id, string $language)
 	{
 		$this->assertFalse($this->storage->exists($id, $language));
 	}
 
-	/**
-	 * @covers ::exists
-	 * @dataProvider existsProvider
-	 */
-	public function testExistsSomeExistingMultiLang(string $id, string|null $language, array $expected)
-	{
-		Dir::make(static::TMP . '/_changes');
-		touch(static::TMP . '/article.txt');
-		touch(static::TMP . '/_changes/article.en.txt');
-
-		new App([
-			'languages' => [
-				[
-					'code' => 'en',
-					'default' => true
-				],
-				[
-					'code' => 'de'
-				]
-			]
-		]);
-
-		$this->assertSame($expected[0], $this->storage->exists($id, $language));
-	}
-
-	/**
-	 * @covers ::exists
-	 * @dataProvider existsProvider
-	 */
-	public function testExistsSomeExistingSingleLang(string $id, string|null $language, array $expected)
-	{
-		Dir::make(static::TMP . '/_changes');
-		touch(static::TMP . '/article.txt');
-		touch(static::TMP . '/_changes/article.en.txt');
-
-		$this->assertSame($expected[1], $this->storage->exists($id, $language));
-	}
-
 	public static function existsProvider(): array
 	{
 		return [
-			['changes', null, [true, false]],
-			['changes', 'default', [false, false]],
-			['changes', 'en', [true, true]],
-			['published', null, [false, true]],
-			['published', 'default', [true, true]],
-			['published', 'en', [false, false]]
+			[VersionId::changes(), 'default', [false, false]],
+			[VersionId::changes(), 'en', [true, true]],
+			[VersionId::published(), 'default', [true, true]],
+			[VersionId::published(), 'en', [false, false]]
 		];
 	}
 
-	/**
-	 * @covers ::exists
-	 */
-	public function testExistsInvalidId()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid version identifier "invalid"');
-
-		$this->storage->exists('invalid', 'default');
-	}
-
 	/**
 	 * @covers ::modified
 	 * @dataProvider modifiedProvider
 	 */
-	public function testModifiedNoneExisting(string $id, string $language)
+	public function testModifiedNoneExisting(VersionId $id, string $language)
 	{
 		$this->assertNull($this->storage->modified($id, $language));
 	}
@@ -271,7 +197,7 @@ public function testModifiedNoneExisting(string $id, string $language)
 	 * @covers ::modified
 	 * @dataProvider modifiedProvider
 	 */
-	public function testModifiedSomeExisting(string $id, string $language, int|null $expected)
+	public function testModifiedSomeExisting(VersionId $id, string $language, int|null $expected)
 	{
 		Dir::make(static::TMP . '/_changes');
 		touch(static::TMP . '/article.txt', 1234567890);
@@ -283,24 +209,13 @@ public function testModifiedSomeExisting(string $id, string $language, int|null
 	public static function modifiedProvider(): array
 	{
 		return [
-			['changes', 'default', null],
-			['changes', 'en', 1234567890],
-			['published', 'default', 1234567890],
-			['published', 'en', null]
+			[VersionId::changes(), 'default', null],
+			[VersionId::changes(), 'en', 1234567890],
+			[VersionId::published(), 'default', 1234567890],
+			[VersionId::published(), 'en', null]
 		];
 	}
 
-	/**
-	 * @covers ::modified
-	 */
-	public function testModifiedInvalidId()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid version identifier "invalid"');
-
-		$this->storage->modified('invalid', 'default');
-	}
-
 	/**
 	 * @covers ::read
 	 */
@@ -314,7 +229,7 @@ public function testReadChangesMultiLang()
 		Dir::make(static::TMP . '/_changes');
 		Data::write(static::TMP . '/_changes/article.en.txt', $fields);
 
-		$this->assertSame($fields, $this->storage->read('changes', 'en'));
+		$this->assertSame($fields, $this->storage->read(VersionId::changes(), 'en'));
 	}
 
 	/**
@@ -330,7 +245,7 @@ public function testReadChangesSingleLang()
 		Dir::make(static::TMP . '/_changes');
 		Data::write(static::TMP . '/_changes/article.txt', $fields);
 
-		$this->assertSame($fields, $this->storage->read('changes', 'default'));
+		$this->assertSame($fields, $this->storage->read(VersionId::changes(), 'default'));
 	}
 
 	/**
@@ -345,7 +260,7 @@ public function testReadPublishedMultiLang()
 
 		Data::write(static::TMP . '/article.en.txt', $fields);
 
-		$this->assertSame($fields, $this->storage->read('published', 'en'));
+		$this->assertSame($fields, $this->storage->read(VersionId::published(), 'en'));
 	}
 
 	/**
@@ -360,18 +275,7 @@ public function testReadPublishedSingleLang()
 
 		Data::write(static::TMP . '/article.txt', $fields);
 
-		$this->assertSame($fields, $this->storage->read('published', 'default'));
-	}
-
-	/**
-	 * @covers ::read
-	 */
-	public function testReadInvalidId()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid version identifier "invalid"');
-
-		$this->storage->read('invalid', 'default');
+		$this->assertSame($fields, $this->storage->read(VersionId::published(), 'default'));
 	}
 
 	/**
@@ -385,7 +289,7 @@ public function testTouchChangesMultiLang()
 
 		$minTime = time();
 
-		$this->storage->touch('changes', 'en');
+		$this->storage->touch(VersionId::changes(), 'en');
 
 		clearstatcache();
 		$this->assertGreaterThanOrEqual($minTime, filemtime(static::TMP . '/_changes/article.en.txt'));
@@ -402,7 +306,7 @@ public function testTouchChangesSingleLang()
 
 		$minTime = time();
 
-		$this->storage->touch('changes', 'default');
+		$this->storage->touch(VersionId::changes(), 'default');
 
 		clearstatcache();
 		$this->assertGreaterThanOrEqual($minTime, filemtime(static::TMP . '/_changes/article.txt'));
@@ -418,7 +322,7 @@ public function testTouchPublishedMultiLang()
 
 		$minTime = time();
 
-		$this->storage->touch('published', 'en');
+		$this->storage->touch(VersionId::published(), 'en');
 
 		clearstatcache();
 		$this->assertGreaterThanOrEqual($minTime, filemtime(static::TMP . '/article.en.txt'));
@@ -434,23 +338,12 @@ public function testTouchPublishedSingleLang()
 
 		$minTime = time();
 
-		$this->storage->touch('published', 'default');
+		$this->storage->touch(VersionId::published(), 'default');
 
 		clearstatcache();
 		$this->assertGreaterThanOrEqual($minTime, filemtime(static::TMP . '/article.txt'));
 	}
 
-	/**
-	 * @covers ::touch
-	 */
-	public function testTouchInvalidId()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid version identifier "invalid"');
-
-		$this->storage->touch('invalid', 'default');
-	}
-
 	/**
 	 * @covers ::update
 	 */
@@ -464,7 +357,7 @@ public function testUpdateChangesMultiLang()
 		Dir::make(static::TMP . '/_changes');
 		Data::write(static::TMP . '/_changes/article.en.txt', $fields);
 
-		$this->storage->update('changes', 'en', $fields);
+		$this->storage->update(VersionId::changes(), 'en', $fields);
 		$this->assertSame($fields, Data::read(static::TMP . '/_changes/article.en.txt'));
 	}
 
@@ -481,7 +374,7 @@ public function testUpdateChangesSingleLang()
 		Dir::make(static::TMP . '/_changes');
 		Data::write(static::TMP . '/_changes/article.txt', $fields);
 
-		$this->storage->update('changes', 'default', $fields);
+		$this->storage->update(VersionId::changes(), 'default', $fields);
 		$this->assertSame($fields, Data::read(static::TMP . '/_changes/article.txt'));
 	}
 
@@ -497,7 +390,7 @@ public function testUpdatePublishedMultiLang()
 
 		Data::write(static::TMP . '/article.en.txt', $fields);
 
-		$this->storage->update('published', 'en', $fields);
+		$this->storage->update(VersionId::published(), 'en', $fields);
 		$this->assertSame($fields, Data::read(static::TMP . '/article.en.txt'));
 	}
 
@@ -513,26 +406,15 @@ public function testUpdatePublishedSingleLang()
 
 		Data::write(static::TMP . '/article.txt', $fields);
 
-		$this->storage->update('published', 'default', $fields);
+		$this->storage->update(VersionId::published(), 'default', $fields);
 		$this->assertSame($fields, Data::read(static::TMP . '/article.txt'));
 	}
 
-	/**
-	 * @covers ::update
-	 */
-	public function testUpdateInvalidId()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid version identifier "invalid"');
-
-		$this->storage->update('invalid', 'default', []);
-	}
-
 	/**
 	 * @covers ::contentFile
 	 * @dataProvider contentFileProvider
 	 */
-	public function testContentFile(string $type, string $id, string $language, string $expected)
+	public function testContentFile(string $type, VersionId $id, string $language, string $expected)
 	{
 		$app = new App([
 			'roots' => [
@@ -566,22 +448,22 @@ public function testContentFile(string $type, string $id, string $language, stri
 	public static function contentFileProvider(): array
 	{
 		return [
-			['file', 'changes', 'default', 'content/_changes/image.jpg.txt'],
-			['file', 'changes', 'en', 'content/_changes/image.jpg.en.txt'],
-			['file', 'published', 'default', 'content/image.jpg.txt'],
-			['file', 'published', 'en', 'content/image.jpg.en.txt'],
-			['page', 'changes', 'default', 'content/a-page/_changes/article.txt'],
-			['page', 'changes', 'en', 'content/a-page/_changes/article.en.txt'],
-			['page', 'published', 'default', 'content/a-page/article.txt'],
-			['page', 'published', 'en', 'content/a-page/article.en.txt'],
-			['site', 'changes', 'default', 'content/_changes/site.txt'],
-			['site', 'changes', 'en', 'content/_changes/site.en.txt'],
-			['site', 'published', 'default', 'content/site.txt'],
-			['site', 'published', 'en', 'content/site.en.txt'],
-			['user', 'changes', 'default', 'site/accounts/abcdefgh/_changes/user.txt'],
-			['user', 'changes', 'en', 'site/accounts/abcdefgh/_changes/user.en.txt'],
-			['user', 'published', 'default', 'site/accounts/abcdefgh/user.txt'],
-			['user', 'published', 'en', 'site/accounts/abcdefgh/user.en.txt'],
+			['file', VersionId::changes(), 'default', 'content/_changes/image.jpg.txt'],
+			['file', VersionId::changes(), 'en', 'content/_changes/image.jpg.en.txt'],
+			['file', VersionId::published(), 'default', 'content/image.jpg.txt'],
+			['file', VersionId::published(), 'en', 'content/image.jpg.en.txt'],
+			['page', VersionId::changes(), 'default', 'content/a-page/_changes/article.txt'],
+			['page', VersionId::changes(), 'en', 'content/a-page/_changes/article.en.txt'],
+			['page', VersionId::published(), 'default', 'content/a-page/article.txt'],
+			['page', VersionId::published(), 'en', 'content/a-page/article.en.txt'],
+			['site', VersionId::changes(), 'default', 'content/_changes/site.txt'],
+			['site', VersionId::changes(), 'en', 'content/_changes/site.en.txt'],
+			['site', VersionId::published(), 'default', 'content/site.txt'],
+			['site', VersionId::published(), 'en', 'content/site.en.txt'],
+			['user', VersionId::changes(), 'default', 'site/accounts/abcdefgh/_changes/user.txt'],
+			['user', VersionId::changes(), 'en', 'site/accounts/abcdefgh/_changes/user.en.txt'],
+			['user', VersionId::published(), 'default', 'site/accounts/abcdefgh/user.txt'],
+			['user', VersionId::published(), 'en', 'site/accounts/abcdefgh/user.en.txt'],
 		];
 	}
 
@@ -605,7 +487,7 @@ public function testContentFileDraft(string $language, string $expected)
 		]);
 
 		$storage = new PlainTextContentStorageHandler($model);
-		$this->assertSame(static::TMP . '/' . $expected, $storage->contentFile('changes', $language));
+		$this->assertSame(static::TMP . '/' . $expected, $storage->contentFile(VersionId::changes(), $language));
 	}
 
 	/**
@@ -632,7 +514,7 @@ public function testContentFileDraftPublished(string $language, string $expected
 
 		$this->expectException(LogicException::class);
 		$this->expectExceptionMessage('Drafts cannot have a published content file');
-		$storage->contentFile('published', $language);
+		$storage->contentFile(VersionId::published(), $language);
 	}
 
 	public static function contentFileDraftProvider(): array
@@ -642,18 +524,6 @@ public static function contentFileDraftProvider(): array
 			['en', 'content/_drafts/a-page/article.en.txt'],
 		];
 	}
-
-	/**
-	 * @covers ::contentFile
-	 */
-	public function testContentFileInvalidId()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid version identifier "invalid"');
-
-		$this->storage->contentFile('invalid', 'default');
-	}
-
 	/**
 	 * @covers ::contentFiles
 	 */
@@ -674,7 +544,7 @@ public function testContentFilesChangesMultiLang()
 		$this->assertSame([
 			static::TMP . '/_changes/article.en.txt',
 			static::TMP . '/_changes/article.de.txt'
-		], $this->storage->contentFiles('changes'));
+		], $this->storage->contentFiles(VersionId::changes()));
 	}
 
 	/**
@@ -684,7 +554,7 @@ public function testContentFilesChangesSingleLang()
 	{
 		$this->assertSame([
 			static::TMP . '/_changes/article.txt'
-		], $this->storage->contentFiles('changes'));
+		], $this->storage->contentFiles(VersionId::changes()));
 	}
 
 	/**
@@ -707,7 +577,7 @@ public function testContentFilesPublishedMultiLang()
 		$this->assertSame([
 			static::TMP . '/article.en.txt',
 			static::TMP . '/article.de.txt'
-		], $this->storage->contentFiles('published'));
+		], $this->storage->contentFiles(VersionId::published()));
 	}
 
 	/**
@@ -717,17 +587,6 @@ public function testContentFilesPublishedSingleLang()
 	{
 		$this->assertSame([
 			static::TMP . '/article.txt'
-		], $this->storage->contentFiles('published'));
-	}
-
-	/**
-	 * @covers ::contentFiles
-	 */
-	public function testContentFilesInvalidId()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid version identifier "invalid"');
-
-		$this->storage->contentFiles('invalid');
+		], $this->storage->contentFiles(VersionId::published()));
 	}
 }
diff --git a/tests/Content/VersionIdTest.php b/tests/Content/VersionIdTest.php
new file mode 100644
index 0000000000..43d274e003
--- /dev/null
+++ b/tests/Content/VersionIdTest.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Kirby\Content;
+
+use Kirby\Cms\File;
+use Kirby\Cms\Page;
+use Kirby\Exception\InvalidArgumentException;
+use Kirby\TestCase;
+
+/**
+ * @coversDefaultClass Kirby\Content\VersionId
+ */
+class VersionIdTest extends TestCase
+{
+	/**
+	 * @covers ::changes
+	 * @covers ::value
+	 */
+	public function testChanges()
+	{
+		$version = VersionId::changes();
+
+		$this->assertSame('changes', $version->value());
+	}
+
+	/**
+	 * @covers ::__construct
+	 */
+	public function testConstructWithInvalidId()
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('Invalid Version ID');
+
+		new VersionId('foo');
+	}
+
+	/**
+	 * @covers ::default
+	 */
+	public function testDefault()
+	{
+		$draft   = new Page(['slug' => 'test', 'isDraft' => true]);
+		$version = VersionId::default($draft);
+
+		$this->assertTrue($version->is(VersionId::CHANGES));
+
+		$unlisted = new Page(['slug' => 'test', 'isDraft' => false]);
+		$version  = VersionId::default($unlisted);
+
+		$this->assertTrue($version->is(VersionId::PUBLISHED));
+
+		$file    = new File(['filename' => 'foo.jpg', 'parent' => $unlisted]);
+		$version = VersionId::default($file);
+
+		$this->assertTrue($version->is(VersionId::PUBLISHED));
+	}
+
+	/**
+	 * @covers ::from
+	 * @covers ::value
+	 */
+	public function testFrom()
+	{
+		$version = VersionId::from('published');
+
+		$this->assertSame('published', $version->value());
+	}
+
+	/**
+	 * @covers ::is
+	 */
+	public function testIs()
+	{
+		$version = VersionId::published();
+
+		$this->assertTrue($version->is('published'));
+		$this->assertTrue($version->is(VersionId::PUBLISHED));
+		$this->assertFalse($version->is('something-else'));
+		$this->assertFalse($version->is(VersionId::CHANGES));
+	}
+
+	/**
+	 * @covers ::published
+	 * @covers ::value
+	 */
+	public function testPublished()
+	{
+		$version = VersionId::published();
+
+		$this->assertSame('published', $version->value());
+	}
+
+	/**
+	 * @covers ::__toString
+	 */
+	public function testToString()
+	{
+		$this->assertSame('published', (string)VersionId::published());
+		$this->assertSame('changes', (string)VersionId::changes());
+	}
+}
diff --git a/tests/Filesystem/FTest.php b/tests/Filesystem/FTest.php
index e4f8290fab..f4cc8529e3 100644
--- a/tests/Filesystem/FTest.php
+++ b/tests/Filesystem/FTest.php
@@ -763,14 +763,17 @@ public function testSafeName()
 		// without extension
 		$this->assertSame('uber-genious', F::safeName('über genious'));
 
-		// with leading dash
-		$this->assertSame('super.jpg', F::safeName('-super.jpg'));
+		// with leading and trailing dash
+		$this->assertSame('super.jpg', F::safeName('-super.jpg-'));
+
+		// with leading and trailing underscore
+		$this->assertSame('super.jpg', F::safeName('_super.jpg_'));
 
-		// with leading underscore
-		$this->assertSame('super.jpg', F::safeName('_super.jpg'));
+		// with leading and trailing dot
+		$this->assertSame('super.jpg', F::safeName('.super.jpg.'));
 
-		// with leading dot
-		$this->assertSame('super.jpg', F::safeName('.super.jpg'));
+		// leave allowed characters untouched
+		$this->assertSame('file.a@b_c-d.jpg', F::safeName('file.a@b_c-d.jpg'));
 	}
 
 	/**
@@ -786,6 +789,8 @@ public function testSafeBasename()
 
 		// without extension
 		$this->assertSame('uber-genious', F::safeBasename('über genious'));
+		$this->assertSame('uber', F::safeBasename('über.genious'));
+		$this->assertSame('uber.genious', F::safeBasename('über.genious', false));
 
 		// with leading dash
 		$this->assertSame('super', F::safeBasename('-super.jpg'));
@@ -801,6 +806,7 @@ public function testSafeExtension()
 
 		$this->assertSame('txt', F::safeExtension('über genious.txt'));
 		$this->assertSame('taxt', F::safeExtension('über genious.täxt'));
+		$this->assertSame('taxt', F::safeExtension('täxt', false));
 		$this->assertSame('', F::safeExtension('über genious'));
 		$this->assertSame('jpg', F::safeExtension('-super.jpg'));
 	}
diff --git a/tests/Image/QrCodeTest.php b/tests/Image/QrCodeTest.php
index 2b573af41a..69905a3395 100644
--- a/tests/Image/QrCodeTest.php
+++ b/tests/Image/QrCodeTest.php
@@ -72,6 +72,15 @@ public function testToImageColors()
 		$this->assertSame($expected, $data);
 	}
 
+	public function testToImageBorder()
+	{
+		$qr       = new QrCode('https://getkirby.com');
+		$image    = $qr->toImage(null, '#000000', '#ffffff', 0);
+		$data     = $this->imageContent($image);
+		$expected = F::read(static::FIXTURES . '/image-border.png');
+		$this->assertSame($expected, $data);
+	}
+
 	public function testToSvg()
 	{
 		$qr = new QrCode('12345678');
diff --git a/tests/Image/fixtures/qr/image-border.png b/tests/Image/fixtures/qr/image-border.png
new file mode 100644
index 0000000000..cb1227f792
Binary files /dev/null and b/tests/Image/fixtures/qr/image-border.png differ
diff --git a/tests/Panel/FileTest.php b/tests/Panel/FileTest.php
index 0af2238168..56f4c18526 100644
--- a/tests/Panel/FileTest.php
+++ b/tests/Panel/FileTest.php
@@ -43,6 +43,17 @@ public function tearDown(): void
 		Dir::remove(static::TMP);
 	}
 
+	protected function panel(array $props = [])
+	{
+		$page = new ModelPage([
+			'slug'  => 'test',
+			'files' => [
+				['filename' => 'test.jpg', ...$props],
+			]
+		]);
+		return new File($page->file('test.jpg'));
+	}
+
 	/**
 	 * @covers ::breadcrumb
 	 */
@@ -117,6 +128,18 @@ public function testBreadcrumbForUserFile(): void
 		], $file->breadcrumb());
 	}
 
+	/**
+	 * @covers ::buttons
+	 */
+	public function testButtons()
+	{
+		$this->assertSame([
+			'preview',
+			'settings',
+			'languages'
+		], $this->panel()->buttons());
+	}
+
 	/**
 	 * @covers ::dragText
 	 */
diff --git a/tests/Panel/ModelTest.php b/tests/Panel/ModelTest.php
index ea0e694fe0..0eec3d104f 100644
--- a/tests/Panel/ModelTest.php
+++ b/tests/Panel/ModelTest.php
@@ -67,6 +67,11 @@ public function lock(): ContentLock|null
 
 class CustomPanelModel extends Model
 {
+	public function buttons(): array
+	{
+		return [];
+	}
+
 	public function path(): string
 	{
 		return 'custom';
diff --git a/tests/Panel/PageTest.php b/tests/Panel/PageTest.php
index c0c782cd20..279f6b75ea 100644
--- a/tests/Panel/PageTest.php
+++ b/tests/Panel/PageTest.php
@@ -42,6 +42,12 @@ public function tearDown(): void
 		Dir::remove(static::TMP);
 	}
 
+	protected function panel(array $props = [])
+	{
+		$page = new ModelPage(['slug' => 'test', ...$props]);
+		return new Page($page);
+	}
+
 	/**
 	 * @covers ::breadcrumb
 	 */
@@ -88,6 +94,19 @@ public function testBreadcrumb(): void
 		], $page->breadcrumb());
 	}
 
+	/**
+	 * @covers ::buttons
+	 */
+	public function testButtons()
+	{
+		$this->assertSame([
+			'preview',
+			'settings',
+			'languages',
+			'status'
+		], $this->panel()->buttons());
+	}
+
 	/**
 	 * @covers ::dragText
 	 */
diff --git a/tests/Panel/SiteTest.php b/tests/Panel/SiteTest.php
index 75ff2abc43..85c6180d68 100644
--- a/tests/Panel/SiteTest.php
+++ b/tests/Panel/SiteTest.php
@@ -39,6 +39,17 @@ protected function panel(array $props = [])
 		return new Site($site);
 	}
 
+	/**
+	 * @covers ::buttons
+	 */
+	public function testButtons()
+	{
+		$this->assertSame([
+			'preview',
+			'languages',
+		], $this->panel()->buttons());
+	}
+
 	/**
 	 * @covers ::dropdownOption
 	 */
diff --git a/tests/Panel/UserTest.php b/tests/Panel/UserTest.php
index a35194c785..df605a985c 100644
--- a/tests/Panel/UserTest.php
+++ b/tests/Panel/UserTest.php
@@ -45,6 +45,12 @@ public function tearDown(): void
 		Dir::remove(static::TMP);
 	}
 
+	protected function panel(array $props = [])
+	{
+		$user = new ModelUser(['id' => 'test', ...$props]);
+		return new User($user);
+	}
+
 	/**
 	 * @covers ::breadcrumb
 	 */
@@ -59,6 +65,18 @@ public function testBreadcrumb(): void
 		$this->assertStringStartsWith('/users/', $breadcrumb[0]['link']);
 	}
 
+	/**
+	 * @covers ::buttons
+	 */
+	public function testButtons()
+	{
+		$this->assertSame([
+			'theme',
+			'settings',
+			'languages',
+		], $this->panel()->buttons());
+	}
+
 	/**
 	 * @covers ::dropdown
 	 */
diff --git a/tests/Toolkit/StrTest.php b/tests/Toolkit/StrTest.php
index 2772a67a7d..9f1179faad 100644
--- a/tests/Toolkit/StrTest.php
+++ b/tests/Toolkit/StrTest.php
@@ -1182,7 +1182,10 @@ public function testSlug()
 		// Allow underscores
 		$this->assertSame('a_b', Str::slug('a_b', '-', 'a-z0-9_'));
 
-		// store default defaults
+		// Trim non-alphanum characters
+		$this->assertSame('a@b-c.b', Str::slug('.a@b c.b-', '-', 'a-z0-9@._-'));
+
+		// Store default defaults
 		$defaults = Str::$defaults['slug'];
 
 		// Custom str defaults