diff --git a/Cargo.lock b/Cargo.lock
index 726ebeeed2..b3eefef689 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4806,7 +4806,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.6.5",
  "system-configuration",
  "tokio",
  "tower-service",
@@ -8016,7 +8016,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls 0.23.32",
- "socket2 0.5.10",
+ "socket2 0.6.5",
  "thiserror 2.0.17",
  "tokio",
  "tracing",
@@ -8053,7 +8053,7 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.10",
+ "socket2 0.6.5",
  "tracing",
  "windows-sys 0.60.2",
 ]
@@ -11020,6 +11020,7 @@ dependencies = [
  "heck 0.5.0",
  "hickory-resolver 0.25.2",
  "httpdate",
+ "image",
  "indicatif",
  "itertools 0.14.0",
  "modrinth-content-management",
diff --git a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
index 3f864c6472..31e481431f 100644
--- a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
+++ b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
@@ -1,5 +1,9 @@
 <template>
-	<ModalWrapper ref="detectJavaModal" header="Select java version" :show-ad-on-close="false">
+	<ModalWrapper
+		ref="detectJavaModal"
+		:header="formatMessage(messages.title)"
+		:show-ad-on-close="false"
+	>
 		<div class="flex flex-col gap-4">
 			<Table :columns="javaInstallColumns" :data="chosenInstallOptions" row-key="path">
 				<template #cell-version="{ value }">
@@ -11,15 +15,23 @@
 				<template #cell-actions="{ row }">
 					<div class="flex items-center justify-end">
 						<ButtonStyled v-if="currentSelected.path === row.path">
-							<button class="!shadow-none" disabled><CheckIcon /> Selected</button>
+							<button class="!shadow-none" disabled>
+								<CheckIcon aria-hidden="true" />
+								{{ formatMessage(messages.selected) }}
+							</button>
 						</ButtonStyled>
 						<ButtonStyled v-else>
-							<button class="!shadow-none" @click="setJavaInstall(row)"><PlusIcon /> Select</button>
+							<button class="!shadow-none" @click="setJavaInstall(row)">
+								<PlusIcon aria-hidden="true" />
+								{{ formatMessage(messages.select) }}
+							</button>
 						</ButtonStyled>
 					</div>
 				</template>
 				<template #empty-state>
-					<div class="p-4 text-secondary">No java installations found!</div>
+					<div class="p-4 text-secondary">
+						{{ formatMessage(messages.noInstallationsFound) }}
+					</div>
 				</template>
 			</Table>
 			<div class="flex justify-end">
@@ -28,8 +40,8 @@
 						class="!shadow-none !border-surface-4 !border"
 						@click="$refs.detectJavaModal.hide()"
 					>
-						<XIcon />
-						Cancel
+						<XIcon aria-hidden="true" />
+						{{ formatMessage(messages.cancel) }}
 					</button>
 				</ButtonStyled>
 			</div>
@@ -38,23 +50,70 @@
 </template>
 <script setup>
 import { CheckIcon, PlusIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, injectNotificationManager, Table } from '@modrinth/ui'
-import { ref } from 'vue'
+import {
+	ButtonStyled,
+	defineMessages,
+	injectNotificationManager,
+	Table,
+	useVIntl,
+} from '@modrinth/ui'
+import { computed, ref } from 'vue'
 
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { trackEvent } from '@/helpers/analytics'
 import { find_filtered_jres } from '@/helpers/jre.js'
 
 const { handleError } = injectNotificationManager()
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	title: {
+		id: 'app.java-detection.title',
+		defaultMessage: 'Select Java installation',
+	},
+	versionColumn: {
+		id: 'app.java-detection.columns.version',
+		defaultMessage: 'Version',
+	},
+	pathColumn: {
+		id: 'app.java-detection.columns.path',
+		defaultMessage: 'Path',
+	},
+	actionsColumn: {
+		id: 'app.java-detection.columns.actions',
+		defaultMessage: 'Actions',
+	},
+	selected: {
+		id: 'app.java-detection.selected',
+		defaultMessage: 'Selected',
+	},
+	select: {
+		id: 'app.java-detection.select',
+		defaultMessage: 'Select',
+	},
+	noInstallationsFound: {
+		id: 'app.java-detection.no-installations-found',
+		defaultMessage: 'No Java installations found.',
+	},
+	cancel: {
+		id: 'app.java-detection.cancel',
+		defaultMessage: 'Cancel',
+	},
+})
 
 const chosenInstallOptions = ref([])
 const detectJavaModal = ref(null)
 const currentSelected = ref({})
-const javaInstallColumns = [
-	{ key: 'version', label: 'Version', width: '9rem' },
-	{ key: 'path', label: 'Path' },
-	{ key: 'actions', label: 'Actions', align: 'right', width: '10rem' },
-]
+const javaInstallColumns = computed(() => [
+	{ key: 'version', label: formatMessage(messages.versionColumn), width: '9rem' },
+	{ key: 'path', label: formatMessage(messages.pathColumn) },
+	{
+		key: 'actions',
+		label: formatMessage(messages.actionsColumn),
+		align: 'right',
+		width: '10rem',
+	},
+])
 
 defineExpose({
 	show: async (version, currentSelectedJava) => {
diff --git a/apps/app-frontend/src/components/ui/JavaSelector.vue b/apps/app-frontend/src/components/ui/JavaSelector.vue
index 193095d8ce..e29aa2d6f0 100644
--- a/apps/app-frontend/src/components/ui/JavaSelector.vue
+++ b/apps/app-frontend/src/components/ui/JavaSelector.vue
@@ -6,7 +6,7 @@
 				autocomplete="off"
 				:disabled="props.disabled"
 				:model-value="props.modelValue ? props.modelValue.path : ''"
-				:placeholder="placeholder ?? '/path/to/java'"
+				:placeholder="placeholder ?? formatMessage(messages.pathPlaceholder)"
 				wrapper-class="installation-input"
 				@update:model-value="
 					(val) => {
@@ -28,6 +28,7 @@
 				color-fill="text"
 			>
 				<button
+					:aria-label="formatMessage(messages.testJavaInstallation)"
 					class="!shadow-none"
 					:disabled="testingJava || props.disabled"
 					@click="runTest(props.modelValue?.path)"
@@ -47,25 +48,31 @@
 		<span class="installation-buttons">
 			<ButtonStyled v-if="props.version">
 				<button
-					v-tooltip="testingJavaSuccess === true ? 'Already installed' : undefined"
+					v-tooltip="
+						testingJavaSuccess === true ? formatMessage(messages.alreadyInstalled) : undefined
+					"
 					class="!shadow-none"
 					:disabled="props.disabled || installingJava || testingJavaSuccess === true"
 					@click="reinstallJava"
 				>
 					<DownloadIcon />
-					{{ installingJava ? 'Installing...' : 'Install recommended' }}
+					{{
+						installingJava
+							? formatMessage(messages.installing)
+							: formatMessage(messages.installRecommended)
+					}}
 				</button>
 			</ButtonStyled>
 			<ButtonStyled>
 				<button class="!shadow-none" :disabled="props.disabled" @click="autoDetect">
 					<SearchIcon />
-					Detect
+					{{ formatMessage(messages.detect) }}
 				</button>
 			</ButtonStyled>
 			<ButtonStyled>
 				<button class="!shadow-none" :disabled="props.disabled" @click="handleJavaFileInput()">
 					<FolderSearchIcon />
-					Browse
+					{{ formatMessage(messages.browse) }}
 				</button>
 			</ButtonStyled>
 		</span>
@@ -82,7 +89,13 @@ import {
 	SpinnerIcon,
 	XCircleIcon,
 } from '@modrinth/assets'
-import { ButtonStyled, injectNotificationManager, StyledInput } from '@modrinth/ui'
+import {
+	ButtonStyled,
+	defineMessages,
+	injectNotificationManager,
+	StyledInput,
+	useVIntl,
+} from '@modrinth/ui'
 import { open } from '@tauri-apps/plugin-dialog'
 import { ref, watch } from 'vue'
 
@@ -92,6 +105,38 @@ import { trackEvent } from '@/helpers/analytics'
 import { auto_install_java, find_filtered_jres, get_jre } from '@/helpers/jre.js'
 
 const { handleError } = injectNotificationManager()
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	pathPlaceholder: {
+		id: 'app.java-selector.path.placeholder',
+		defaultMessage: '/path/to/java',
+	},
+	testJavaInstallation: {
+		id: 'app.java-selector.test-installation',
+		defaultMessage: 'Test Java installation',
+	},
+	alreadyInstalled: {
+		id: 'app.java-selector.already-installed',
+		defaultMessage: 'Already installed',
+	},
+	installing: {
+		id: 'app.java-selector.installing',
+		defaultMessage: 'Installing...',
+	},
+	installRecommended: {
+		id: 'app.java-selector.install-recommended',
+		defaultMessage: 'Install recommended',
+	},
+	detect: {
+		id: 'app.java-selector.detect',
+		defaultMessage: 'Detect',
+	},
+	browse: {
+		id: 'app.java-selector.browse',
+		defaultMessage: 'Browse',
+	},
+})
 
 const props = defineProps({
 	id: {
diff --git a/apps/app-frontend/src/components/ui/instance-page-header/index.vue b/apps/app-frontend/src/components/ui/instance-page-header/index.vue
index 1cb84df1ba..59eea07309 100644
--- a/apps/app-frontend/src/components/ui/instance-page-header/index.vue
+++ b/apps/app-frontend/src/components/ui/instance-page-header/index.vue
@@ -15,12 +15,12 @@
 			</PageHeaderBadgeItem>
 			<PageHeaderBadgeItem
 				v-else
-				:icon="UnknownIcon"
 				:tooltip="sharedInstanceTooltip"
 				aria-label="Shared instance information"
 				class="!border-blue !bg-highlight-blue !text-blue"
 			>
 				Shared
+				<UnknownIcon class="block size-4 shrink-0 text-current" aria-hidden="true" />
 			</PageHeaderBadgeItem>
 		</template>
 
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/index.vue b/apps/app-frontend/src/components/ui/instance/instance-admonitions/index.vue
index 4d73ef6886..e16171bc5b 100644
--- a/apps/app-frontend/src/components/ui/instance/instance-admonitions/index.vue
+++ b/apps/app-frontend/src/components/ui/instance/instance-admonitions/index.vue
@@ -6,6 +6,11 @@
 				:instance="instance"
 				@published="emit('published')"
 			/>
+			<InstanceAdmonitionsSharedInstanceUpdateAvailable
+				v-else-if="item.kind === 'shared-instance-update-available'"
+				:instance-name="instance.name"
+				@review="emit('review-update', $event)"
+			/>
 			<InstanceAdmonitionsSharedInstanceWrongAccount
 				v-else-if="item.kind === 'shared-instance-wrong-account'"
 				:expected-user-id="sharedInstanceExpectedUserId"
@@ -33,6 +38,7 @@ import type { GameInstance } from '@/helpers/types'
 
 import InstanceAdmonitionsSharedInstanceStale from './instance-admonitions-shared-instance-stale.vue'
 import InstanceAdmonitionsSharedInstanceUnavailable from './instance-admonitions-shared-instance-unavailable.vue'
+import InstanceAdmonitionsSharedInstanceUpdateAvailable from './instance-admonitions-shared-instance-update-available.vue'
 import InstanceAdmonitionsSharedInstanceWrongAccount from './instance-admonitions-shared-instance-wrong-account.vue'
 import type { InstanceAdmonitionItem, SharedInstanceRole } from './types'
 
@@ -48,11 +54,13 @@ const props = defineProps<{
 	sharedInstanceExpectedUserId?: string | null
 	sharedInstanceRole?: SharedInstanceRole | null
 	sharedInstanceSignedOut?: boolean
+	sharedInstanceUpdateAvailable?: boolean
 }>()
 
 const emit = defineEmits<{
 	published: []
 	delete: []
+	'review-update': [event: MouseEvent]
 }>()
 
 const sharedInstanceWrongAccount = computed(() => props.sharedInstanceWrongAccount ?? false)
@@ -68,6 +76,14 @@ const showSharedInstancePublishAdmonition = computed(
 		props.instance.shared_instance?.role === 'owner' &&
 		props.instance.shared_instance.status === 'stale',
 )
+const showSharedInstanceUpdateAdmonition = computed(
+	() =>
+		!sharedInstanceWrongAccount.value &&
+		!displayedSharedInstanceUnavailableReason.value &&
+		props.instance.install_stage === 'installed' &&
+		props.sharedInstanceRole === 'member' &&
+		props.sharedInstanceUpdateAvailable === true,
+)
 
 const stackItems = computed<InstanceAdmonitionItem[]>(() => {
 	const items: InstanceAdmonitionItem[] = []
@@ -104,6 +120,15 @@ const stackItems = computed<InstanceAdmonitionItem[]>(() => {
 		})
 	}
 
+	if (showSharedInstanceUpdateAdmonition.value) {
+		items.push({
+			id: 'shared-instance-update-available',
+			type: 'info',
+			dismissible: false,
+			kind: 'shared-instance-update-available',
+		})
+	}
+
 	return items
 })
 
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-messages.ts b/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-messages.ts
index 5191ae9b26..011a57acaf 100644
--- a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-messages.ts
+++ b/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-messages.ts
@@ -21,6 +21,19 @@ export const instanceAdmonitionsMessages = defineMessages({
 		id: 'app.instance.admonitions.shared-instance.reviewing-button',
 		defaultMessage: 'Reviewing...',
 	},
+	sharedInstanceUpdateAvailableHeader: {
+		id: 'app.instance.admonitions.shared-instance.update-available-header',
+		defaultMessage: 'An update is available',
+	},
+	sharedInstanceUpdateAvailableBody: {
+		id: 'app.instance.admonitions.shared-instance.update-available-body',
+		defaultMessage:
+			'An update is required to play {name}. Please update to latest version to launch the game.',
+	},
+	sharedInstanceReviewUpdateButton: {
+		id: 'app.instance.admonitions.shared-instance.review-update-button',
+		defaultMessage: 'Review update',
+	},
 	sharedInstanceReviewHeader: {
 		id: 'app.instance.admonitions.shared-instance.review-header',
 		defaultMessage: 'Review changes',
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-update-available.vue b/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-update-available.vue
new file mode 100644
index 0000000000..ffb96f4329
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-update-available.vue
@@ -0,0 +1,34 @@
+<template>
+	<Admonition
+		type="info"
+		inline-actions
+		:header="formatMessage(messages.sharedInstanceUpdateAvailableHeader)"
+	>
+		{{ formatMessage(messages.sharedInstanceUpdateAvailableBody, { name: instanceName }) }}
+		<template #actions>
+			<ButtonStyled color="blue">
+				<button class="!h-10" @click="emit('review', $event)">
+					<DownloadIcon aria-hidden="true" />
+					{{ formatMessage(messages.sharedInstanceReviewUpdateButton) }}
+				</button>
+			</ButtonStyled>
+		</template>
+	</Admonition>
+</template>
+
+<script setup lang="ts">
+import { DownloadIcon } from '@modrinth/assets'
+import { Admonition, ButtonStyled, useVIntl } from '@modrinth/ui'
+
+import { instanceAdmonitionsMessages as messages } from './instance-admonitions-messages'
+
+defineProps<{
+	instanceName: string
+}>()
+
+const emit = defineEmits<{
+	review: [event: MouseEvent]
+}>()
+
+const { formatMessage } = useVIntl()
+</script>
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/types.ts b/apps/app-frontend/src/components/ui/instance/instance-admonitions/types.ts
index ea7eb81be1..02948b3e8d 100644
--- a/apps/app-frontend/src/components/ui/instance/instance-admonitions/types.ts
+++ b/apps/app-frontend/src/components/ui/instance/instance-admonitions/types.ts
@@ -2,6 +2,7 @@ import type { StackedAdmonitionItem } from '@modrinth/ui'
 
 export type InstanceAdmonitionKind =
 	| 'shared-instance-stale'
+	| 'shared-instance-update-available'
 	| 'shared-instance-unavailable'
 	| 'shared-instance-wrong-account'
 
diff --git a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
index 3c84d90668..8568ebefa6 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
@@ -109,9 +109,13 @@ watch(selectedReleaseChannel, async (channel, previousChannel) => {
 })
 
 async function resetIcon() {
-	icon.value = undefined
-	await edit_icon(instance.value.id, null).catch(handleError)
-	trackEvent('InstanceRemoveIcon')
+	try {
+		await edit_icon(instance.value.id, null)
+		icon.value = undefined
+		trackEvent('InstanceRemoveIcon')
+	} catch (error) {
+		handleError(error)
+	}
 }
 
 async function setIcon() {
@@ -127,10 +131,13 @@ async function setIcon() {
 
 	if (!value) return
 
-	icon.value = value
-	await edit_icon(instance.value.id, icon.value).catch(handleError)
-
-	trackEvent('InstanceSetIcon')
+	try {
+		await edit_icon(instance.value.id, value)
+		icon.value = value
+		trackEvent('InstanceSetIcon')
+	} catch (error) {
+		handleError(error)
+	}
 }
 
 const editInstanceObject = computed(() => ({
diff --git a/apps/app-frontend/src/components/ui/instance_settings/SharingSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/SharingSettings.vue
index aef391eea7..0886c82e3c 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/SharingSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/SharingSettings.vue
@@ -1,31 +1,156 @@
 <template>
-	<div>
+	<div class="flex flex-col gap-8">
+		<section class="flex flex-col gap-4">
+			<div class="flex flex-col gap-1">
+				<h3 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.activeInvitesTitle) }}
+				</h3>
+				<p class="m-0 text-secondary">
+					{{ formatMessage(messages.activeInvitesDescription) }}
+				</p>
+			</div>
+
+			<Table :columns="inviteColumns" :data="activeInvites" row-key="id" table-min-width="36rem">
+				<template #empty-state>
+					<div class="flex h-40 items-center justify-center text-secondary">
+						{{ formatMessage(messages.noActiveInvites) }}
+					</div>
+				</template>
+				<template #cell-id="{ row }">
+					<CopyCode
+						:text="`${config.siteUrl}/share/${encodeURIComponent(row.id)}`"
+						:display-text="`/${row.id}`"
+					/>
+				</template>
+				<template #cell-uses="{ row }">
+					<span class="font-medium text-primary">{{ row.uses }}</span>
+					<span> / {{ row.maxUses }}</span>
+				</template>
+				<template #cell-expiration="{ row }">
+					<span v-tooltip="formatDateTime(row.expiration)" class="whitespace-nowrap">
+						{{ formatRelativeTime(row.expiration) }}
+					</span>
+				</template>
+				<template #cell-actions="{ row }">
+					<div class="flex justify-end">
+						<ButtonStyled circular type="transparent">
+							<button
+								v-tooltip="formatMessage(messages.revokeInvite)"
+								:aria-label="
+									formatMessage(messages.revokeInviteWithCode, {
+										code: row.id,
+									})
+								"
+								class="text-secondary hover:!filter-none hover:text-red focus-visible:!filter-none"
+								@click="revokeInviteModal?.show(row.id)"
+							>
+								<XIcon aria-hidden="true" />
+							</button>
+						</ButtonStyled>
+					</div>
+				</template>
+			</Table>
+		</section>
+
 		<SharedInstanceInstallationSettingsControls
 			can-unpublish
 			:busy="isBusy"
 			:unpublishing="unpublishing"
 			:unpublish="unpublishSharedInstance"
 		/>
+
+		<ConfirmRevokeSharedInstanceInviteModal ref="revokeInviteModal" @revoke="revokeInvite" />
 	</div>
 </template>
 
 <script setup lang="ts">
-import { injectNotificationManager } from '@modrinth/ui'
+import { XIcon } from '@modrinth/assets'
+import {
+	ButtonStyled,
+	CopyCode,
+	defineMessages,
+	Table,
+	type TableColumn,
+	useFormatDateTime,
+	useRelativeTime,
+	useVIntl,
+} from '@modrinth/ui'
 import { useQueryClient } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
 
+import ConfirmRevokeSharedInstanceInviteModal from '@/components/ui/shared-instances/ConfirmRevokeSharedInstanceInviteModal.vue'
 import SharedInstanceInstallationSettingsControls from '@/components/ui/shared-instances/SharedInstanceInstallationSettingsControls.vue'
-import { unpublish_shared_instance } from '@/helpers/instance'
+import { config } from '@/config'
+import { type SharedInstanceInvite, unpublish_shared_instance } from '@/helpers/instance'
+import { useSharedInstanceErrors } from '@/helpers/shared-instance-errors'
 import { injectInstanceSettings } from '@/providers/instance-settings'
 
 const { instance, offline, onUnlinked } = injectInstanceSettings()
-const { handleError } = injectNotificationManager()
+const { notifySharedInstanceError } = useSharedInstanceErrors()
+const { formatMessage } = useVIntl()
 const queryClient = useQueryClient()
 const unpublishing = ref(false)
+const revokeInviteModal = ref<InstanceType<typeof ConfirmRevokeSharedInstanceInviteModal>>()
+const formatRelativeTime = useRelativeTime()
+const formatDateTime = useFormatDateTime({ dateStyle: 'medium', timeStyle: 'short' })
 const isBusy = computed(
 	() => instance.value.install_stage !== 'installed' || unpublishing.value || !!offline,
 )
 
+type InviteTableColumn = 'id' | 'uses' | 'expiration' | 'actions'
+
+const inviteColumns = computed<TableColumn<InviteTableColumn>[]>(() => [
+	{
+		key: 'id',
+		label: formatMessage(messages.inviteCodeLabel),
+		width: 'clamp(11rem, 34%, 19rem)',
+	},
+	{
+		key: 'uses',
+		label: formatMessage(messages.usesLabel),
+		width: 'clamp(7rem, 18%, 10rem)',
+	},
+	{
+		key: 'expiration',
+		label: formatMessage(messages.expiresLabel),
+		width: 'clamp(9rem, 28%, 14rem)',
+	},
+	{
+		key: 'actions',
+		label: formatMessage(messages.actionsLabel),
+		align: 'right',
+		width: '5.5rem',
+	},
+])
+
+const now = Date.now()
+
+// TODO: Use actual endpoint
+const activeInvites = ref<SharedInstanceInvite[]>([
+	{
+		id: 'wqHPxNagZr',
+		expiration: new Date(now + 6 * 24 * 60 * 60 * 1000).toISOString(),
+		maxUses: 10,
+		uses: 0,
+	},
+	{
+		id: 'GbRGfY7hbs',
+		expiration: new Date(now + 3 * 24 * 60 * 60 * 1000).toISOString(),
+		maxUses: 10,
+		uses: 2,
+	},
+	{
+		id: 'k9mvD2QxLc',
+		expiration: new Date(now + 90 * 60 * 1000).toISOString(),
+		maxUses: 5,
+		uses: 4,
+	},
+])
+
+function revokeInvite(inviteId: string) {
+	activeInvites.value = activeInvites.value.filter((invite) => invite.id !== inviteId)
+}
+
 async function unpublishSharedInstance() {
 	unpublishing.value = true
 	try {
@@ -34,9 +159,48 @@ async function unpublishSharedInstance() {
 		await queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', instance.value.id] })
 		onUnlinked()
 	} catch (error) {
-		handleError(error)
+		notifySharedInstanceError(error)
 	} finally {
 		unpublishing.value = false
 	}
 }
+
+const messages = defineMessages({
+	activeInvitesTitle: {
+		id: 'instance.settings.sharing.active-invites.title',
+		defaultMessage: 'Active invites',
+	},
+	activeInvitesDescription: {
+		id: 'instance.settings.sharing.active-invites.description',
+		defaultMessage: 'Anyone with one of these invite links can join while it remains active.',
+	},
+	inviteCodeLabel: {
+		id: 'instance.settings.sharing.active-invites.code',
+		defaultMessage: 'Invite link',
+	},
+	usesLabel: {
+		id: 'instance.settings.sharing.active-invites.uses',
+		defaultMessage: 'Uses',
+	},
+	expiresLabel: {
+		id: 'instance.settings.sharing.active-invites.expires',
+		defaultMessage: 'Expires',
+	},
+	actionsLabel: {
+		id: 'instance.settings.sharing.active-invites.actions',
+		defaultMessage: 'Actions',
+	},
+	noActiveInvites: {
+		id: 'instance.settings.sharing.active-invites.empty',
+		defaultMessage: 'There are no active invites.',
+	},
+	revokeInvite: {
+		id: 'instance.settings.sharing.active-invites.revoke',
+		defaultMessage: 'Revoke invite',
+	},
+	revokeInviteWithCode: {
+		id: 'instance.settings.sharing.active-invites.revoke-with-code',
+		defaultMessage: 'Revoke invite {code}',
+	},
+})
 </script>
diff --git a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
index 14f4f66f7c..6ea636cea2 100644
--- a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
@@ -6,7 +6,7 @@ import {
 	LanguagesIcon,
 	ModrinthIcon,
 	PaintbrushIcon,
-	SettingsIcon,
+	Settings2Icon,
 	ShieldIcon,
 	ToggleRightIcon,
 } from '@modrinth/assets'
@@ -21,19 +21,21 @@ import {
 } from '@modrinth/ui'
 import { getVersion } from '@tauri-apps/api/app'
 import { platform as getOsPlatform, version as getOsVersion } from '@tauri-apps/plugin-os'
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 
-import AppearanceSettings from '@/components/ui/settings/AppearanceSettings.vue'
-import DefaultInstanceSettings from '@/components/ui/settings/DefaultInstanceSettings.vue'
-import FeatureFlagSettings from '@/components/ui/settings/FeatureFlagSettings.vue'
-import JavaSettings from '@/components/ui/settings/JavaSettings.vue'
-import LanguageSettings from '@/components/ui/settings/LanguageSettings.vue'
-import PrivacySettings from '@/components/ui/settings/PrivacySettings.vue'
-import ResourceManagementSettings from '@/components/ui/settings/ResourceManagementSettings.vue'
+import PrivacySettings from '@/components/ui/settings/account/PrivacySettings.vue'
+import AppearanceSettings from '@/components/ui/settings/display/AppearanceSettings.vue'
+import BehaviorSettings from '@/components/ui/settings/display/BehaviorSettings.vue'
+import FeatureFlagSettings from '@/components/ui/settings/display/FeatureFlagSettings.vue'
+import LanguageSettings from '@/components/ui/settings/display/LanguageSettings.vue'
+import DefaultInstanceSettings from '@/components/ui/settings/instances/DefaultInstanceSettings.vue'
+import JavaSettings from '@/components/ui/settings/instances/JavaSettings.vue'
+import ResourceManagementSettings from '@/components/ui/settings/instances/ResourceManagementSettings.vue'
 import { get, set } from '@/helpers/settings.ts'
 import { injectAppUpdateDownloadProgress } from '@/providers/download-progress.ts'
 import { useTheming } from '@/store/state'
 
+// TODO: Apply COMPONENT_STRUCTURE.md here and extract out common setting option components
 const themeStore = useTheming()
 
 const { formatMessage } = useVIntl()
@@ -45,64 +47,97 @@ const developerModeEnabled = defineMessage({
 	defaultMessage: 'Developer mode enabled.',
 })
 
+const tabCategories = defineMessages({
+	display: {
+		id: 'settings.sidebar.label.display',
+		defaultMessage: 'Display',
+	},
+	account: {
+		id: 'settings.sidebar.label.account',
+		defaultMessage: 'Account',
+	},
+	instances: {
+		id: 'app.settings.sidebar.label.instances',
+		defaultMessage: 'Instances',
+	},
+})
+
 const tabs = [
 	{
 		name: defineMessage({
 			id: 'app.settings.tabs.appearance',
 			defaultMessage: 'Appearance',
 		}),
+		category: tabCategories.display,
 		icon: PaintbrushIcon,
 		content: AppearanceSettings,
 	},
+	{
+		name: defineMessage({
+			id: 'app.settings.tabs.behavior',
+			defaultMessage: 'Behavior',
+		}),
+		category: tabCategories.display,
+		icon: Settings2Icon,
+		content: BehaviorSettings,
+	},
 	{
 		name: defineMessage({
 			id: 'app.settings.tabs.language',
 			defaultMessage: 'Language',
 		}),
+		category: tabCategories.display,
 		icon: LanguagesIcon,
 		content: LanguageSettings,
 		badge: commonMessages.beta,
 	},
+	{
+		name: commonSettingsMessages.featureFlags,
+		category: tabCategories.display,
+		icon: ToggleRightIcon,
+		content: FeatureFlagSettings,
+		developerOnly: true,
+	},
 	{
 		name: defineMessage({
 			id: 'app.settings.tabs.privacy',
 			defaultMessage: 'Privacy',
 		}),
+		category: tabCategories.account,
 		icon: ShieldIcon,
 		content: PrivacySettings,
 	},
-	{
-		name: defineMessage({
-			id: 'app.settings.tabs.java-installations',
-			defaultMessage: 'Java installations',
-		}),
-		icon: CoffeeIcon,
-		content: JavaSettings,
-	},
 	{
 		name: defineMessage({
 			id: 'app.settings.tabs.default-instance-options',
 			defaultMessage: 'Default instance options',
 		}),
+		category: tabCategories.instances,
 		icon: GameIcon,
 		content: DefaultInstanceSettings,
 	},
+	{
+		name: defineMessage({
+			id: 'app.settings.tabs.java-installations',
+			defaultMessage: 'Java installations',
+		}),
+		category: tabCategories.instances,
+		icon: CoffeeIcon,
+		content: JavaSettings,
+	},
 	{
 		name: defineMessage({
 			id: 'app.settings.tabs.resource-management',
 			defaultMessage: 'Resource management',
 		}),
+		category: tabCategories.instances,
 		icon: GaugeIcon,
 		content: ResourceManagementSettings,
 	},
-	{
-		name: commonSettingsMessages.featureFlags,
-		icon: ToggleRightIcon,
-		content: FeatureFlagSettings,
-		developerOnly: true,
-	},
 ]
 
+const availableTabs = computed(() => tabs.filter((tab) => !tab.developerOnly || themeStore.devMode))
+
 const modal = ref<InstanceType<typeof TabbedModal> | null>(null)
 
 function show() {
@@ -129,12 +164,15 @@ watch(
 function devModeCount() {
 	devModeCounter.value++
 	if (devModeCounter.value > 5) {
+		const selectedTab = modal.value ? availableTabs.value[modal.value.selectedTab] : undefined
+
 		themeStore.devMode = !themeStore.devMode
 		settings.value.developer_mode = !!themeStore.devMode
 		devModeCounter.value = 0
 
-		if (!themeStore.devMode && tabs[modal.value!.selectedTab].developerOnly) {
-			modal.value!.setTab(0)
+		if (modal.value) {
+			const selectedTabIndex = selectedTab ? availableTabs.value.indexOf(selectedTab) : -1
+			modal.value.setTab(selectedTabIndex >= 0 ? selectedTabIndex : 0)
 		}
 	}
 }
@@ -144,13 +182,25 @@ const messages = defineMessages({
 		id: 'app.settings.downloading',
 		defaultMessage: 'Downloading v{version}',
 	},
+	appVersion: {
+		id: 'app.settings.app-version',
+		defaultMessage: 'Modrinth App {version}',
+	},
+	macos: {
+		id: 'app.settings.operating-system.macos',
+		defaultMessage: 'macOS',
+	},
+	developerModeButtonLabel: {
+		id: 'app.settings.developer-mode-button.label',
+		defaultMessage: 'Toggle developer mode',
+	},
 })
 </script>
 <template>
-	<TabbedModal ref="modal" :tabs="tabs.filter((t) => !t.developerOnly || themeStore.devMode)">
+	<TabbedModal ref="modal" :tabs="availableTabs" :width="'min(928px, calc(95vw - 10rem))'">
 		<template #title>
-			<span class="flex items-center gap-2 text-lg font-extrabold text-contrast">
-				<SettingsIcon /> Settings
+			<span class="text-2xl font-semibold text-contrast">
+				{{ formatMessage(commonMessages.settingsLabel) }}
 			</span>
 		</template>
 		<template #footer>
@@ -168,6 +218,7 @@ const messages = defineMessages({
 				</p>
 				<div class="flex items-center gap-3">
 					<button
+						:aria-label="formatMessage(messages.developerModeButtonLabel)"
 						class="p-0 m-0 bg-transparent border-none cursor-pointer button-animation"
 						:class="{
 							'text-brand': themeStore.devMode,
@@ -175,12 +226,14 @@ const messages = defineMessages({
 						}"
 						@click="devModeCount"
 					>
-						<ModrinthIcon class="w-6 h-6" />
+						<ModrinthIcon aria-hidden="true" class="w-6 h-6" />
 					</button>
 					<div class="max-w-[200px]">
-						<p class="m-0">Modrinth App {{ version }}</p>
 						<p class="m-0">
-							<span v-if="osPlatform === 'macos'">macOS</span>
+							{{ formatMessage(messages.appVersion, { version }) }}
+						</p>
+						<p class="m-0">
+							<span v-if="osPlatform === 'macos'">{{ formatMessage(messages.macos) }}</span>
 							<span v-else class="capitalize">{{ osPlatform }}</span>
 							{{ osVersion }}
 						</p>
diff --git a/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue b/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
deleted file mode 100644
index b986d25bc9..0000000000
--- a/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
+++ /dev/null
@@ -1,335 +0,0 @@
-<script setup lang="ts">
-import { Combobox, defineMessages, ThemeSelector, Toggle, useVIntl } from '@modrinth/ui'
-import { ref, watch } from 'vue'
-
-import { get, set } from '@/helpers/settings.ts'
-import { getOS } from '@/helpers/utils'
-import { useTheming } from '@/store/state'
-import type { ColorTheme, FeatureFlag } from '@/store/theme.ts'
-
-const themeStore = useTheming()
-const { formatMessage } = useVIntl()
-
-const worldsInHomeFlag: FeatureFlag = 'worlds_in_home'
-const skipNonEssentialWarningsFlag: FeatureFlag = 'skip_non_essential_warnings'
-const skipUnknownPackWarningFlag: FeatureFlag = 'skip_unknown_pack_warning'
-const showPlayTimeFlag: FeatureFlag = 'show_instance_play_time'
-
-const messages = defineMessages({
-	colorThemeTitle: {
-		id: 'app.appearance-settings.color-theme.title',
-		defaultMessage: 'Color theme',
-	},
-	colorThemeDescription: {
-		id: 'app.appearance-settings.color-theme.description',
-		defaultMessage: 'Select your preferred color theme for Modrinth App.',
-	},
-	advancedRenderingTitle: {
-		id: 'app.appearance-settings.advanced-rendering.title',
-		defaultMessage: 'Advanced rendering',
-	},
-	advancedRenderingDescription: {
-		id: 'app.appearance-settings.advanced-rendering.description',
-		defaultMessage:
-			'Enables advanced rendering such as blur effects that may cause performance issues without hardware-accelerated rendering.',
-	},
-	hideNametagTitle: {
-		id: 'app.appearance-settings.hide-nametag.title',
-		defaultMessage: 'Hide nametag',
-	},
-	hideNametagDescription: {
-		id: 'app.appearance-settings.hide-nametag.description',
-		defaultMessage: 'Disables the nametag above your player on the skins page.',
-	},
-	nativeDecorationsTitle: {
-		id: 'app.appearance-settings.native-decorations.title',
-		defaultMessage: 'Native decorations',
-	},
-	nativeDecorationsDescription: {
-		id: 'app.appearance-settings.native-decorations.description',
-		defaultMessage: 'Use system window frame (app restart required).',
-	},
-	minimizeLauncherTitle: {
-		id: 'app.appearance-settings.minimize-launcher.title',
-		defaultMessage: 'Minimize launcher',
-	},
-	minimizeLauncherDescription: {
-		id: 'app.appearance-settings.minimize-launcher.description',
-		defaultMessage: 'Minimize the launcher when a Minecraft process starts.',
-	},
-	defaultLandingPageTitle: {
-		id: 'app.appearance-settings.default-landing-page.title',
-		defaultMessage: 'Default landing page',
-	},
-	defaultLandingPageDescription: {
-		id: 'app.appearance-settings.default-landing-page.description',
-		defaultMessage: 'Change the page to which the launcher opens on.',
-	},
-	defaultLandingPageHome: {
-		id: 'app.appearance-settings.default-landing-page.home',
-		defaultMessage: 'Home',
-	},
-	defaultLandingPageLibrary: {
-		id: 'app.appearance-settings.default-landing-page.library',
-		defaultMessage: 'Library',
-	},
-	selectOption: {
-		id: 'app.appearance-settings.select-option',
-		defaultMessage: 'Select an option',
-	},
-	jumpBackIntoWorldsTitle: {
-		id: 'app.appearance-settings.jump-back-into-worlds.title',
-		defaultMessage: 'Jump back into worlds',
-	},
-	jumpBackIntoWorldsDescription: {
-		id: 'app.appearance-settings.jump-back-into-worlds.description',
-		defaultMessage: 'Includes recent worlds in the "Jump back in" section on the Home page.',
-	},
-	toggleSidebarTitle: {
-		id: 'app.appearance-settings.toggle-sidebar.title',
-		defaultMessage: 'Toggle sidebar',
-	},
-	toggleSidebarDescription: {
-		id: 'app.appearance-settings.toggle-sidebar.description',
-		defaultMessage: 'Enables the ability to toggle the sidebar.',
-	},
-	unknownPackWarningTitle: {
-		id: 'app.appearance-settings.unknown-pack-warning.title',
-		defaultMessage: 'Warn me before installing unknown modpacks',
-	},
-	unknownPackWarningDescription: {
-		id: 'app.appearance-settings.unknown-pack-warning.description',
-		defaultMessage:
-			"If you attempt to install a Modrinth Pack file (.mrpack) that isn't hosted on Modrinth, we'll make sure you understand the risks before installing it.",
-	},
-	skipNonEssentialWarningsTitle: {
-		id: 'app.appearance-settings.skip-non-essential-warnings.title',
-		defaultMessage: 'Skip non-essential warnings',
-	},
-	skipNonEssentialWarningsDescription: {
-		id: 'app.appearance-settings.skip-non-essential-warnings.description',
-		defaultMessage:
-			'Automatically skips low-risk confirmations like duplicate modpack installs, normal content deletion, bulk updates, unlinking modpacks, and repair prompts. Dangerous warnings will still be shown.',
-	},
-	showPlayTimeTitle: {
-		id: 'app.appearance-settings.show-play-time.title',
-		defaultMessage: 'Show play time',
-	},
-	showPlayTimeDescription: {
-		id: 'app.appearance-settings.show-play-time.description',
-		defaultMessage: `Displays how much time you've spent playing an instance.`,
-	},
-})
-
-const os = ref(await getOS())
-const settings = ref(await get())
-
-watch(
-	settings,
-	async () => {
-		await set(settings.value)
-	},
-	{ deep: true },
-)
-</script>
-<template>
-	<h2 class="m-0 text-lg font-semibold text-contrast">
-		{{ formatMessage(messages.colorThemeTitle) }}
-	</h2>
-	<p class="m-0 mt-1">{{ formatMessage(messages.colorThemeDescription) }}</p>
-
-	<ThemeSelector
-		:update-color-theme="
-			(theme: ColorTheme) => {
-				themeStore.setThemeState(theme)
-				settings.theme = theme
-			}
-		"
-		:current-theme="settings.theme"
-		:theme-options="themeStore.getThemeOptions()"
-		system-theme-color="system"
-	/>
-
-	<div class="mt-6 flex items-center justify-between">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.advancedRenderingTitle) }}
-			</h2>
-			<p class="m-0 mt-1">
-				{{ formatMessage(messages.advancedRenderingDescription) }}
-			</p>
-		</div>
-
-		<Toggle
-			id="advanced-rendering"
-			:model-value="themeStore.advancedRendering"
-			@update:model-value="
-				(e) => {
-					themeStore.advancedRendering = !!e
-					settings.advanced_rendering = themeStore.advancedRendering
-				}
-			"
-		/>
-	</div>
-
-	<div v-if="os !== 'MacOS'" class="mt-6 flex items-center justify-between gap-4">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.nativeDecorationsTitle) }}
-			</h2>
-			<p class="m-0 mt-1">{{ formatMessage(messages.nativeDecorationsDescription) }}</p>
-		</div>
-		<Toggle id="native-decorations" v-model="settings.native_decorations" />
-	</div>
-
-	<div class="mt-6 flex items-center justify-between">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.minimizeLauncherTitle) }}
-			</h2>
-			<p class="m-0 mt-1">{{ formatMessage(messages.minimizeLauncherDescription) }}</p>
-		</div>
-		<Toggle id="minimize-launcher" v-model="settings.hide_on_process_start" />
-	</div>
-
-	<div class="mt-6 flex items-center justify-between">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.showPlayTimeTitle) }}
-			</h2>
-			<p class="m-0 mt-1">{{ formatMessage(messages.showPlayTimeDescription) }}</p>
-		</div>
-		<Toggle
-			:model-value="themeStore.getFeatureFlag(showPlayTimeFlag)"
-			@update:model-value="
-				() => {
-					const newValue = !themeStore.getFeatureFlag(showPlayTimeFlag)
-					themeStore.featureFlags[showPlayTimeFlag] = newValue
-					settings.feature_flags[showPlayTimeFlag] = newValue
-				}
-			"
-		/>
-	</div>
-
-	<div class="mt-6 flex items-center justify-between">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.hideNametagTitle) }}
-			</h2>
-			<p class="m-0 mt-1">{{ formatMessage(messages.hideNametagDescription) }}</p>
-		</div>
-		<Toggle
-			id="hide-nametag-skins-page"
-			:model-value="themeStore.hideNametagSkinsPage"
-			@update:model-value="
-				(e) => {
-					themeStore.hideNametagSkinsPage = !!e
-					settings.hide_nametag_skins_page = themeStore.hideNametagSkinsPage
-				}
-			"
-		/>
-	</div>
-
-	<div class="mt-6 flex items-center justify-between">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.defaultLandingPageTitle) }}
-			</h2>
-			<p class="m-0 mt-1">{{ formatMessage(messages.defaultLandingPageDescription) }}</p>
-		</div>
-		<Combobox
-			id="opening-page"
-			v-model="settings.default_page"
-			name="Opening page dropdown"
-			class="max-w-40"
-			:options="[
-				{
-					value: 'Home',
-					label: formatMessage(messages.defaultLandingPageHome),
-				},
-				{
-					value: 'Library',
-					label: formatMessage(messages.defaultLandingPageLibrary),
-				},
-			]"
-			:display-value="settings.default_page ?? 'Select an option'"
-		/>
-	</div>
-
-	<div class="mt-6 flex items-center justify-between">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.jumpBackIntoWorldsTitle) }}
-			</h2>
-			<p class="m-0 mt-1">{{ formatMessage(messages.jumpBackIntoWorldsDescription) }}</p>
-		</div>
-		<Toggle
-			:model-value="themeStore.getFeatureFlag(worldsInHomeFlag)"
-			@update:model-value="
-				() => {
-					const newValue = !themeStore.getFeatureFlag(worldsInHomeFlag)
-					themeStore.featureFlags[worldsInHomeFlag] = newValue
-					settings.feature_flags[worldsInHomeFlag] = newValue
-				}
-			"
-		/>
-	</div>
-
-	<div class="mt-6 flex items-center justify-between gap-4">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.unknownPackWarningTitle) }}
-			</h2>
-			<p class="m-0 mt-1">{{ formatMessage(messages.unknownPackWarningDescription) }}</p>
-		</div>
-		<Toggle
-			:model-value="!themeStore.getFeatureFlag(skipUnknownPackWarningFlag)"
-			@update:model-value="
-				(e) => {
-					const warnBeforeUnknownPackInstall = !!e
-					const skipUnknownPackWarning = !warnBeforeUnknownPackInstall
-					themeStore.featureFlags[skipUnknownPackWarningFlag] = skipUnknownPackWarning
-					settings.feature_flags[skipUnknownPackWarningFlag] = skipUnknownPackWarning
-				}
-			"
-		/>
-	</div>
-
-	<div class="mt-6 flex items-center justify-between gap-4">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.skipNonEssentialWarningsTitle) }}
-			</h2>
-			<p class="m-0 mt-1">{{ formatMessage(messages.skipNonEssentialWarningsDescription) }}</p>
-		</div>
-		<Toggle
-			:model-value="themeStore.getFeatureFlag(skipNonEssentialWarningsFlag)"
-			@update:model-value="
-				() => {
-					const newValue = !themeStore.getFeatureFlag(skipNonEssentialWarningsFlag)
-					themeStore.featureFlags[skipNonEssentialWarningsFlag] = newValue
-					settings.feature_flags[skipNonEssentialWarningsFlag] = newValue
-				}
-			"
-		/>
-	</div>
-
-	<div class="mt-6 flex items-center justify-between">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.toggleSidebarTitle) }}
-			</h2>
-			<p class="m-0 mt-1">{{ formatMessage(messages.toggleSidebarDescription) }}</p>
-		</div>
-		<Toggle
-			id="toggle-sidebar"
-			:model-value="settings.toggle_sidebar"
-			@update:model-value="
-				(e) => {
-					settings.toggle_sidebar = !!e
-					themeStore.toggleSidebar = settings.toggle_sidebar
-				}
-			"
-		/>
-	</div>
-</template>
diff --git a/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue b/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue
deleted file mode 100644
index 252de30984..0000000000
--- a/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue
+++ /dev/null
@@ -1,186 +0,0 @@
-<script setup lang="ts">
-import { injectNotificationManager, Slider, StyledInput, Toggle } from '@modrinth/ui'
-import { ref, watch } from 'vue'
-
-import useMemorySlider from '@/composables/useMemorySlider'
-import { get, set } from '@/helpers/settings.ts'
-
-const { handleError } = injectNotificationManager()
-
-const fetchSettings = await get()
-fetchSettings.launchArgs = fetchSettings.extra_launch_args.join(' ')
-fetchSettings.envVars = fetchSettings.custom_env_vars.map((x) => x.join('=')).join(' ')
-
-const settings = ref(fetchSettings)
-
-const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) as unknown as {
-	maxMemory: number
-	snapPoints: number[]
-}
-
-watch(
-	settings,
-	async () => {
-		const setSettings = JSON.parse(JSON.stringify(settings.value))
-
-		setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
-		setSettings.custom_env_vars = setSettings.envVars
-			.trim()
-			.split(/\s+/)
-			.filter(Boolean)
-			.map((x) => x.split('=').filter(Boolean))
-
-		if (!setSettings.hooks.pre_launch) {
-			setSettings.hooks.pre_launch = null
-		}
-		if (!setSettings.hooks.wrapper) {
-			setSettings.hooks.wrapper = null
-		}
-		if (!setSettings.hooks.post_exit) {
-			setSettings.hooks.post_exit = null
-		}
-
-		if (!setSettings.custom_dir) {
-			setSettings.custom_dir = null
-		}
-
-		await set(setSettings)
-	},
-	{ deep: true },
-)
-</script>
-
-<template>
-	<div>
-		<div class="flex flex-col gap-6">
-			<div class="flex items-center justify-between gap-4">
-				<div class="flex flex-col gap-1">
-					<h3 class="m-0 text-lg font-semibold text-contrast">Fullscreen</h3>
-					<p class="m-0 leading-tight">
-						Overwrites the options.txt file to start in full screen when launched.
-					</p>
-				</div>
-
-				<Toggle id="fullscreen" v-model="settings.force_fullscreen" />
-			</div>
-
-			<div class="flex items-center justify-between gap-4">
-				<div class="flex flex-col gap-1">
-					<h3 class="m-0 text-lg font-semibold text-contrast">Width</h3>
-					<p class="m-0 leading-tight">The width of the game window when launched.</p>
-				</div>
-
-				<StyledInput
-					id="width"
-					v-model="settings.game_resolution[0]"
-					:disabled="settings.force_fullscreen"
-					autocomplete="off"
-					type="number"
-					placeholder="Enter width..."
-				/>
-			</div>
-
-			<div class="flex items-center justify-between gap-4">
-				<div class="flex flex-col gap-1">
-					<h3 class="m-0 text-lg font-semibold text-contrast">Height</h3>
-					<p class="m-0 leading-tight">The height of the game window when launched.</p>
-				</div>
-
-				<StyledInput
-					id="height"
-					v-model="settings.game_resolution[1]"
-					:disabled="settings.force_fullscreen"
-					autocomplete="off"
-					type="number"
-					placeholder="Enter height..."
-				/>
-			</div>
-		</div>
-
-		<hr class="my-6 bg-button-border border-none h-[1px]" />
-
-		<div class="flex flex-col gap-6">
-			<div class="flex flex-col gap-2.5">
-				<h2 class="m-0 text-lg font-semibold text-contrast">Memory allocated</h2>
-				<Slider
-					id="max-memory"
-					v-model="settings.memory.maximum"
-					:min="512"
-					:max="maxMemory"
-					:step="64"
-					:snap-points="snapPoints"
-					:snap-range="512"
-					unit="MB"
-				/>
-				<p class="m-0 mt-1 leading-tight">The memory allocated to each instance when it is ran.</p>
-			</div>
-
-			<div class="flex flex-col gap-2.5">
-				<h2 class="m-0 text-lg font-semibold text-contrast">Java arguments</h2>
-				<StyledInput
-					id="java-args"
-					v-model="settings.launchArgs"
-					autocomplete="off"
-					type="text"
-					placeholder="Enter java arguments..."
-					wrapper-class="w-full"
-				/>
-			</div>
-
-			<div class="flex flex-col gap-2.5">
-				<h2 class="m-0 text-lg font-semibold text-contrast">Environmental variables</h2>
-				<StyledInput
-					id="env-vars"
-					v-model="settings.envVars"
-					autocomplete="off"
-					type="text"
-					placeholder="Enter environmental variables..."
-					wrapper-class="w-full"
-				/>
-			</div>
-		</div>
-
-		<hr class="my-6 bg-button-border border-none h-[1px]" />
-
-		<div class="flex flex-col gap-6">
-			<div class="flex flex-col gap-2.5">
-				<h3 class="m-0 text-lg font-semibold text-contrast">Pre launch hook</h3>
-				<StyledInput
-					id="pre-launch"
-					v-model="settings.hooks.pre_launch"
-					autocomplete="off"
-					type="text"
-					placeholder="Enter pre-launch command..."
-					wrapper-class="w-full"
-				/>
-				<p class="m-0 leading-tight">Ran before the instance is launched.</p>
-			</div>
-
-			<div class="flex flex-col gap-2.5">
-				<h3 class="m-0 text-lg font-semibold text-contrast">Wrapper hook</h3>
-				<StyledInput
-					id="wrapper"
-					v-model="settings.hooks.wrapper"
-					autocomplete="off"
-					type="text"
-					placeholder="Enter wrapper command..."
-					wrapper-class="w-full"
-				/>
-				<p class="m-0 leading-tight">Wrapper command for launching Minecraft.</p>
-			</div>
-
-			<div class="flex flex-col gap-2.5">
-				<h3 class="m-0 text-lg font-semibold text-contrast">Post exit hook</h3>
-				<StyledInput
-					id="post-exit"
-					v-model="settings.hooks.post_exit"
-					autocomplete="off"
-					type="text"
-					placeholder="Enter post-exit command..."
-					wrapper-class="w-full"
-				/>
-				<p class="m-0 leading-tight">Ran after the game closes.</p>
-			</div>
-		</div>
-	</div>
-</template>
diff --git a/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue b/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
deleted file mode 100644
index 4891ecd2fb..0000000000
--- a/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-<script setup>
-import { BoxIcon, FolderOpenIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	defineMessages,
-	injectNotificationManager,
-	Slider,
-	StyledInput,
-	Toggle,
-	useVIntl,
-} from '@modrinth/ui'
-import { open } from '@tauri-apps/plugin-dialog'
-import { ref, watch } from 'vue'
-
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
-import { purge_cache_types } from '@/helpers/cache.js'
-import { get, set } from '@/helpers/settings.ts'
-import { showAppDbBackupsFolder } from '@/helpers/utils.js'
-import { useTheming } from '@/store/state'
-
-const { handleError } = injectNotificationManager()
-const { formatMessage } = useVIntl()
-const themeStore = useTheming()
-const settings = ref(await get())
-const purgeCacheConfirmModal = ref(null)
-const alwaysShowCopyDetailsFlag = 'always_show_copy_details'
-
-const messages = defineMessages({
-	alwaysShowCopyDetailsTitle: {
-		id: 'app.resource-management-settings.always-show-copy-details.title',
-		defaultMessage: 'Always show copy details',
-	},
-	alwaysShowCopyDetailsDescription: {
-		id: 'app.resource-management-settings.always-show-copy-details.description',
-		defaultMessage:
-			'Show the Copy details action while an install is queued or running. It is always available for failed or interrupted installs.',
-	},
-})
-
-watch(
-	settings,
-	async () => {
-		const setSettings = JSON.parse(JSON.stringify(settings.value))
-
-		if (!setSettings.custom_dir) {
-			setSettings.custom_dir = null
-		}
-
-		await set(setSettings)
-	},
-	{ deep: true },
-)
-
-async function purgeCache() {
-	await purge_cache_types([
-		'project',
-		'project_v3',
-		'version',
-		'user',
-		'team',
-		'organization',
-		'file',
-		'loader_manifest',
-		'minecraft_manifest',
-		'categories',
-		'report_types',
-		'loaders',
-		'game_versions',
-		'donation_platforms',
-		'file_hash',
-		'file_update',
-		'search_results',
-		'search_results_v3',
-	]).catch(handleError)
-}
-
-function handlePurgeCacheClick() {
-	if (themeStore.getFeatureFlag('skip_non_essential_warnings')) {
-		void purgeCache()
-		return
-	}
-
-	purgeCacheConfirmModal.value?.show()
-}
-
-async function openDbBackupsFolder() {
-	await showAppDbBackupsFolder().catch(handleError)
-}
-
-async function findLauncherDir() {
-	const newDir = await open({
-		multiple: false,
-		directory: true,
-		title: 'Select a new app directory',
-	})
-
-	if (newDir) {
-		settings.value.custom_dir = newDir
-	}
-}
-</script>
-
-<template>
-	<div class="flex flex-col gap-6">
-		<div class="flex flex-col gap-2.5">
-			<h2 class="m-0 text-lg font-semibold text-contrast">App directory</h2>
-			<StyledInput
-				id="appDir"
-				v-model="settings.custom_dir"
-				:icon="BoxIcon"
-				type="text"
-				wrapper-class="w-full"
-			>
-				<template #right>
-					<ButtonStyled circular>
-						<button class="ml-1.5" @click="findLauncherDir">
-							<FolderSearchIcon />
-						</button>
-					</ButtonStyled>
-				</template>
-			</StyledInput>
-			<p class="m-0 leading-tight text-secondary">
-				The directory where the launcher stores all of its files. Changes will be applied after
-				restarting the launcher.
-			</p>
-		</div>
-
-		<div class="flex flex-col gap-2.5">
-			<ConfirmModalWrapper
-				ref="purgeCacheConfirmModal"
-				title="Are you sure you want to purge the cache?"
-				description="If you proceed, your entire cache will be purged. This may slow down the app temporarily."
-				:has-to-type="false"
-				proceed-label="Purge cache"
-				:show-ad-on-close="false"
-				@proceed="purgeCache"
-			/>
-			<h2 class="m-0 text-lg font-semibold text-contrast">App cache</h2>
-			<button id="purge-cache" class="btn min-w-max" @click="handlePurgeCacheClick">
-				<TrashIcon />
-				Purge cache
-			</button>
-			<p class="m-0 leading-tight text-secondary">
-				The Modrinth app stores a cache of data to speed up loading. This can be purged to force the
-				app to reload data. This may slow down the app temporarily.
-			</p>
-		</div>
-
-		<div class="flex flex-col gap-2.5">
-			<h2 class="m-0 text-lg font-semibold text-contrast mt-4">Maximum concurrent downloads</h2>
-			<Slider
-				id="max-downloads"
-				v-model="settings.max_concurrent_downloads"
-				:min="1"
-				:max="10"
-				:step="1"
-			/>
-			<p class="m-0 leading-tight text-secondary">
-				The maximum amount of files the launcher can download at the same time. Set this to a lower
-				value if you have a poor internet connection. (app restart required to take effect)
-			</p>
-		</div>
-
-		<div class="flex flex-col gap-2.5">
-			<h2 class="mt-0 m-0 text-lg font-semibold text-contrast">Maximum concurrent writes</h2>
-			<Slider
-				id="max-writes"
-				v-model="settings.max_concurrent_writes"
-				:min="1"
-				:max="50"
-				:step="1"
-			/>
-			<p class="m-0 leading-tight text-secondary">
-				The maximum amount of files the launcher can write to the disk at once. Set this to a lower
-				value if you are frequently getting I/O errors. (app restart required to take effect)
-			</p>
-		</div>
-
-		<div class="flex items-center justify-between gap-4">
-			<div>
-				<h2 class="m-0 text-lg font-semibold text-contrast">
-					{{ formatMessage(messages.alwaysShowCopyDetailsTitle) }}
-				</h2>
-				<p class="m-0 mt-1">
-					{{ formatMessage(messages.alwaysShowCopyDetailsDescription) }}
-				</p>
-			</div>
-			<Toggle
-				id="always-show-copy-details"
-				:model-value="themeStore.getFeatureFlag(alwaysShowCopyDetailsFlag)"
-				@update:model-value="
-					() => {
-						const newValue = !themeStore.getFeatureFlag(alwaysShowCopyDetailsFlag)
-						themeStore.featureFlags[alwaysShowCopyDetailsFlag] = newValue
-						settings.feature_flags[alwaysShowCopyDetailsFlag] = newValue
-					}
-				"
-			/>
-		</div>
-
-		<div class="flex flex-col gap-2.5">
-			<h2 class="mt-0 m-0 text-lg font-semibold text-contrast">App database backups</h2>
-			<button id="open-db-backups-folder" class="btn min-w-max" @click="openDbBackupsFolder">
-				<FolderOpenIcon />
-				Open backups folder
-			</button>
-			<p class="m-0 leading-tight text-secondary">
-				Backups of important app data are stored here in case you need to recover them later.
-			</p>
-		</div>
-	</div>
-</template>
diff --git a/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue b/apps/app-frontend/src/components/ui/settings/account/PrivacySettings.vue
similarity index 61%
rename from apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
rename to apps/app-frontend/src/components/ui/settings/account/PrivacySettings.vue
index b13cea773d..b945942ae6 100644
--- a/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/account/PrivacySettings.vue
@@ -33,6 +33,24 @@ const messages = defineMessages({
 		id: 'app.ads-consent.manage',
 		defaultMessage: 'Manage preferences',
 	},
+	telemetryTitle: {
+		id: 'app.settings.privacy.telemetry.title',
+		defaultMessage: 'Telemetry',
+	},
+	telemetryDescription: {
+		id: 'app.settings.privacy.telemetry.description',
+		defaultMessage:
+			'Modrinth collects anonymized analytics and usage data to improve our user experience and customize your experience. By disabling this option, you opt out and your data will no longer be collected.',
+	},
+	discordRichPresenceTitle: {
+		id: 'app.settings.privacy.discord-rich-presence.title',
+		defaultMessage: 'Discord Rich Presence',
+	},
+	discordRichPresenceDescription: {
+		id: 'app.settings.privacy.discord-rich-presence.description',
+		defaultMessage:
+			'Show Modrinth App as your current activity on Discord. This does not affect Rich Presence added to instances by mods. Requires an app restart.',
+	},
 })
 
 async function manageAdsPreferences() {
@@ -59,28 +77,26 @@ watch(
 		<h2 class="m-0 text-lg font-semibold text-contrast">
 			{{ formatMessage(messages.adsConsentTitle) }}
 		</h2>
-		<div class="mt-1 flex flex-col gap-2.5 items-start">
-			<div class="flex flex-col gap-1 items-start">
-				<div class="text-sm">
-					{{ formatMessage(messages.adsConsentIntro) }}
-				</div>
-			</div>
+		<div class="mt-2 flex flex-col gap-2.5 items-start">
 			<ButtonStyled>
 				<button class="!shadow-none" @click="manageAdsPreferences">
 					<Settings2Icon aria-hidden="true" />
 					{{ formatMessage(messages.adsConsentManage) }}
 				</button>
 			</ButtonStyled>
+			<div>
+				{{ formatMessage(messages.adsConsentIntro) }}
+			</div>
 		</div>
 	</div>
 
 	<div class="mt-8 flex items-center justify-between gap-4">
 		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">Telemetry</h2>
-			<p class="m-0 mt-1 text-sm">
-				Modrinth collects anonymized analytics and usage data to improve our user experience and
-				customize your experience. By disabling this option, you opt out and your data will no
-				longer be collected.
+			<h2 class="m-0 text-lg font-semibold text-contrast">
+				{{ formatMessage(messages.telemetryTitle) }}
+			</h2>
+			<p class="m-0 mt-1">
+				{{ formatMessage(messages.telemetryDescription) }}
 			</p>
 		</div>
 		<Toggle id="opt-out-analytics" v-model="settings.telemetry" />
@@ -88,14 +104,11 @@ watch(
 
 	<div class="mt-4 flex items-center justify-between gap-4">
 		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">Discord RPC</h2>
-			<p class="m-0 mt-1 text-sm">
-				Manages the Discord Rich Presence integration. Disabling this will cause 'Modrinth' to no
-				longer show up as a game or app you are using on your Discord profile.
-			</p>
-			<p class="m-0 mt-2 text-sm">
-				Note: This will not prevent any instance-specific Discord Rich Presence integrations, such
-				as those added by mods. (app restart required to take effect)
+			<h2 class="m-0 text-lg font-semibold text-contrast">
+				{{ formatMessage(messages.discordRichPresenceTitle) }}
+			</h2>
+			<p class="m-0 mt-1">
+				{{ formatMessage(messages.discordRichPresenceDescription) }}
 			</p>
 		</div>
 		<Toggle id="disable-discord-rpc" v-model="settings.discord_rpc" />
diff --git a/apps/app-frontend/src/components/ui/settings/display/AppearanceSettings.vue b/apps/app-frontend/src/components/ui/settings/display/AppearanceSettings.vue
new file mode 100644
index 0000000000..19acfad5ad
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/display/AppearanceSettings.vue
@@ -0,0 +1,108 @@
+<script setup lang="ts">
+import { defineMessages, ThemeSelector, Toggle, useVIntl } from '@modrinth/ui'
+import { computed, ref, watch } from 'vue'
+
+import { get, set } from '@/helpers/settings.ts'
+import { getOS } from '@/helpers/utils'
+import { useTheming } from '@/store/state'
+import type { ColorTheme } from '@/store/theme.ts'
+
+const themeStore = useTheming()
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	colorThemeTitle: {
+		id: 'app.appearance-settings.color-theme.title',
+		defaultMessage: 'Color theme',
+	},
+	colorThemeDescription: {
+		id: 'app.appearance-settings.color-theme.description',
+		defaultMessage: 'Choose the color theme used by Modrinth App.',
+	},
+	advancedRenderingTitle: {
+		id: 'app.appearance-settings.advanced-rendering.title',
+		defaultMessage: 'Advanced rendering',
+	},
+	advancedRenderingDescription: {
+		id: 'app.appearance-settings.advanced-rendering.description',
+		defaultMessage:
+			'Enable visual effects such as background blur. This may reduce performance without hardware acceleration.',
+	},
+	nativeDecorationsTitle: {
+		id: 'app.appearance-settings.native-decorations.title',
+		defaultMessage: 'System window frame',
+	},
+	nativeDecorationsDescription: {
+		id: 'app.appearance-settings.native-decorations.description',
+		defaultMessage:
+			"Use your operating system's title bar and window controls. Requires an app restart.",
+	},
+})
+
+const os = ref(await getOS())
+const settings = ref(await get())
+const themeOptions = computed(() =>
+	themeStore
+		.getThemeOptions()
+		.filter((theme) => theme !== 'retro' || themeStore.devMode || settings.value.theme === 'retro'),
+)
+
+watch(
+	settings,
+	async () => {
+		await set(settings.value)
+	},
+	{ deep: true },
+)
+</script>
+<template>
+	<h2 class="m-0 text-lg font-semibold text-contrast">
+		{{ formatMessage(messages.colorThemeTitle) }}
+	</h2>
+
+	<p class="m-0 mt-1">{{ formatMessage(messages.colorThemeDescription) }}</p>
+
+	<ThemeSelector
+		:update-color-theme="
+			(theme: ColorTheme) => {
+				themeStore.setThemeState(theme)
+				settings.theme = theme
+			}
+		"
+		:current-theme="settings.theme"
+		:theme-options="themeOptions"
+		system-theme-color="system"
+	/>
+
+	<div class="mt-6 flex items-center justify-between">
+		<div>
+			<h2 class="m-0 text-lg font-semibold text-contrast">
+				{{ formatMessage(messages.advancedRenderingTitle) }}
+			</h2>
+			<p class="m-0 mt-1">
+				{{ formatMessage(messages.advancedRenderingDescription) }}
+			</p>
+		</div>
+
+		<Toggle
+			id="advanced-rendering"
+			:model-value="themeStore.advancedRendering"
+			@update:model-value="
+				(e) => {
+					themeStore.advancedRendering = !!e
+					settings.advanced_rendering = themeStore.advancedRendering
+				}
+			"
+		/>
+	</div>
+
+	<div v-if="os !== 'MacOS'" class="mt-6 flex items-center justify-between gap-4">
+		<div>
+			<h2 class="m-0 text-lg font-semibold text-contrast">
+				{{ formatMessage(messages.nativeDecorationsTitle) }}
+			</h2>
+			<p class="m-0 mt-1">{{ formatMessage(messages.nativeDecorationsDescription) }}</p>
+		</div>
+		<Toggle id="native-decorations" v-model="settings.native_decorations" />
+	</div>
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue b/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
new file mode 100644
index 0000000000..25a7bc8016
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
@@ -0,0 +1,302 @@
+<script setup lang="ts">
+import { Chips, defineMessages, Toggle, useVIntl } from '@modrinth/ui'
+import { ref, watch } from 'vue'
+
+import { get, set } from '@/helpers/settings.ts'
+import { useTheming } from '@/store/state'
+import type { FeatureFlag } from '@/store/theme.ts'
+
+const themeStore = useTheming()
+const { formatMessage } = useVIntl()
+
+const worldsInHomeFlag: FeatureFlag = 'worlds_in_home'
+const skipNonEssentialWarningsFlag: FeatureFlag = 'skip_non_essential_warnings'
+const skipUnknownPackWarningFlag: FeatureFlag = 'skip_unknown_pack_warning'
+const showPlayTimeFlag: FeatureFlag = 'show_instance_play_time'
+
+type LandingPage = 'Home' | 'Library'
+const landingPageOptions: LandingPage[] = ['Home', 'Library']
+
+const messages = defineMessages({
+	startupAndNavigationTitle: {
+		id: 'app.behavior-settings.startup-and-navigation.title',
+		defaultMessage: 'Startup and navigation',
+	},
+	contentTitle: {
+		id: 'app.behavior-settings.content.title',
+		defaultMessage: 'Home and content',
+	},
+	confirmationsTitle: {
+		id: 'app.behavior-settings.confirmations.title',
+		defaultMessage: 'Confirmations',
+	},
+	minimizeLauncherTitle: {
+		id: 'app.appearance-settings.minimize-launcher.title',
+		defaultMessage: 'Minimize app',
+	},
+	minimizeLauncherDescription: {
+		id: 'app.appearance-settings.minimize-launcher.description',
+		defaultMessage: 'Minimize Modrinth App when Minecraft starts.',
+	},
+	defaultLandingPageTitle: {
+		id: 'app.appearance-settings.default-landing-page.title',
+		defaultMessage: 'Default landing page',
+	},
+	defaultLandingPageDescription: {
+		id: 'app.appearance-settings.default-landing-page.description',
+		defaultMessage: 'Choose the page shown when Modrinth App opens.',
+	},
+	defaultLandingPageHome: {
+		id: 'app.appearance-settings.default-landing-page.home',
+		defaultMessage: 'Home',
+	},
+	defaultLandingPageLibrary: {
+		id: 'app.appearance-settings.default-landing-page.library',
+		defaultMessage: 'Library',
+	},
+	toggleSidebarTitle: {
+		id: 'app.appearance-settings.toggle-sidebar.title',
+		defaultMessage: 'Hide right sidebar',
+	},
+	toggleSidebarDescription: {
+		id: 'app.appearance-settings.toggle-sidebar.description',
+		defaultMessage: 'Hide the right sidebar by default and add a button to show or hide it.',
+	},
+	jumpBackIntoWorldsTitle: {
+		id: 'app.appearance-settings.jump-back-into-worlds.title',
+		defaultMessage: 'Jump back into worlds',
+	},
+	jumpBackIntoWorldsDescription: {
+		id: 'app.appearance-settings.jump-back-into-worlds.description',
+		defaultMessage: 'Show recently played worlds in the "Jump back in" section on the Home page.',
+	},
+	showPlayTimeTitle: {
+		id: 'app.appearance-settings.show-play-time.title',
+		defaultMessage: 'Show play time',
+	},
+	showPlayTimeDescription: {
+		id: 'app.appearance-settings.show-play-time.description',
+		defaultMessage: `Show how long you've played each instance.`,
+	},
+	hideNametagTitle: {
+		id: 'app.appearance-settings.hide-nametag.title',
+		defaultMessage: 'Hide nametag',
+	},
+	hideNametagDescription: {
+		id: 'app.appearance-settings.hide-nametag.description',
+		defaultMessage: 'Hide your username above the player preview on the Skin selector page.',
+	},
+	unknownPackWarningTitle: {
+		id: 'app.appearance-settings.unknown-pack-warning.title',
+		defaultMessage: 'Warn me before installing unknown modpacks',
+	},
+	unknownPackWarningDescription: {
+		id: 'app.appearance-settings.unknown-pack-warning.description',
+		defaultMessage:
+			"Show a safety warning before installing a Modrinth Pack (.mrpack) that isn't hosted on Modrinth.",
+	},
+	skipNonEssentialWarningsTitle: {
+		id: 'app.appearance-settings.skip-non-essential-warnings.title',
+		defaultMessage: 'Skip non-essential warnings',
+	},
+	skipNonEssentialWarningsDescription: {
+		id: 'app.appearance-settings.skip-non-essential-warnings.description',
+		defaultMessage:
+			'Skip confirmations for low-risk actions such as duplicate installs, normal content deletion, bulk updates, unlinking, and repairs. Warnings for dangerous actions are always shown.',
+	},
+})
+
+function formatLandingPageLabel(page: LandingPage) {
+	switch (page) {
+		case 'Home':
+			return formatMessage(messages.defaultLandingPageHome)
+		case 'Library':
+			return formatMessage(messages.defaultLandingPageLibrary)
+	}
+}
+
+const settings = ref(await get())
+
+watch(
+	settings,
+	async () => {
+		await set(settings.value)
+	},
+	{ deep: true },
+)
+</script>
+<template>
+	<section>
+		<h2 class="m-0 text-xl font-semibold text-contrast">
+			{{ formatMessage(messages.startupAndNavigationTitle) }}
+		</h2>
+		<div class="mt-4 flex flex-col gap-6">
+			<div class="flex flex-col gap-2.5">
+				<h3 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.defaultLandingPageTitle) }}
+				</h3>
+				<Chips
+					v-model="settings.default_page"
+					:items="landingPageOptions"
+					:format-label="formatLandingPageLabel"
+					:capitalize="false"
+					:aria-label="formatMessage(messages.defaultLandingPageTitle)"
+				/>
+				<p class="m-0">
+					{{ formatMessage(messages.defaultLandingPageDescription) }}
+				</p>
+			</div>
+
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.minimizeLauncherTitle) }}
+					</h3>
+					<p class="m-0 mt-1">
+						{{ formatMessage(messages.minimizeLauncherDescription) }}
+					</p>
+				</div>
+				<Toggle id="minimize-launcher" v-model="settings.hide_on_process_start" />
+			</div>
+
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.toggleSidebarTitle) }}
+					</h3>
+					<p class="m-0 mt-1">{{ formatMessage(messages.toggleSidebarDescription) }}</p>
+				</div>
+				<Toggle
+					id="toggle-sidebar"
+					:model-value="settings.toggle_sidebar"
+					@update:model-value="
+						(e) => {
+							settings.toggle_sidebar = !!e
+							themeStore.toggleSidebar = settings.toggle_sidebar
+						}
+					"
+				/>
+			</div>
+		</div>
+	</section>
+
+	<section class="mt-8 border-0 border-t border-solid border-divider pt-6">
+		<h2 class="m-0 text-xl font-semibold text-contrast">
+			{{ formatMessage(messages.contentTitle) }}
+		</h2>
+		<div class="mt-4 flex flex-col gap-6">
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.jumpBackIntoWorldsTitle) }}
+					</h3>
+					<p class="m-0 mt-1">
+						{{ formatMessage(messages.jumpBackIntoWorldsDescription) }}
+					</p>
+				</div>
+				<Toggle
+					id="jump-back-into-worlds"
+					:model-value="themeStore.getFeatureFlag(worldsInHomeFlag)"
+					@update:model-value="
+						() => {
+							const newValue = !themeStore.getFeatureFlag(worldsInHomeFlag)
+							themeStore.featureFlags[worldsInHomeFlag] = newValue
+							settings.feature_flags[worldsInHomeFlag] = newValue
+						}
+					"
+				/>
+			</div>
+
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.showPlayTimeTitle) }}
+					</h3>
+					<p class="m-0 mt-1">{{ formatMessage(messages.showPlayTimeDescription) }}</p>
+				</div>
+				<Toggle
+					id="show-play-time"
+					:model-value="themeStore.getFeatureFlag(showPlayTimeFlag)"
+					@update:model-value="
+						() => {
+							const newValue = !themeStore.getFeatureFlag(showPlayTimeFlag)
+							themeStore.featureFlags[showPlayTimeFlag] = newValue
+							settings.feature_flags[showPlayTimeFlag] = newValue
+						}
+					"
+				/>
+			</div>
+
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.hideNametagTitle) }}
+					</h3>
+					<p class="m-0 mt-1">{{ formatMessage(messages.hideNametagDescription) }}</p>
+				</div>
+				<Toggle
+					id="hide-nametag-skins-page"
+					:model-value="themeStore.hideNametagSkinsPage"
+					@update:model-value="
+						(e) => {
+							themeStore.hideNametagSkinsPage = !!e
+							settings.hide_nametag_skins_page = themeStore.hideNametagSkinsPage
+						}
+					"
+				/>
+			</div>
+		</div>
+	</section>
+
+	<section class="mt-8 border-0 border-t border-solid border-divider pt-6">
+		<h2 class="m-0 text-xl font-semibold text-contrast">
+			{{ formatMessage(messages.confirmationsTitle) }}
+		</h2>
+		<div class="mt-4 flex flex-col gap-6">
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.unknownPackWarningTitle) }}
+					</h3>
+					<p class="m-0 mt-1">
+						{{ formatMessage(messages.unknownPackWarningDescription) }}
+					</p>
+				</div>
+				<Toggle
+					id="warn-before-installing-unknown-modpacks"
+					:model-value="!themeStore.getFeatureFlag(skipUnknownPackWarningFlag)"
+					@update:model-value="
+						(e) => {
+							const warnBeforeUnknownPackInstall = !!e
+							const skipUnknownPackWarning = !warnBeforeUnknownPackInstall
+							themeStore.featureFlags[skipUnknownPackWarningFlag] = skipUnknownPackWarning
+							settings.feature_flags[skipUnknownPackWarningFlag] = skipUnknownPackWarning
+						}
+					"
+				/>
+			</div>
+
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.skipNonEssentialWarningsTitle) }}
+					</h3>
+					<p class="m-0 mt-1">
+						{{ formatMessage(messages.skipNonEssentialWarningsDescription) }}
+					</p>
+				</div>
+				<Toggle
+					id="skip-non-essential-warnings"
+					:model-value="themeStore.getFeatureFlag(skipNonEssentialWarningsFlag)"
+					@update:model-value="
+						() => {
+							const newValue = !themeStore.getFeatureFlag(skipNonEssentialWarningsFlag)
+							themeStore.featureFlags[skipNonEssentialWarningsFlag] = newValue
+							settings.feature_flags[skipNonEssentialWarningsFlag] = newValue
+						}
+					"
+				/>
+			</div>
+		</div>
+	</section>
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue b/apps/app-frontend/src/components/ui/settings/display/FeatureFlagSettings.vue
similarity index 100%
rename from apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
rename to apps/app-frontend/src/components/ui/settings/display/FeatureFlagSettings.vue
diff --git a/apps/app-frontend/src/components/ui/settings/LanguageSettings.vue b/apps/app-frontend/src/components/ui/settings/display/LanguageSettings.vue
similarity index 91%
rename from apps/app-frontend/src/components/ui/settings/LanguageSettings.vue
rename to apps/app-frontend/src/components/ui/settings/display/LanguageSettings.vue
index f93bfdc39d..01f4384bcc 100644
--- a/apps/app-frontend/src/components/ui/settings/LanguageSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/LanguageSettings.vue
@@ -2,6 +2,7 @@
 import {
 	Admonition,
 	AutoLink,
+	commonSettingsMessages,
 	IntlFormatted,
 	LanguageSelector,
 	languageSelectorMessages,
@@ -43,7 +44,9 @@ async function onLocaleChange(newLocale: string) {
 </script>
 
 <template>
-	<h2 class="m-0 text-lg font-semibold text-contrast">Language</h2>
+	<h2 class="m-0 text-lg font-semibold text-contrast">
+		{{ formatMessage(commonSettingsMessages.language) }}
+	</h2>
 
 	<Admonition type="warning" class="mt-2 mb-4">
 		{{ formatMessage(languageSelectorMessages.languageWarning, { platform }) }}
diff --git a/apps/app-frontend/src/components/ui/settings/instances/DefaultInstanceSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/DefaultInstanceSettings.vue
new file mode 100644
index 0000000000..02183800b6
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/DefaultInstanceSettings.vue
@@ -0,0 +1,333 @@
+<script setup lang="ts">
+import {
+	defineMessages,
+	injectNotificationManager,
+	Slider,
+	StyledInput,
+	Toggle,
+	useVIntl,
+} from '@modrinth/ui'
+import { ref, watch } from 'vue'
+
+import useMemorySlider from '@/composables/useMemorySlider'
+import { get, set } from '@/helpers/settings.ts'
+
+const { handleError } = injectNotificationManager()
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	fullscreenTitle: {
+		id: 'app.settings.default-instance-options.fullscreen.title',
+		defaultMessage: 'Fullscreen',
+	},
+	fullscreenDescription: {
+		id: 'app.settings.default-instance-options.fullscreen.description',
+		defaultMessage: 'Start instances in fullscreen by updating their options.txt file.',
+	},
+	widthTitle: {
+		id: 'app.settings.default-instance-options.width.title',
+		defaultMessage: 'Width',
+	},
+	widthDescription: {
+		id: 'app.settings.default-instance-options.width.description',
+		defaultMessage: 'The width of the game window when launched.',
+	},
+	widthPlaceholder: {
+		id: 'app.settings.default-instance-options.width.placeholder',
+		defaultMessage: 'Enter width...',
+	},
+	heightTitle: {
+		id: 'app.settings.default-instance-options.height.title',
+		defaultMessage: 'Height',
+	},
+	heightDescription: {
+		id: 'app.settings.default-instance-options.height.description',
+		defaultMessage: 'The height of the game window when launched.',
+	},
+	heightPlaceholder: {
+		id: 'app.settings.default-instance-options.height.placeholder',
+		defaultMessage: 'Enter height...',
+	},
+	memoryAllocationTitle: {
+		id: 'app.settings.default-instance-options.memory-allocation.title',
+		defaultMessage: 'Memory allocation',
+	},
+	memoryAllocationDescription: {
+		id: 'app.settings.default-instance-options.memory-allocation.description',
+		defaultMessage: 'Maximum memory available to each instance.',
+	},
+	javaArgumentsTitle: {
+		id: 'app.settings.default-instance-options.java-arguments.title',
+		defaultMessage: 'Java arguments',
+	},
+	javaArgumentsPlaceholder: {
+		id: 'app.settings.default-instance-options.java-arguments.placeholder',
+		defaultMessage: 'Enter Java arguments...',
+	},
+	javaArgumentsDescription: {
+		id: 'app.settings.default-instance-options.java-arguments.description',
+		defaultMessage: 'Arguments passed to Java when launching an instance.',
+	},
+	environmentVariablesTitle: {
+		id: 'app.settings.default-instance-options.environment-variables.title',
+		defaultMessage: 'Environment variables',
+	},
+	environmentVariablesPlaceholder: {
+		id: 'app.settings.default-instance-options.environment-variables.placeholder',
+		defaultMessage: 'Enter environment variables...',
+	},
+	environmentVariablesDescription: {
+		id: 'app.settings.default-instance-options.environment-variables.description',
+		defaultMessage: 'Environment variables set when launching an instance.',
+	},
+	preLaunchHookTitle: {
+		id: 'app.settings.default-instance-options.pre-launch-hook.title',
+		defaultMessage: 'Pre-launch hook',
+	},
+	preLaunchHookPlaceholder: {
+		id: 'app.settings.default-instance-options.pre-launch-hook.placeholder',
+		defaultMessage: 'Enter pre-launch command...',
+	},
+	preLaunchHookDescription: {
+		id: 'app.settings.default-instance-options.pre-launch-hook.description',
+		defaultMessage: 'Runs before the instance starts.',
+	},
+	wrapperHookTitle: {
+		id: 'app.settings.default-instance-options.wrapper-hook.title',
+		defaultMessage: 'Wrapper hook',
+	},
+	wrapperHookPlaceholder: {
+		id: 'app.settings.default-instance-options.wrapper-hook.placeholder',
+		defaultMessage: 'Enter wrapper command...',
+	},
+	wrapperHookDescription: {
+		id: 'app.settings.default-instance-options.wrapper-hook.description',
+		defaultMessage: 'Command used to wrap the Minecraft launch process.',
+	},
+	postExitHookTitle: {
+		id: 'app.settings.default-instance-options.post-exit-hook.title',
+		defaultMessage: 'Post-exit hook',
+	},
+	postExitHookPlaceholder: {
+		id: 'app.settings.default-instance-options.post-exit-hook.placeholder',
+		defaultMessage: 'Enter post-exit command...',
+	},
+	postExitHookDescription: {
+		id: 'app.settings.default-instance-options.post-exit-hook.description',
+		defaultMessage: 'Runs after the game closes.',
+	},
+})
+
+const fetchSettings = await get()
+fetchSettings.launchArgs = fetchSettings.extra_launch_args.join(' ')
+fetchSettings.envVars = fetchSettings.custom_env_vars.map((x) => x.join('=')).join(' ')
+
+const settings = ref(fetchSettings)
+
+const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) as unknown as {
+	maxMemory: number
+	snapPoints: number[]
+}
+
+watch(
+	settings,
+	async () => {
+		const setSettings = JSON.parse(JSON.stringify(settings.value))
+
+		setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
+		setSettings.custom_env_vars = setSettings.envVars
+			.trim()
+			.split(/\s+/)
+			.filter(Boolean)
+			.map((x) => x.split('=').filter(Boolean))
+
+		if (!setSettings.hooks.pre_launch) {
+			setSettings.hooks.pre_launch = null
+		}
+		if (!setSettings.hooks.wrapper) {
+			setSettings.hooks.wrapper = null
+		}
+		if (!setSettings.hooks.post_exit) {
+			setSettings.hooks.post_exit = null
+		}
+
+		if (!setSettings.custom_dir) {
+			setSettings.custom_dir = null
+		}
+
+		await set(setSettings)
+	},
+	{ deep: true },
+)
+</script>
+
+<template>
+	<div>
+		<div class="flex flex-col gap-6">
+			<div class="flex items-center justify-between gap-4">
+				<div class="flex flex-col gap-1">
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.fullscreenTitle) }}
+					</h3>
+					<p class="m-0 leading-tight">
+						{{ formatMessage(messages.fullscreenDescription) }}
+					</p>
+				</div>
+
+				<Toggle id="fullscreen" v-model="settings.force_fullscreen" />
+			</div>
+
+			<div class="flex items-center justify-between gap-4">
+				<div class="flex flex-col gap-1">
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.widthTitle) }}
+					</h3>
+					<p class="m-0 leading-tight">
+						{{ formatMessage(messages.widthDescription) }}
+					</p>
+				</div>
+
+				<StyledInput
+					id="width"
+					v-model="settings.game_resolution[0]"
+					:disabled="settings.force_fullscreen"
+					autocomplete="off"
+					type="number"
+					:placeholder="formatMessage(messages.widthPlaceholder)"
+				/>
+			</div>
+
+			<div class="flex items-center justify-between gap-4">
+				<div class="flex flex-col gap-1">
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.heightTitle) }}
+					</h3>
+					<p class="m-0 leading-tight">
+						{{ formatMessage(messages.heightDescription) }}
+					</p>
+				</div>
+
+				<StyledInput
+					id="height"
+					v-model="settings.game_resolution[1]"
+					:disabled="settings.force_fullscreen"
+					autocomplete="off"
+					type="number"
+					:placeholder="formatMessage(messages.heightPlaceholder)"
+				/>
+			</div>
+		</div>
+
+		<hr class="my-6 bg-button-border border-none h-[1px]" />
+
+		<div class="flex flex-col gap-6">
+			<div class="flex flex-col gap-2.5">
+				<h2 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.memoryAllocationTitle) }}
+				</h2>
+				<Slider
+					id="max-memory"
+					v-model="settings.memory.maximum"
+					:min="512"
+					:max="maxMemory"
+					:step="64"
+					:snap-points="snapPoints"
+					:snap-range="512"
+					unit="MB"
+				/>
+				<p class="m-0 mt-1 leading-tight">
+					{{ formatMessage(messages.memoryAllocationDescription) }}
+				</p>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<h2 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.javaArgumentsTitle) }}
+				</h2>
+				<StyledInput
+					id="java-args"
+					v-model="settings.launchArgs"
+					autocomplete="off"
+					type="text"
+					:placeholder="formatMessage(messages.javaArgumentsPlaceholder)"
+					wrapper-class="w-full"
+				/>
+				<p class="m-0 leading-tight">
+					{{ formatMessage(messages.javaArgumentsDescription) }}
+				</p>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<h2 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.environmentVariablesTitle) }}
+				</h2>
+				<StyledInput
+					id="env-vars"
+					v-model="settings.envVars"
+					autocomplete="off"
+					type="text"
+					:placeholder="formatMessage(messages.environmentVariablesPlaceholder)"
+					wrapper-class="w-full"
+				/>
+				<p class="m-0 leading-tight">
+					{{ formatMessage(messages.environmentVariablesDescription) }}
+				</p>
+			</div>
+		</div>
+
+		<hr class="my-6 bg-button-border border-none h-[1px]" />
+
+		<div class="flex flex-col gap-6">
+			<div class="flex flex-col gap-2.5">
+				<h3 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.preLaunchHookTitle) }}
+				</h3>
+				<StyledInput
+					id="pre-launch"
+					v-model="settings.hooks.pre_launch"
+					autocomplete="off"
+					type="text"
+					:placeholder="formatMessage(messages.preLaunchHookPlaceholder)"
+					wrapper-class="w-full"
+				/>
+				<p class="m-0 leading-tight">
+					{{ formatMessage(messages.preLaunchHookDescription) }}
+				</p>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<h3 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.wrapperHookTitle) }}
+				</h3>
+				<StyledInput
+					id="wrapper"
+					v-model="settings.hooks.wrapper"
+					autocomplete="off"
+					type="text"
+					:placeholder="formatMessage(messages.wrapperHookPlaceholder)"
+					wrapper-class="w-full"
+				/>
+				<p class="m-0 leading-tight">
+					{{ formatMessage(messages.wrapperHookDescription) }}
+				</p>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<h3 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.postExitHookTitle) }}
+				</h3>
+				<StyledInput
+					id="post-exit"
+					v-model="settings.hooks.post_exit"
+					autocomplete="off"
+					type="text"
+					:placeholder="formatMessage(messages.postExitHookPlaceholder)"
+					wrapper-class="w-full"
+				/>
+				<p class="m-0 leading-tight">
+					{{ formatMessage(messages.postExitHookDescription) }}
+				</p>
+			</div>
+		</div>
+	</div>
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/JavaSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/JavaSettings.vue
similarity index 73%
rename from apps/app-frontend/src/components/ui/settings/JavaSettings.vue
rename to apps/app-frontend/src/components/ui/settings/instances/JavaSettings.vue
index 08e8b15257..525197f167 100644
--- a/apps/app-frontend/src/components/ui/settings/JavaSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/JavaSettings.vue
@@ -1,11 +1,19 @@
 <script setup>
-import { injectNotificationManager } from '@modrinth/ui'
+import { defineMessages, injectNotificationManager, useVIntl } from '@modrinth/ui'
 import { ref } from 'vue'
 
 import JavaSelector from '@/components/ui/JavaSelector.vue'
 import { get_java_versions, set_java_version } from '@/helpers/jre'
 
 const { handleError } = injectNotificationManager()
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	javaLocation: {
+		id: 'app.settings.java-installations.location.title',
+		defaultMessage: 'Java {version, number} location',
+	},
+})
 
 const javaVersions = ref(await get_java_versions().catch(handleError))
 async function updateJavaVersion(version) {
@@ -28,7 +36,7 @@ async function updateJavaVersion(version) {
 			class="flex flex-col gap-2.5"
 		>
 			<h2 class="m-0 text-lg font-semibold text-contrast" :class="{ 'mt-4': index !== 0 }">
-				Java {{ javaVersion }} location
+				{{ formatMessage(messages.javaLocation, { version: javaVersion }) }}
 			</h2>
 			<JavaSelector
 				:id="'java-selector-' + javaVersion"
diff --git a/apps/app-frontend/src/components/ui/settings/instances/ResourceManagementSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/ResourceManagementSettings.vue
new file mode 100644
index 0000000000..9b6aa92062
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/ResourceManagementSettings.vue
@@ -0,0 +1,292 @@
+<script setup>
+import { BoxIcon, FolderOpenIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
+import {
+	ButtonStyled,
+	defineMessages,
+	injectNotificationManager,
+	Slider,
+	StyledInput,
+	Toggle,
+	useVIntl,
+} from '@modrinth/ui'
+import { open } from '@tauri-apps/plugin-dialog'
+import { ref, watch } from 'vue'
+
+import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
+import { purge_cache_types } from '@/helpers/cache.js'
+import { get, set } from '@/helpers/settings.ts'
+import { showAppDbBackupsFolder } from '@/helpers/utils.js'
+import { useTheming } from '@/store/state'
+
+const { handleError } = injectNotificationManager()
+const { formatMessage } = useVIntl()
+const themeStore = useTheming()
+const settings = ref(await get())
+const purgeCacheConfirmModal = ref(null)
+const alwaysShowCopyDetailsFlag = 'always_show_copy_details'
+
+const messages = defineMessages({
+	appDirectoryTitle: {
+		id: 'app.settings.resource-management.app-directory.title',
+		defaultMessage: 'App directory',
+	},
+	appDirectoryDescription: {
+		id: 'app.settings.resource-management.app-directory.description',
+		defaultMessage:
+			'Where Modrinth App stores instances and other files. Changes take effect after restarting the app.',
+	},
+	selectAppDirectory: {
+		id: 'app.settings.resource-management.app-directory.select',
+		defaultMessage: 'Select a new app directory',
+	},
+	browseAppDirectory: {
+		id: 'app.settings.resource-management.app-directory.browse',
+		defaultMessage: 'Browse for an app directory',
+	},
+	appCacheTitle: {
+		id: 'app.settings.resource-management.app-cache.title',
+		defaultMessage: 'App cache',
+	},
+	purgeCache: {
+		id: 'app.settings.resource-management.app-cache.purge',
+		defaultMessage: 'Purge cache',
+	},
+	purgeCacheConfirmTitle: {
+		id: 'app.settings.resource-management.app-cache.confirm.title',
+		defaultMessage: 'Purge the app cache?',
+	},
+	purgeCacheConfirmDescription: {
+		id: 'app.settings.resource-management.app-cache.confirm.description',
+		defaultMessage: 'The app may load more slowly until the cache is rebuilt.',
+	},
+	appCacheDescription: {
+		id: 'app.settings.resource-management.app-cache.description',
+		defaultMessage:
+			'Clear cached data and download it again from Modrinth. The app may load more slowly until the cache is rebuilt.',
+	},
+	maximumConcurrentDownloadsTitle: {
+		id: 'app.settings.resource-management.maximum-concurrent-downloads.title',
+		defaultMessage: 'Maximum concurrent downloads',
+	},
+	maximumConcurrentDownloadsDescription: {
+		id: 'app.settings.resource-management.maximum-concurrent-downloads.description',
+		defaultMessage:
+			'Number of files the app can download at once. Lower this if downloads are unreliable on your connection. Requires an app restart.',
+	},
+	maximumConcurrentWritesTitle: {
+		id: 'app.settings.resource-management.maximum-concurrent-writes.title',
+		defaultMessage: 'Maximum concurrent writes',
+	},
+	maximumConcurrentWritesDescription: {
+		id: 'app.settings.resource-management.maximum-concurrent-writes.description',
+		defaultMessage:
+			'Number of files the app can write to disk at once. Lower this if you frequently encounter I/O errors. Requires an app restart.',
+	},
+	alwaysShowCopyDetailsTitle: {
+		id: 'app.settings.resource-management.always-show-copy-details.title',
+		defaultMessage: 'Always show copy details',
+	},
+	alwaysShowCopyDetailsDescription: {
+		id: 'app.settings.resource-management.always-show-copy-details.description',
+		defaultMessage:
+			'Show the Copy details action while an install is queued or running. It is always available for failed or interrupted installs.',
+	},
+	appDatabaseBackupsTitle: {
+		id: 'app.settings.resource-management.app-database-backups.title',
+		defaultMessage: 'App database backups',
+	},
+	openBackupsFolder: {
+		id: 'app.settings.resource-management.app-database-backups.open-folder',
+		defaultMessage: 'Open backups folder',
+	},
+	appDatabaseBackupsDescription: {
+		id: 'app.settings.resource-management.app-database-backups.description',
+		defaultMessage:
+			'Backups of important app data are stored here in case you need to recover them later.',
+	},
+})
+
+watch(
+	settings,
+	async () => {
+		const setSettings = JSON.parse(JSON.stringify(settings.value))
+
+		if (!setSettings.custom_dir) {
+			setSettings.custom_dir = null
+		}
+
+		await set(setSettings)
+	},
+	{ deep: true },
+)
+
+async function purgeCache() {
+	await purge_cache_types([
+		'project',
+		'project_v3',
+		'version',
+		'user',
+		'team',
+		'organization',
+		'file',
+		'loader_manifest',
+		'minecraft_manifest',
+		'categories',
+		'report_types',
+		'loaders',
+		'game_versions',
+		'donation_platforms',
+		'file_hash',
+		'file_update',
+		'search_results',
+		'search_results_v3',
+	]).catch(handleError)
+}
+
+function handlePurgeCacheClick() {
+	if (themeStore.getFeatureFlag('skip_non_essential_warnings')) {
+		void purgeCache()
+		return
+	}
+
+	purgeCacheConfirmModal.value?.show()
+}
+
+async function openDbBackupsFolder() {
+	await showAppDbBackupsFolder().catch(handleError)
+}
+
+async function findLauncherDir() {
+	const newDir = await open({
+		multiple: false,
+		directory: true,
+		title: formatMessage(messages.selectAppDirectory),
+	})
+
+	if (newDir) {
+		settings.value.custom_dir = newDir
+	}
+}
+</script>
+
+<template>
+	<div class="flex flex-col gap-6">
+		<div class="flex flex-col gap-2.5">
+			<h2 class="m-0 text-lg font-semibold text-contrast">
+				{{ formatMessage(messages.appDirectoryTitle) }}
+			</h2>
+			<StyledInput
+				id="appDir"
+				v-model="settings.custom_dir"
+				:icon="BoxIcon"
+				type="text"
+				wrapper-class="w-full"
+			>
+				<template #right>
+					<ButtonStyled circular>
+						<button
+							v-tooltip="formatMessage(messages.browseAppDirectory)"
+							:aria-label="formatMessage(messages.browseAppDirectory)"
+							class="ml-1.5"
+							@click="findLauncherDir"
+						>
+							<FolderSearchIcon aria-hidden="true" />
+						</button>
+					</ButtonStyled>
+				</template>
+			</StyledInput>
+			<p class="m-0 leading-tight text-secondary">
+				{{ formatMessage(messages.appDirectoryDescription) }}
+			</p>
+		</div>
+
+		<div class="flex items-center justify-between gap-4">
+			<div>
+				<h2 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.alwaysShowCopyDetailsTitle) }}
+				</h2>
+				<p class="m-0 mt-1">
+					{{ formatMessage(messages.alwaysShowCopyDetailsDescription) }}
+				</p>
+			</div>
+			<Toggle
+				id="always-show-copy-details"
+				:model-value="themeStore.getFeatureFlag(alwaysShowCopyDetailsFlag)"
+				@update:model-value="
+					() => {
+						const newValue = !themeStore.getFeatureFlag(alwaysShowCopyDetailsFlag)
+						themeStore.featureFlags[alwaysShowCopyDetailsFlag] = newValue
+						settings.feature_flags[alwaysShowCopyDetailsFlag] = newValue
+					}
+				"
+			/>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<ConfirmModalWrapper
+				ref="purgeCacheConfirmModal"
+				:title="formatMessage(messages.purgeCacheConfirmTitle)"
+				:description="formatMessage(messages.purgeCacheConfirmDescription)"
+				:has-to-type="false"
+				:proceed-label="formatMessage(messages.purgeCache)"
+				:show-ad-on-close="false"
+				@proceed="purgeCache"
+			/>
+			<h2 class="m-0 text-lg font-semibold text-contrast">
+				{{ formatMessage(messages.appCacheTitle) }}
+			</h2>
+			<button id="purge-cache" class="btn min-w-max" @click="handlePurgeCacheClick">
+				<TrashIcon aria-hidden="true" />
+				{{ formatMessage(messages.purgeCache) }}
+			</button>
+			<p class="m-0 leading-tight text-secondary">
+				{{ formatMessage(messages.appCacheDescription) }}
+			</p>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<h2 class="m-0 text-lg font-semibold text-contrast mt-4">
+				{{ formatMessage(messages.maximumConcurrentDownloadsTitle) }}
+			</h2>
+			<Slider
+				id="max-downloads"
+				v-model="settings.max_concurrent_downloads"
+				:min="1"
+				:max="10"
+				:step="1"
+			/>
+			<p class="m-0 leading-tight text-secondary">
+				{{ formatMessage(messages.maximumConcurrentDownloadsDescription) }}
+			</p>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<h2 class="mt-0 m-0 text-lg font-semibold text-contrast">
+				{{ formatMessage(messages.maximumConcurrentWritesTitle) }}
+			</h2>
+			<Slider
+				id="max-writes"
+				v-model="settings.max_concurrent_writes"
+				:min="1"
+				:max="50"
+				:step="1"
+			/>
+			<p class="m-0 leading-tight text-secondary">
+				{{ formatMessage(messages.maximumConcurrentWritesDescription) }}
+			</p>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<h2 class="mt-0 m-0 text-lg font-semibold text-contrast">
+				{{ formatMessage(messages.appDatabaseBackupsTitle) }}
+			</h2>
+			<button id="open-db-backups-folder" class="btn min-w-max" @click="openDbBackupsFolder">
+				<FolderOpenIcon aria-hidden="true" />
+				{{ formatMessage(messages.openBackupsFolder) }}
+			</button>
+			<p class="m-0 leading-tight text-secondary">
+				{{ formatMessage(messages.appDatabaseBackupsDescription) }}
+			</p>
+		</div>
+	</div>
+</template>
diff --git a/apps/app-frontend/src/components/ui/shared-instances/ConfirmRevokeSharedInstanceInviteModal.vue b/apps/app-frontend/src/components/ui/shared-instances/ConfirmRevokeSharedInstanceInviteModal.vue
new file mode 100644
index 0000000000..e373ce7b93
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/shared-instances/ConfirmRevokeSharedInstanceInviteModal.vue
@@ -0,0 +1,82 @@
+<template>
+	<NewModal ref="modal" :header="formatMessage(messages.header)" fade="danger" max-width="500px">
+		<Admonition type="critical" :header="formatMessage(messages.admonitionHeader)">
+			<IntlFormatted :message-id="messages.admonitionBody" :values="{ code: inviteCode }">
+				<template #monospace="{ children }">
+					<code class="font-mono"><component :is="() => children" /></code>
+				</template>
+			</IntlFormatted>
+		</Admonition>
+
+		<template #actions>
+			<div class="flex justify-end gap-2">
+				<ButtonStyled type="outlined">
+					<button @click="modal?.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</button>
+				</ButtonStyled>
+				<ButtonStyled color="red">
+					<button @click="confirm">
+						<XIcon />
+						{{ formatMessage(messages.revokeButton) }}
+					</button>
+				</ButtonStyled>
+			</div>
+		</template>
+	</NewModal>
+</template>
+
+<script setup lang="ts">
+import { XIcon } from '@modrinth/assets'
+import {
+	Admonition,
+	ButtonStyled,
+	commonMessages,
+	defineMessages,
+	IntlFormatted,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
+import { ref } from 'vue'
+
+const { formatMessage } = useVIntl()
+const modal = ref<InstanceType<typeof NewModal>>()
+const inviteCode = ref('')
+
+const emit = defineEmits<{
+	revoke: [inviteCode: string]
+}>()
+
+function show(code: string) {
+	inviteCode.value = code
+	modal.value?.show()
+}
+
+function confirm() {
+	modal.value?.hide()
+	emit('revoke', inviteCode.value)
+}
+
+const messages = defineMessages({
+	header: {
+		id: 'instance.settings.sharing.revoke-invite.header',
+		defaultMessage: 'Revoke invite',
+	},
+	admonitionHeader: {
+		id: 'instance.settings.sharing.revoke-invite.admonition-header',
+		defaultMessage: 'This action cannot be undone',
+	},
+	admonitionBody: {
+		id: 'instance.settings.sharing.revoke-invite.admonition-body',
+		defaultMessage:
+			'The invite link <monospace>{code}</monospace> will stop working immediately. People who already joined will keep access.',
+	},
+	revokeButton: {
+		id: 'instance.settings.sharing.revoke-invite.confirm',
+		defaultMessage: 'Revoke invite',
+	},
+})
+
+defineExpose({ show })
+</script>
diff --git a/apps/app-frontend/src/components/ui/shared-instances/SharedInstanceUpdateModal.vue b/apps/app-frontend/src/components/ui/shared-instances/SharedInstanceUpdateModal.vue
index f9c531fad1..342d900d56 100644
--- a/apps/app-frontend/src/components/ui/shared-instances/SharedInstanceUpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/shared-instances/SharedInstanceUpdateModal.vue
@@ -43,8 +43,9 @@ import type { GameInstance } from '@/helpers/types'
 type UpdateCompleteCallback = () => void | Promise<void>
 
 const emit = defineEmits<{
+	accepted: []
 	cancel: []
-	complete: []
+	complete: [successful: boolean]
 	report: [event?: MouseEvent]
 	sharedInstanceUnavailable: [reason: SharedInstanceUnavailableReason | null]
 }>()
@@ -72,11 +73,14 @@ const diffs = computed<ContentDiffItem[]>(
 )
 
 async function update() {
+	let successful = false
+	emit('accepted')
 	try {
 		if (instance.value) {
 			const job = await install_update_shared_instance(instance.value.id)
 			await wait_for_install_job(job.job_id)
 			await onComplete.value()
+			successful = true
 		}
 	} catch (error) {
 		if (isSharedInstanceUnavailableError(error)) {
@@ -85,7 +89,7 @@ async function update() {
 		}
 		notifySharedInstanceError(error)
 	} finally {
-		emit('complete')
+		emit('complete', successful)
 	}
 }
 
diff --git a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue
index e4ebfd949f..19a498942b 100644
--- a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue
+++ b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue
@@ -64,7 +64,29 @@
 				</div>
 			</Admonition>
 			<p v-else class="m-0 text-primary">
-				{{ formatMessage(messages.inviteWarning) }}
+				<IntlFormatted
+					v-if="creator"
+					:message-id="messages.inviteWarningWithCreator"
+					:values="{ username: creator.username }"
+				>
+					<template #creator="{ children }">
+						<AutoLink :to="creatorProfileLink" class="font-medium text-contrast hover:underline">
+							<Avatar
+								:src="creator.avatarUrl"
+								:alt="creator.username"
+								:tint-by="creator.username"
+								size="24px"
+								circle
+								no-shadow
+								class="mr-1 inline-block align-middle"
+							/>
+							<span><component :is="() => children" /></span>
+						</AutoLink>
+					</template>
+				</IntlFormatted>
+				<template v-else>
+					{{ formatMessage(messages.inviteWarning) }}
+				</template>
 			</p>
 			<SharedInstanceInstallSummary
 				:preview="preview"
@@ -226,6 +248,7 @@ import { BanIcon, DownloadIcon, ReportIcon, SendIcon, SpinnerIcon, XIcon } from
 import {
 	Admonition,
 	AutoLink,
+	Avatar,
 	ButtonStyled,
 	Checkbox,
 	Combobox,
@@ -243,8 +266,10 @@ import {
 	useScrollIndicator,
 	useVIntl,
 } from '@modrinth/ui'
+import { openUrl } from '@tauri-apps/plugin-opener'
 import { computed, nextTick, ref } from 'vue'
 
+import { config } from '@/config'
 import { hide_ads_window, show_ads_window } from '@/helpers/ads'
 import { toError } from '@/helpers/errors'
 import type { SharedInstanceInstallPreview } from '@/helpers/install'
@@ -258,11 +283,16 @@ type ExternalFileRow = {
 	id: string
 	name: string
 }
+type SharedInstanceCreator = {
+	username: string
+	avatarUrl: string | null
+}
 
 const modal = ref<InstanceType<typeof NewModal>>()
 const contentModal = ref<InstanceType<typeof ModpackContentModal>>()
 const externalFileTable = ref<HTMLElement | null>(null)
 const preview = ref<SharedInstanceInstallPreview | null>(null)
+const creator = ref<SharedInstanceCreator | null>(null)
 const install = ref<() => void | Promise<void>>(() => {})
 const reportMode = ref(false)
 const reportOnly = ref(false)
@@ -302,6 +332,12 @@ const reportReasonOptions = computed<ComboboxOption<ReportReason>[]>(() => [
 const canSubmitReport = computed(
 	() => Boolean(preview.value && additionalContext.value.trim()) && !submitLoading.value,
 )
+const creatorProfileLink = computed(() => {
+	const username = creator.value?.username
+	return username
+		? () => openUrl(`${config.siteUrl}/user/${encodeURIComponent(username)}`)
+		: undefined
+})
 
 async function accept() {
 	hide()
@@ -381,6 +417,7 @@ function handleCancel() {
 }
 function handleHide() {
 	resetReportState()
+	creator.value = null
 	show_ads_window()
 }
 function resetReportState() {
@@ -395,14 +432,17 @@ function resetReportState() {
 function show(
 	previewValue: SharedInstanceInstallPreview,
 	installValue: () => void | Promise<void>,
+	creatorValue?: SharedInstanceCreator,
 	event?: MouseEvent,
 ) {
 	resetReportState()
+	creator.value = creatorValue ?? null
 	install.value = installValue
 	showPreview(previewValue, event)
 }
 function showReport(previewValue: SharedInstanceInstallPreview, event?: MouseEvent) {
 	resetReportState()
+	creator.value = null
 	reportMode.value = true
 	reportOnly.value = true
 	install.value = () => {}
@@ -437,6 +477,11 @@ const messages = defineMessages({
 		defaultMessage:
 			'This invite was created by another Modrinth user, not Modrinth. Only accept invites from people you trust.',
 	},
+	inviteWarningWithCreator: {
+		id: 'app.modal.install-to-play.invite-warning-with-creator',
+		defaultMessage:
+			'This invite was created by <creator>{username}</creator>, not Modrinth. Only accept invites from people you trust.',
+	},
 	reportDescription: {
 		id: 'app.modal.install-to-play.report-description',
 		defaultMessage:
diff --git a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/use-shared-instance-preview-content.ts b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/use-shared-instance-preview-content.ts
index 671b4b1899..3646f87592 100644
--- a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/use-shared-instance-preview-content.ts
+++ b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/use-shared-instance-preview-content.ts
@@ -1,7 +1,7 @@
 import type { Labrinth } from '@modrinth/api-client'
 import type { ContentItem } from '@modrinth/ui'
 
-import { get_project_many, get_version, get_version_many } from '@/helpers/cache.js'
+import { get_project, get_project_many, get_version, get_version_many } from '@/helpers/cache.js'
 import type { SharedInstanceInstallPreview } from '@/helpers/install'
 
 type VersionDependency = Labrinth.Versions.v2.Dependency & { version_id?: string }
@@ -20,7 +20,18 @@ export function useSharedInstancePreviewContent() {
 	async function modpackContentItems(preview: SharedInstanceInstallPreview) {
 		if (!preview.modpackVersionId) return []
 		const version = await get_version(preview.modpackVersionId, 'must_revalidate')
-		return await contentItemsFromDependencies(version?.dependencies ?? [])
+		if (!version) return []
+
+		const [project, contentItems] = await Promise.all([
+			get_project(version.project_id, 'must_revalidate'),
+			contentItemsFromDependencies(version.dependencies ?? []),
+		])
+		if (!project) return contentItems
+
+		return contentItems.map((item) => ({
+			...item,
+			source: { project },
+		}))
 	}
 
 	async function contentItemsFromDependencies(dependencies: Labrinth.Versions.v2.Dependency[]) {
diff --git a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-invite-handler/use-shared-instance-invite-handler.ts b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-invite-handler/use-shared-instance-invite-handler.ts
index c71fe78f27..97d197dbcc 100644
--- a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-invite-handler/use-shared-instance-invite-handler.ts
+++ b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-invite-handler/use-shared-instance-invite-handler.ts
@@ -17,6 +17,7 @@ import {
 	install_shared_instance,
 } from '@/helpers/install'
 import { list } from '@/helpers/instance'
+import { useSharedInstanceErrors } from '@/helpers/shared-instance-errors'
 import { useTheming } from '@/store/state'
 
 import { parseSharedInstanceInviteNotification } from './shared-instance-invite-parser'
@@ -26,9 +27,15 @@ type InstallModal = {
 	show(
 		preview: Awaited<ReturnType<typeof install_get_shared_instance_preview>>,
 		install: () => Promise<void>,
+		creator?: SharedInstanceCreator,
 	): void
 }
 
+type SharedInstanceCreator = {
+	username: string
+	avatarUrl: string | null
+}
+
 type AccountRequiredModal = {
 	show(event?: MouseEvent): Promise<boolean>
 }
@@ -45,6 +52,8 @@ export function useSharedInstanceInviteHandler(
 	const auth = injectAuth()
 	const client = injectModrinthClient()
 	const { handleError } = injectNotificationManager()
+	const { notifySharedInstanceConnectionError, notifySharedInstanceError } =
+		useSharedInstanceErrors()
 	const popupNotificationManager = injectPopupNotificationManager()
 	const queryClient = useQueryClient()
 	const router = useRouter()
@@ -58,6 +67,7 @@ export function useSharedInstanceInviteHandler(
 				instanceId: string
 				preview: Awaited<ReturnType<typeof install_get_shared_instance_preview>>
 				install: () => Promise<void>
+				creator?: SharedInstanceCreator
 				onGoToInstance?: () => void | Promise<void>
 		  }
 		| undefined
@@ -73,10 +83,13 @@ export function useSharedInstanceInviteHandler(
 
 	async function resolveInvite(invite: SharedInstanceInvite) {
 		const [invitedBy, sharedInstance] = await Promise.all([
-			!invite.invitedByUsername && invite.invitedById
+			(!invite.invitedByUsername || !invite.invitedByAvatarUrl) && invite.invitedById
 				? get_user(invite.invitedById, 'bypass').catch(() => null)
 				: null,
-			client.sharedinstances.instances_v1.get(invite.sharedInstanceId).catch(() => null),
+			client.sharedinstances.instances_v1.get(invite.sharedInstanceId).catch(() => {
+				notifySharedInstanceConnectionError()
+				return null
+			}),
 		])
 
 		return {
@@ -90,15 +103,17 @@ export function useSharedInstanceInviteHandler(
 	function showInstall(
 		preview: Awaited<ReturnType<typeof install_get_shared_instance_preview>>,
 		install: () => Promise<void>,
+		creator?: SharedInstanceCreator,
 	) {
 		if (!installModal.value) throw new Error('Shared instance install modal is not available.')
-		installModal.value.show(preview, install)
+		installModal.value.show(preview, install, creator)
 	}
 
 	async function showInstallOrAlreadyInstalled(
 		sharedInstanceId: string,
 		preview: Awaited<ReturnType<typeof install_get_shared_instance_preview>>,
 		install: () => Promise<void>,
+		creator?: SharedInstanceCreator,
 		onGoToInstance?: () => void | Promise<void>,
 	) {
 		const existingInstance = (await list()).find(
@@ -106,7 +121,7 @@ export function useSharedInstanceInviteHandler(
 		)
 
 		if (!existingInstance || themeStore.getFeatureFlag('skip_non_essential_warnings')) {
-			showInstall(preview, install)
+			showInstall(preview, install, creator)
 			return
 		}
 
@@ -118,6 +133,7 @@ export function useSharedInstanceInviteHandler(
 			instanceId: existingInstance.id,
 			preview,
 			install,
+			creator,
 			onGoToInstance,
 		}
 		alreadyInstalledModal.value.show(existingInstance.name)
@@ -146,7 +162,7 @@ export function useSharedInstanceInviteHandler(
 		const pending = pendingAlreadyInstalled
 		pendingAlreadyInstalled = undefined
 		if (!pending) return
-		showInstall(pending.preview, pending.install)
+		showInstall(pending.preview, pending.install, pending.creator)
 	}
 
 	async function acceptNotification(notification: AppNotification, invite: SharedInstanceInvite) {
@@ -172,10 +188,16 @@ export function useSharedInstanceInviteHandler(
 					await markNotificationRead(notification)
 					await queryClient.invalidateQueries({ queryKey: ['instances'] })
 				},
+				invite.invitedByUsername
+					? {
+							username: invite.invitedByUsername,
+							avatarUrl: invite.invitedByAvatarUrl,
+						}
+					: undefined,
 				() => markNotificationRead(notification),
 			)
 		} catch (error) {
-			handleError(toError(error))
+			notifySharedInstanceError(error)
 		}
 	}
 
@@ -253,19 +275,32 @@ export function useSharedInstanceInviteHandler(
 		try {
 			if (!(await requireAccount())) return
 			const invite = await install_accept_shared_instance_invite(inviteId)
-			await showInstallOrAlreadyInstalled(invite.sharedInstanceId, invite.preview, async () => {
-				await install_shared_instance(
-					invite.sharedInstanceId,
-					invite.preview.name,
-					invite.managerId,
-					invite.serverManagerName,
-					invite.serverManagerIconUrl,
-					invite.instanceIconUrl,
-				)
-				await queryClient.invalidateQueries({ queryKey: ['instances'] })
-			})
+			const manager = invite.managerId
+				? await get_user(invite.managerId, 'bypass').catch(() => null)
+				: null
+			await showInstallOrAlreadyInstalled(
+				invite.sharedInstanceId,
+				invite.preview,
+				async () => {
+					await install_shared_instance(
+						invite.sharedInstanceId,
+						invite.preview.name,
+						invite.managerId,
+						invite.serverManagerName,
+						invite.serverManagerIconUrl,
+						invite.instanceIconUrl,
+					)
+					await queryClient.invalidateQueries({ queryKey: ['instances'] })
+				},
+				manager
+					? {
+							username: manager.username,
+							avatarUrl: manager.avatar_url ?? null,
+						}
+					: undefined,
+			)
 		} catch (error) {
-			handleError(toError(error))
+			notifySharedInstanceError(error)
 		}
 	}
 
diff --git a/apps/app-frontend/src/helpers/install.ts b/apps/app-frontend/src/helpers/install.ts
index 69d608fd7e..6c92aaa897 100644
--- a/apps/app-frontend/src/helpers/install.ts
+++ b/apps/app-frontend/src/helpers/install.ts
@@ -102,6 +102,7 @@ export interface SharedInstanceUpdateDiff {
 }
 
 export const SHARED_INSTANCE_UNAVAILABLE_ERROR_CODE = 'shared_instance_unavailable'
+export const SHARED_INSTANCES_API_ERROR_CODE = 'shared_instances_api_error'
 
 export type SharedInstanceUnavailableReason = 'deleted' | 'access_revoked' | 'quarantined'
 
@@ -113,6 +114,10 @@ export function isSharedInstanceUnavailableError(error: unknown) {
 	return getSharedInstanceUnavailableReason(error) !== null
 }
 
+export function isSharedInstancesApiError(error: unknown) {
+	return isRecord(error) && error.code === SHARED_INSTANCES_API_ERROR_CODE
+}
+
 export function getSharedInstanceUnavailableReason(
 	error: unknown,
 ): SharedInstanceUnavailableReason | null {
diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
index caf54aa46b..512af7cf40 100644
--- a/apps/app-frontend/src/helpers/instance.ts
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -365,6 +365,13 @@ export interface SharedInstanceInviteLink {
 	maxUses: number
 }
 
+export interface SharedInstanceInvite {
+	id: string
+	expiration: string
+	maxUses: number
+	uses: number
+}
+
 export async function can_current_user_use_shared_instances(): Promise<boolean> {
 	return await invoke('plugin:instance|instance_share_can_current_user_use')
 }
@@ -394,6 +401,19 @@ export async function create_shared_instance_invite_link(
 	})
 }
 
+export async function get_shared_instance_invites(
+	instanceId: string,
+): Promise<SharedInstanceInvite[]> {
+	return await invoke('plugin:instance|instance_share_get_invites', { instanceId })
+}
+
+export async function revoke_shared_instance_invite(
+	instanceId: string,
+	inviteId: string,
+): Promise<void> {
+	return await invoke('plugin:instance|instance_share_revoke_invite', { instanceId, inviteId })
+}
+
 export async function remove_shared_instance_users(
 	instanceId: string,
 	userIds: string[],
diff --git a/apps/app-frontend/src/helpers/settings.ts b/apps/app-frontend/src/helpers/settings.ts
index a63dbe78e3..dd6bdf3ac6 100644
--- a/apps/app-frontend/src/helpers/settings.ts
+++ b/apps/app-frontend/src/helpers/settings.ts
@@ -37,7 +37,7 @@ export type AppSettings = {
 
 	theme: ColorTheme
 	locale: string
-	default_page: 'home' | 'library'
+	default_page: 'Home' | 'Library'
 	collapsed_navigation: boolean
 	hide_nametag_skins_page: boolean
 	advanced_rendering: boolean
diff --git a/apps/app-frontend/src/helpers/shared-instance-errors.ts b/apps/app-frontend/src/helpers/shared-instance-errors.ts
index e1e92efcae..b0ce5d0f74 100644
--- a/apps/app-frontend/src/helpers/shared-instance-errors.ts
+++ b/apps/app-frontend/src/helpers/shared-instance-errors.ts
@@ -1,6 +1,10 @@
 import { defineMessages, injectNotificationManager, useVIntl } from '@modrinth/ui'
 
-import { getErrorMessage, type SharedInstanceUnavailableReason } from '@/helpers/install'
+import {
+	getErrorMessage,
+	isSharedInstancesApiError,
+	type SharedInstanceUnavailableReason,
+} from '@/helpers/install'
 
 export const sharedInstanceErrorMessages = defineMessages({
 	unavailableTitle: {
@@ -39,6 +43,14 @@ export const sharedInstanceErrorMessages = defineMessages({
 		id: 'instance.shared-instance.error.title',
 		defaultMessage: 'Something has gone wrong',
 	},
+	networkErrorTitle: {
+		id: 'instance.shared-instance.network-error.title',
+		defaultMessage: 'Network error',
+	},
+	networkErrorText: {
+		id: 'instance.shared-instance.network-error.text',
+		defaultMessage: 'Unable to connect to shared instances API',
+	},
 })
 
 export function sharedInstanceUnavailableTextMessage(
@@ -82,7 +94,20 @@ export function useSharedInstanceErrors() {
 		})
 	}
 
+	function notifySharedInstanceConnectionError() {
+		addNotification({
+			type: 'error',
+			title: formatMessage(sharedInstanceErrorMessages.networkErrorTitle),
+			text: formatMessage(sharedInstanceErrorMessages.networkErrorText),
+		})
+	}
+
 	function notifySharedInstanceError(error: unknown) {
+		if (isSharedInstancesApiError(error)) {
+			notifySharedInstanceConnectionError()
+			return
+		}
+
 		addNotification({
 			type: 'error',
 			title: formatMessage(sharedInstanceErrorMessages.errorTitle),
@@ -92,6 +117,7 @@ export function useSharedInstanceErrors() {
 
 	return {
 		formatSharedInstanceUnavailable,
+		notifySharedInstanceConnectionError,
 		notifySharedInstanceError,
 		notifySharedInstanceUnavailable,
 	}
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index d451e649a9..9c16d0219a 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -189,7 +189,7 @@ type AppSettings = {
 	max_concurrent_downloads: number
 	max_concurrent_writes: number
 
-	theme: 'dark' | 'light' | 'oled'
+	theme: 'dark' | 'light' | 'oled' | 'retro' | 'system'
 	default_page: 'Home' | 'Library'
 	collapsed_navigation: boolean
 	advanced_rendering: boolean
diff --git a/apps/app-frontend/src/locales/ar-SA/index.json b/apps/app-frontend/src/locales/ar-SA/index.json
index 7a50ca708f..98e663c7e7 100644
--- a/apps/app-frontend/src/locales/ar-SA/index.json
+++ b/apps/app-frontend/src/locales/ar-SA/index.json
@@ -182,9 +182,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "الزخارف التقليدية"
   },
-  "app.appearance-settings.select-option": {
-    "message": "حدد خياراً"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "يعرض مقدار الوقت الذي قضيته في لعب إحدى المهام."
   },
diff --git a/apps/app-frontend/src/locales/cs-CZ/index.json b/apps/app-frontend/src/locales/cs-CZ/index.json
index 472059a8d6..16ad9f8663 100644
--- a/apps/app-frontend/src/locales/cs-CZ/index.json
+++ b/apps/app-frontend/src/locales/cs-CZ/index.json
@@ -113,9 +113,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Systémové dekorace"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Vyberte možnost"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Zobrazuje, kolik času jsi strávil hraním instance."
   },
diff --git a/apps/app-frontend/src/locales/da-DK/index.json b/apps/app-frontend/src/locales/da-DK/index.json
index e96be03532..4c423a6862 100644
--- a/apps/app-frontend/src/locales/da-DK/index.json
+++ b/apps/app-frontend/src/locales/da-DK/index.json
@@ -173,9 +173,6 @@
   "app.appearance-settings.minimize-launcher.title": {
     "message": "Minimer launcher"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Vælg en mulighed"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Vis hvor meget tid du har brugt på at spille en instance."
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index 9be911b105..4bed44d79a 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Native Dekorationen"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Option wählen"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Zeigt an, wie viel Zeit du mit dem Spielen einer Instanz verbracht hast."
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index ecb806b973..6d0c8a3172 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Native Dekorationen"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Wähle eine Option"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Zeigt an, wie viel Zeit du damit verbracht hast, eine Instanz zu spielen."
   },
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 7855b44311..38e7573bc6 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -144,19 +144,19 @@
     "message": "Your privacy and how ads support Modrinth"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Enables advanced rendering such as blur effects that may cause performance issues without hardware-accelerated rendering."
+    "message": "Enable visual effects such as background blur. This may reduce performance without hardware acceleration."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Advanced rendering"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Select your preferred color theme for Modrinth App."
+    "message": "Choose the color theme used by Modrinth App."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Color theme"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Change the page to which the launcher opens on."
+    "message": "Choose the page shown when Modrinth App opens."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Home"
@@ -168,52 +168,49 @@
     "message": "Default landing page"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Disables the nametag above your player on the skins page."
+    "message": "Hide your username above the player preview on the Skin selector page."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Hide nametag"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Includes recent worlds in the \"Jump back in\" section on the Home page."
+    "message": "Show recently played worlds in the \"Jump back in\" section on the Home page."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Jump back into worlds"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimize the launcher when a Minecraft process starts."
+    "message": "Minimize Modrinth App when Minecraft starts."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimize launcher"
+    "message": "Minimize app"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Use system window frame (app restart required)."
+    "message": "Use your operating system's title bar and window controls. Requires an app restart."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Native decorations"
-  },
-  "app.appearance-settings.select-option": {
-    "message": "Select an option"
+    "message": "System window frame"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Displays how much time you've spent playing an instance."
+    "message": "Show how long you've played each instance."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Show play time"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Automatically skips low-risk confirmations like duplicate modpack installs, normal content deletion, bulk updates, unlinking modpacks, and repair prompts. Dangerous warnings will still be shown."
+    "message": "Skip confirmations for low-risk actions such as duplicate installs, normal content deletion, bulk updates, unlinking, and repairs. Warnings for dangerous actions are always shown."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Skip non-essential warnings"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Enables the ability to toggle the sidebar."
+    "message": "Hide the right sidebar by default and add a button to show or hide it."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Toggle sidebar"
+    "message": "Hide right sidebar"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "If you attempt to install a Modrinth Pack file (.mrpack) that isn't hosted on Modrinth, we'll make sure you understand the risks before installing it."
+    "message": "Show a safety warning before installing a Modrinth Pack (.mrpack) that isn't hosted on Modrinth."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Warn me before installing unknown modpacks"
@@ -224,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "Cannot reach authentication servers"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Confirmations"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Home and content"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Startup and navigation"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Adding server to instance"
   },
@@ -365,9 +371,18 @@
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Review changes"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Review update"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "Reviewing..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "An update is required to play {name}. Please update to latest version to launch the game."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "An update is available"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "All data for your instance will be permanently deleted, including your worlds, configs, and all installed content."
   },
@@ -434,6 +449,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "Share {name}"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "This instance has reached the {limit}-user limit."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "You need to sign in as"
   },
@@ -452,6 +470,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Wrong account"
   },
+  "app.instance.share.members.empty": {
+    "message": "No users have joined yet"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "No users match your filters."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "They will no longer receive updates for this shared instance"
   },
@@ -482,6 +506,12 @@
   "app.instance.share.sign-in.button": {
     "message": "Sign in"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "The shared instances service is not accessible at the moment, please try again later"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Unable to connect"
+  },
   "app.instance.share.unlink.body": {
     "message": "You must unlink this modpack to share your instance"
   },
@@ -569,6 +599,51 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Search {count} worlds..."
   },
+  "app.java-detection.cancel": {
+    "message": "Cancel"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Actions"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Path"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Version"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "No Java installations found."
+  },
+  "app.java-detection.select": {
+    "message": "Select"
+  },
+  "app.java-detection.selected": {
+    "message": "Selected"
+  },
+  "app.java-detection.title": {
+    "message": "Select Java installation"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Already installed"
+  },
+  "app.java-selector.browse": {
+    "message": "Browse"
+  },
+  "app.java-selector.detect": {
+    "message": "Detect"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Install recommended"
+  },
+  "app.java-selector.installing": {
+    "message": "Installing..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/path/to/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Test Java installation"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Additional context"
   },
@@ -596,6 +671,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "This invite was created by another Modrinth user, not Modrinth. Only accept invites from people you trust."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "This invite was created by <creator>{username}</creator>, not Modrinth. Only accept invites from people you trust."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {# mod} other {# mods}}"
   },
@@ -731,11 +809,86 @@
   "app.project.versions.already-installed": {
     "message": "Already installed"
   },
-  "app.resource-management-settings.always-show-copy-details.description": {
-    "message": "Show the Copy details action while an install is queued or running. It is always available for failed or interrupted installs."
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
   },
-  "app.resource-management-settings.always-show-copy-details.title": {
-    "message": "Always show copy details"
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "Environment variables set when launching an instance."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Enter environment variables..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Environment variables"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Start instances in fullscreen by updating their options.txt file."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Fullscreen"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "The height of the game window when launched."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Enter height..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Height"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "Arguments passed to Java when launching an instance."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Enter Java arguments..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java arguments"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "Maximum memory available to each instance."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Memory allocation"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Runs after the game closes."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Enter post-exit command..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Post-exit hook"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Runs before the instance starts."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Enter pre-launch command..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Pre-launch hook"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "The width of the game window when launched."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Enter width..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Width"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Command used to wrap the Minecraft launch process."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Enter wrapper command..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Wrapper hook"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Toggle developer mode"
   },
   "app.restarting": {
     "message": "Restarting..."
@@ -746,12 +899,90 @@
   "app.settings.downloading": {
     "message": "Downloading v{version}"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Java {version, number} location"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Ads make Modrinth possible and fund creator payouts. Our partners may store or access cookies in the app to personalize ads and measure performance. You can opt out or manage your preferences below."
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Show Modrinth App as your current activity on Discord. This does not affect Rich Presence added to instances by mods. Requires an app restart."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth collects anonymized analytics and usage data to improve our user experience and customize your experience. By disabling this option, you opt out and your data will no longer be collected."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetry"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "Show the Copy details action while an install is queued or running. It is always available for failed or interrupted installs."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Always show copy details"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "The app may load more slowly until the cache is rebuilt."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "Purge the app cache?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Clear cached data and download it again from Modrinth. The app may load more slowly until the cache is rebuilt."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Purge cache"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "App cache"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "Backups of important app data are stored here in case you need to recover them later."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "Open backups folder"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "App database backups"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Browse for an app directory"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Where Modrinth App stores instances and other files. Changes take effect after restarting the app."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Select a new app directory"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "App directory"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "Number of files the app can download at once. Lower this if downloads are unreliable on your connection. Requires an app restart."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Maximum concurrent downloads"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "Number of files the app can write to disk at once. Lower this if you frequently encounter I/O errors. Requires an app restart."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Maximum concurrent writes"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Instances"
+  },
   "app.settings.tabs.appearance": {
     "message": "Appearance"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Behavior"
+  },
   "app.settings.tabs.default-instance-options": {
     "message": "Default instance options"
   },
@@ -1220,6 +1451,45 @@
   "instance.server-modal.resource-pack": {
     "message": "Resource pack"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Actions"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Invite link"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "Anyone with one of these invite links can join while it remains active."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "There are no active invites."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Expires"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Revoke invite"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Revoke invite {code}"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Active invites"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Uses"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "The invite link <monospace>{code}</monospace> will stop working immediately. People who already joined will keep access."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "This action cannot be undone"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Revoke invite"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Revoke invite"
+  },
   "instance.settings.tabs.general": {
     "message": "General"
   },
@@ -1421,6 +1691,12 @@
   "instance.shared-instance.error.title": {
     "message": "Something has gone wrong"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "Unable to connect to shared instances API"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "Network error"
+  },
   "instance.shared-instance.owner-tooltip": {
     "message": "This instance's content is being shared to other users."
   },
@@ -1612,5 +1888,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Loader is provided by the server"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Account"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Display"
   }
 }
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index bd9c303847..8b3527f336 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -173,9 +173,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Decoraciones nativas"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Selecciona una opción"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Muestra cuánto tiempo has estado jugando en una instancia."
   },
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index 6106e1ffde..c548ba5d14 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -107,9 +107,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Decoraciones nativas"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Selecciona una opción"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Muestra cuánto tiempo has estado jugando en una instancia."
   },
diff --git a/apps/app-frontend/src/locales/fi-FI/index.json b/apps/app-frontend/src/locales/fi-FI/index.json
index 5a6829cb67..dd8bc83469 100644
--- a/apps/app-frontend/src/locales/fi-FI/index.json
+++ b/apps/app-frontend/src/locales/fi-FI/index.json
@@ -119,9 +119,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Natiivit koristukset"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Valitse vaihtoehto"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Näyttää, kuinka paljon aikaa olet käyttänyt instanssin pelaamiseen."
   },
diff --git a/apps/app-frontend/src/locales/fil-PH/index.json b/apps/app-frontend/src/locales/fil-PH/index.json
index 678b2534df..9775b8db1d 100644
--- a/apps/app-frontend/src/locales/fil-PH/index.json
+++ b/apps/app-frontend/src/locales/fil-PH/index.json
@@ -95,9 +95,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Native decorations"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Pumili ng opsiyon"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Magpapakita ang katagal ng iyong paglalaro sa isang instansiya."
   },
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index cf869479f9..c8d487e5a8 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Décorations natives"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Sélectionnez une option"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Affiche combien de temps vous avez passé sur une instance."
   },
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index 3702afe7d0..755ed8ffea 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Rendszer ablakkeret használata"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Válassz egy lehetőséget"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Megmutatja, mennyi időt töltöttél egy játékpéldányban."
   },
diff --git a/apps/app-frontend/src/locales/id-ID/index.json b/apps/app-frontend/src/locales/id-ID/index.json
index 54070e52e0..e98bfcd2b2 100644
--- a/apps/app-frontend/src/locales/id-ID/index.json
+++ b/apps/app-frontend/src/locales/id-ID/index.json
@@ -92,9 +92,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Hiasan asli"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Pilih opsi"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Menampilkan seberapa lama Anda memainkan sebuah instans."
   },
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index a5ac125124..bd97c44f95 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Decorazioni native"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Seleziona"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Mostra quanto tempo hai speso giocando a un'istanza."
   },
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index e2bdd81fc5..92ecc66882 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -188,9 +188,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "OSのウィンドウUIを使用"
   },
-  "app.appearance-settings.select-option": {
-    "message": "オプションを選択してください"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "インスタンスのプレイ時間を表示します。"
   },
diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json
index fb025f899c..67a4f99baf 100644
--- a/apps/app-frontend/src/locales/ko-KR/index.json
+++ b/apps/app-frontend/src/locales/ko-KR/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "네이티브 제목 표시줄"
   },
-  "app.appearance-settings.select-option": {
-    "message": "옵션 선택"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "인스턴스의 플레이 시간을 표시합니다."
   },
diff --git a/apps/app-frontend/src/locales/ms-MY/index.json b/apps/app-frontend/src/locales/ms-MY/index.json
index 4b019cf255..ccf6fc1ed7 100644
--- a/apps/app-frontend/src/locales/ms-MY/index.json
+++ b/apps/app-frontend/src/locales/ms-MY/index.json
@@ -92,9 +92,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Hiasan asli"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Pilih satu pilihan"
-  },
   "app.appearance-settings.skip-non-essential-warnings.description": {
     "message": "Melangkau pengesahan berisiko rendah secara automatik seperti pemasangan pek mod pendua, pemadaman kandungan biasa, kemas kini pukal, menyahpautkan pek mod dan gesaan pembaikan. Amaran berbahaya masih akan ditunjukkan."
   },
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
index 348107c859..d6c2ba51f5 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Oorspronkelijke versieringen"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Selecteer een optie"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Toont hoeveel tijd je aan een instantie hebt besteed."
   },
diff --git a/apps/app-frontend/src/locales/no-NO/index.json b/apps/app-frontend/src/locales/no-NO/index.json
index f4f1841153..3aa3138482 100644
--- a/apps/app-frontend/src/locales/no-NO/index.json
+++ b/apps/app-frontend/src/locales/no-NO/index.json
@@ -89,9 +89,6 @@
   "app.appearance-settings.minimize-launcher.title": {
     "message": "Minimer launcheren"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Velg et alternativ"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Viser hvor lenge du har spilt et tilfelle."
   },
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
index 9db37eeb05..26b526e578 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Systemowe dekoracje"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Wybierz opcję"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Pokazuje czas gry spędzony w danej instancji."
   },
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index f7eb7037bc..841aeca96e 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Decorações nativas"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Selecione uma opção"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Exibe a quantidade de tempo jogado de uma instância."
   },
diff --git a/apps/app-frontend/src/locales/pt-PT/index.json b/apps/app-frontend/src/locales/pt-PT/index.json
index 356d526515..5f56e5810d 100644
--- a/apps/app-frontend/src/locales/pt-PT/index.json
+++ b/apps/app-frontend/src/locales/pt-PT/index.json
@@ -188,9 +188,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Decorações nativas"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Seleciona uma opção"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Apresenta quanto tempo passou a jogar uma instância."
   },
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 4de4df35d0..88d1f8fac0 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Системное оформление"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Выберите вариант"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Показывать время, проведённое в сборке."
   },
diff --git a/apps/app-frontend/src/locales/sr-CS/index.json b/apps/app-frontend/src/locales/sr-CS/index.json
index 5ae11878d1..a8f7f3343b 100644
--- a/apps/app-frontend/src/locales/sr-CS/index.json
+++ b/apps/app-frontend/src/locales/sr-CS/index.json
@@ -173,9 +173,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Zavičajni ukrasi"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Izaberi opciju"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Pokazuje koliko vremena si proveo igrajući instancu."
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index 85ff5bedb6..6dfb05b20c 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -173,9 +173,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Inbyggda fönsterdekorationer"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Välj ett alternativ"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Visar hur mycket tid du spelat på en instans."
   },
diff --git a/apps/app-frontend/src/locales/th-TH/index.json b/apps/app-frontend/src/locales/th-TH/index.json
index 50b8089b9c..059e5cdc4e 100644
--- a/apps/app-frontend/src/locales/th-TH/index.json
+++ b/apps/app-frontend/src/locales/th-TH/index.json
@@ -107,9 +107,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "ของตกแต่งดั้งเดิม"
   },
-  "app.appearance-settings.select-option": {
-    "message": "เลือกตัวเลือก"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "แสดงเวลาที่คุณใช้เล่นในแต่ละอินสแตนซ์"
   },
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index bbe09caa1b..1886b8eed7 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Yerel pencere öğeleri"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Bir seçenek seçin"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Bir oyun oturumunda ne kadar zaman geçirdiğinizi gösterir."
   },
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index b69c9159d7..5ae8fdafb9 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -188,9 +188,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Системне оформлення"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Оберіть опцію"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Показує, скільки часу ви провели в цьому профілі."
   },
diff --git a/apps/app-frontend/src/locales/vi-VN/index.json b/apps/app-frontend/src/locales/vi-VN/index.json
index 0e4549e520..7e69708076 100644
--- a/apps/app-frontend/src/locales/vi-VN/index.json
+++ b/apps/app-frontend/src/locales/vi-VN/index.json
@@ -182,9 +182,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Giao diện cửa sổ hệ thống"
   },
-  "app.appearance-settings.select-option": {
-    "message": "Chọn một tuỳ chọn"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "Hiển thị thời gian bạn đã dành để chơi bằng một cấu hình."
   },
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index db96e22788..64cea71744 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "原生窗口"
   },
-  "app.appearance-settings.select-option": {
-    "message": "选择一个选项"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "显示你在每个实例中游玩的时间。"
   },
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index 3aa649973a..f5d7e24953 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -191,9 +191,6 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "原生視窗"
   },
-  "app.appearance-settings.select-option": {
-    "message": "選擇選項"
-  },
   "app.appearance-settings.show-play-time.description": {
     "message": "顯示你在該實例的遊玩時數。"
   },
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue
index 8d937f2f90..9d3f10200d 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -16,6 +16,8 @@
 			<UpdateToPlayModal ref="updateToPlayModal" :instance="instance" />
 			<SharedInstanceUpdateModal
 				ref="sharedInstanceUpdateModal"
+				@accepted="hideAcceptedSharedInstanceUpdate"
+				@complete="handleSharedInstanceUpdateComplete"
 				@shared-instance-unavailable="handleSharedInstanceUnavailable"
 				@report="(event) => reportSharedInstance(event, true)"
 			/>
@@ -62,8 +64,10 @@
 				:shared-instance-expected-user-id="sharedInstanceExpectedUserId"
 				:shared-instance-role="instance.shared_instance?.role"
 				:shared-instance-signed-out="sharedInstanceSignedOut"
+				:shared-instance-update-available="showSharedInstanceUpdateAdmonition"
 				@published="fetchInstance"
 				@delete="requestInstanceDeletion"
+				@review-update="reviewSharedInstanceUpdate"
 			/>
 		</div>
 		<div :class="['p-6 pt-4', { 'min-h-0 flex-1 overflow-y-auto': isFixedRender }]">
@@ -223,6 +227,7 @@ const sharedInstanceUpdateModal = ref<InstanceType<typeof SharedInstanceUpdateMo
 const sharedInstanceReportModal = ref<InstanceType<typeof SharedInstanceInstallModal>>()
 const deleteConfirmModal = ref<InstanceType<typeof ConfirmDeleteInstanceModal>>()
 const selectedInstanceToDelete = ref<GameInstance | null>(null)
+const hiddenSharedInstanceUpdateKey = ref<string | null>(null)
 
 const { notifySharedInstanceError, notifySharedInstanceUnavailable } = useSharedInstanceErrors()
 
@@ -253,8 +258,19 @@ const {
 	signedOut: sharedInstanceSignedOut,
 	unavailableManager: sharedInstanceUnavailableManager,
 	unavailableReason: sharedInstanceUnavailableReason,
+	updatePreview: sharedInstanceUpdatePreview,
 	wrongAccount: sharedInstanceWrongAccount,
 } = sharedInstanceState
+const sharedInstanceUpdateKey = computed(() => {
+	const instanceId = instance.value?.id
+	const latestVersion = sharedInstanceUpdatePreview.value?.latestVersion
+	return instanceId && latestVersion !== undefined ? `${instanceId}:${latestVersion}` : null
+})
+const showSharedInstanceUpdateAdmonition = computed(
+	() =>
+		sharedInstanceUpdatePreview.value?.updateAvailable === true &&
+		sharedInstanceUpdateKey.value !== hiddenSharedInstanceUpdateKey.value,
+)
 
 watch(
 	() => router.currentRoute.value,
@@ -530,6 +546,37 @@ async function handleSharedInstanceUnavailable(
 	setSharedInstanceUnavailable(reason)
 }
 
+function reviewSharedInstanceUpdate(event: MouseEvent) {
+	const currentInstance = instance.value
+	const preview = sharedInstanceUpdatePreview.value
+	if (
+		!currentInstance ||
+		currentInstance.shared_instance?.role !== 'member' ||
+		!preview?.updateAvailable
+	) {
+		return
+	}
+
+	sharedInstanceUpdateModal.value?.show(
+		currentInstance,
+		preview,
+		async () => {
+			await fetchInstance()
+		},
+		event,
+	)
+}
+
+function hideAcceptedSharedInstanceUpdate() {
+	hiddenSharedInstanceUpdateKey.value = sharedInstanceUpdateKey.value
+}
+
+function handleSharedInstanceUpdateComplete(successful: boolean) {
+	if (!successful && hiddenSharedInstanceUpdateKey.value === sharedInstanceUpdateKey.value) {
+		hiddenSharedInstanceUpdateKey.value = null
+	}
+}
+
 const startInstance = async (context: string) => {
 	if (!instance.value || instance.value.quarantined) return
 	if (checkingSharedInstanceLaunch.value || loading.value || playing.value) return
@@ -540,17 +587,16 @@ const startInstance = async (context: string) => {
 		!!instance.value.shared_instance && !sharedInstanceActionsLocked.value && !offline.value
 
 	if (canCheckSharedInstanceUpdate) {
-		let preview: Awaited<ReturnType<typeof refreshSharedInstanceUpdatePreview>>
+		let preview: Awaited<ReturnType<typeof refreshSharedInstanceUpdatePreview>> = null
 		checkingSharedInstanceLaunch.value = true
 		try {
 			preview = await refreshSharedInstanceUpdatePreview()
 		} catch (error) {
 			if (isSharedInstanceUnavailableError(error)) {
 				await handleSharedInstanceUnavailable(getSharedInstanceUnavailableReason(error))
-			} else {
-				notifySharedInstanceError(error)
+				return
 			}
-			return
+			notifySharedInstanceError(error)
 		} finally {
 			checkingSharedInstanceLaunch.value = false
 		}
@@ -657,7 +703,7 @@ async function reportSharedInstance(event?: MouseEvent, closeUpdateModal = false
 		if (closeUpdateModal) sharedInstanceUpdateModal.value?.hide()
 		sharedInstanceReportModal.value?.showReport(preview, event)
 	} catch (error) {
-		handleError(error as Error)
+		notifySharedInstanceError(error)
 	}
 }
 
diff --git a/apps/app-frontend/src/pages/instance/share/index.vue b/apps/app-frontend/src/pages/instance/share/index.vue
index 10ba2b04e0..b6addbe3bf 100644
--- a/apps/app-frontend/src/pages/instance/share/index.vue
+++ b/apps/app-frontend/src/pages/instance/share/index.vue
@@ -9,9 +9,19 @@
 			:link="inviteLink.link.value"
 			:link-expires-at="inviteLink.details.value?.expiresAt"
 			:link-max-uses="inviteLink.details.value?.maxUses"
+			:link-max-uses-limit="remainingUserSlots"
 			:update-invite-link="inviteLink.update"
 			:user-profile-link="userProfileLink"
-			:can-invite="!members.exclusiveMutationPending.value && !inviteLink.pending.value"
+			:can-invite="
+				hasRemainingUserSlots &&
+				!members.exclusiveMutationPending.value &&
+				!inviteLink.pending.value
+			"
+			:invite-disabled-message="
+				hasRemainingUserSlots
+					? undefined
+					: formatMessage(messages.userLimitReached, { limit: SHARED_INSTANCE_USER_LIMIT })
+			"
 			@invite="invitePlayer"
 			@cancel="cancelInvite"
 		/>
@@ -37,10 +47,19 @@
 			@state-change="publishState = $event"
 		/>
 
+		<SharedInstanceShareEmptyState
+			v-if="unableToConnect"
+			:heading="formatMessage(messages.unableToConnectHeading)"
+			:description="formatMessage(messages.unableToConnectDescription)"
+		/>
+
+		<div v-else-if="membersTableLoading" class="h-64" aria-hidden="true" />
+
 		<SharedInstanceMembersTable
-			v-if="members.rows.value.length > 0"
+			v-else-if="showMembersTable"
 			:rows="members.rows.value"
 			:actions-locked="sharedInstanceActionsLocked"
+			:invite-disabled="!hasRemainingUserSlots"
 			:invite-pending="inviteLink.pending.value"
 			:push-update-disabled="
 				instance.install_stage !== 'installed' || publishState !== 'idle' || !!offline
@@ -107,7 +126,7 @@
 				<ButtonStyled color="brand"
 					><button
 						class="!h-10"
-						:disabled="inviteLink.pending.value"
+						:disabled="inviteLink.pending.value || !hasRemainingUserSlots"
 						@click="showInvitePlayers($event)"
 					>
 						<SpinnerIcon
@@ -137,16 +156,17 @@ import {
 	type InvitePlayersUser,
 	useVIntl,
 } from '@modrinth/ui'
-import { useQueryClient } from '@tanstack/vue-query'
+import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, toRef, watch } from 'vue'
 
 import ModrinthAccountRequiredModal from '@/components/ui/modal/ModrinthAccountRequiredModal.vue'
 import SharedInstancePublishModal from '@/components/ui/shared-instances/SharedInstancePublishModal.vue'
 import {
 	getSharedInstanceUnavailableReason,
+	isSharedInstancesApiError,
 	isSharedInstanceUnavailableError,
 } from '@/helpers/install'
-import { edit } from '@/helpers/instance'
+import { can_current_user_use_shared_instances, edit } from '@/helpers/instance'
 import type { ModrinthAuthFlow } from '@/helpers/mr_auth.ts'
 import {
 	sharedInstanceErrorMessages,
@@ -159,7 +179,7 @@ import { injectSharedInstanceState } from '../use-shared-instance-state'
 import SharedInstanceMembersTable from './shared-instance-members-table.vue'
 import SharedInstanceRemoveMemberModal from './shared-instance-remove-member-modal.vue'
 import SharedInstanceShareEmptyState from './shared-instance-share-empty-state.vue'
-import type { ShareRow } from './shared-instance-share-types'
+import { SHARED_INSTANCE_USER_LIMIT, type ShareRow } from './shared-instance-share-types'
 import { useSharedInstanceInviteCandidates } from './use-shared-instance-invite-candidates'
 import { useSharedInstanceInviteLink } from './use-shared-instance-invite-link'
 import { useSharedInstanceMembers } from './use-shared-instance-members'
@@ -182,6 +202,7 @@ const actionsLocked = sharedInstanceState.shareActionsLocked
 const sharedInstanceActionsLocked = actionsLocked
 const currentUserId = computed(() => auth.user.value?.id ?? null)
 const isSignedIn = computed(() => !!auth.session_token.value)
+const sharedInstancesApiUnavailable = ref(false)
 const accountRequiredModal = ref<InstanceType<typeof ModrinthAccountRequiredModal>>()
 const invitePlayersModal = ref<InstanceType<typeof InvitePlayersModal>>()
 const unlinkModal = ref<InstanceType<typeof ConfirmUnlinkModal>>()
@@ -198,10 +219,22 @@ function notifyOperationError(error: unknown) {
 			sharedInstanceState.unavailableManager.value,
 		)
 	} else {
+		if (isSharedInstancesApiError(error)) sharedInstancesApiUnavailable.value = true
 		notifySharedInstanceError(error)
 	}
 }
 
+const eligibilityQuery = useQuery({
+	queryKey: computed(() => ['shared-instance-eligibility', currentUserId.value]),
+	queryFn: can_current_user_use_shared_instances,
+	enabled: () => isSignedIn.value && !!currentUserId.value,
+	retry: false,
+	staleTime: Infinity,
+	refetchOnMount: 'always',
+	refetchOnWindowFocus: false,
+	refetchOnReconnect: false,
+})
+
 const members = useSharedInstanceMembers({
 	instance,
 	currentUserId,
@@ -209,6 +242,10 @@ const members = useSharedInstanceMembers({
 	actionsLocked,
 	onError: notifyOperationError,
 })
+const remainingUserSlots = computed(() =>
+	Math.max(0, SHARED_INSTANCE_USER_LIMIT - members.rows.value.length),
+)
+const hasRemainingUserSlots = computed(() => remainingUserSlots.value > 0)
 const {
 	inviteFriends,
 	search: searchInviteUsers,
@@ -221,6 +258,7 @@ const {
 })
 const inviteLink = useSharedInstanceInviteLink(
 	computed(() => props.instance.id),
+	remainingUserSlots,
 	notifyOperationError,
 )
 
@@ -239,6 +277,29 @@ const lockedActionButton = computed(() =>
 const sharedInstanceUnavailableReason = sharedInstanceState.unavailableReason
 const sharedInstanceUnavailable = computed(() => !!sharedInstanceUnavailableReason.value)
 const sharedInstanceUnavailableManager = sharedInstanceState.unavailableManager
+const unableToConnect = computed(
+	() =>
+		sharedInstancesApiUnavailable.value ||
+		isSharedInstancesApiError(eligibilityQuery.error.value) ||
+		isSharedInstancesApiError(members.query.error.value),
+)
+const membersTableLoading = computed(
+	() =>
+		members.rows.value.length === 0 &&
+		!!props.instance.shared_instance &&
+		(members.query.data.value === undefined || members.query.isFetching.value) &&
+		!sharedInstanceUnavailable.value &&
+		!sharedInstanceActionsLocked.value,
+)
+const showMembersTable = computed(
+	() =>
+		members.rows.value.length > 0 ||
+		(!!props.instance.shared_instance &&
+			members.query.data.value !== undefined &&
+			!members.query.isFetching.value &&
+			!sharedInstanceUnavailable.value &&
+			!sharedInstanceActionsLocked.value),
+)
 const requiresUnlink = computed(
 	() =>
 		props.instance.link?.type === 'imported_modpack' &&
@@ -253,6 +314,15 @@ const importedModpackBackupTip = computed(() =>
 
 const messages = defineMessages({
 	signInButton: { id: 'app.instance.share.sign-in.button', defaultMessage: 'Sign in' },
+	unableToConnectHeading: {
+		id: 'app.instance.share.unable-to-connect.heading',
+		defaultMessage: 'Unable to connect',
+	},
+	unableToConnectDescription: {
+		id: 'app.instance.share.unable-to-connect.description',
+		defaultMessage:
+			'The shared instances service is not accessible at the moment, please try again later',
+	},
 	noFriendsInvitedHeading: {
 		id: 'app.instance.share.empty.heading',
 		defaultMessage: 'No friends invited',
@@ -265,6 +335,10 @@ const messages = defineMessages({
 		id: 'app.instance.share.empty.invite-friends-button',
 		defaultMessage: 'Invite friends',
 	},
+	userLimitReached: {
+		id: 'app.instance.share.invite-modal.user-limit-reached',
+		defaultMessage: 'This instance has reached the {limit}-user limit.',
+	},
 	shareModalHeader: {
 		id: 'app.instance.share.invite-modal.heading',
 		defaultMessage: 'Share {name}',
@@ -304,7 +378,7 @@ const messages = defineMessages({
 })
 
 function invitePlayer(payload: InvitePlayersInvitePayload) {
-	if (actionsLocked.value) return
+	if (actionsLocked.value || !hasRemainingUserSlots.value) return
 	if (payload.source === 'search') void requestFriend(payload.user)
 	members.invite(payload.user)
 }
@@ -315,6 +389,7 @@ function cancelInvite(user: InvitePlayersUser) {
 async function showInvitePlayers(event?: MouseEvent) {
 	if (actionsLocked.value) return
 	if (!isSignedIn.value) return signInToShare(event)
+	if (!hasRemainingUserSlots.value) return
 	if (requiresUnlink.value) return unlinkModal.value?.show()
 	if (await inviteLink.ensure()) invitePlayersModal.value?.show(event)
 }
@@ -353,6 +428,20 @@ function signInToShare(event?: MouseEvent) {
 	void accountRequiredModal.value?.show(event)
 }
 
+watch(
+	[eligibilityQuery.error, members.query.error],
+	(errors) => {
+		for (const error of errors) {
+			if (isSharedInstancesApiError(error)) notifyOperationError(error)
+		}
+	},
+	{ immediate: true },
+)
+watch([eligibilityQuery.data, members.query.data], ([eligibility, memberRows]) => {
+	if (eligibility !== undefined && memberRows !== undefined) {
+		sharedInstancesApiUnavailable.value = false
+	}
+})
 watch(
 	() => props.instance.id,
 	() => {
diff --git a/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue b/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
index 85abb14955..85cc02c8c2 100644
--- a/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
+++ b/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
@@ -25,7 +25,7 @@
 					<ButtonStyled color="brand">
 						<button
 							class="flex !h-10 shrink-0 items-center gap-2"
-							:disabled="invitePending"
+							:disabled="invitePending || inviteDisabled"
 							@click="emit('invite', $event)"
 						>
 							<SpinnerIcon v-if="invitePending" class="animate-spin" aria-hidden="true" />
@@ -35,7 +35,7 @@
 					</ButtonStyled>
 				</template>
 			</div>
-			<div class="flex flex-wrap items-center gap-1.5">
+			<div v-if="hasMultipleMethods" class="flex flex-wrap items-center gap-1.5">
 				<FilterIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
 				<button
 					:class="filterClass(methodFilter === 'all')"
@@ -67,7 +67,9 @@
 		>
 			<template #empty-state
 				><div class="flex h-64 items-center justify-center text-secondary">
-					No users match your filters.
+					{{
+						formatMessage(rows.length === 0 ? messages.noUsersJoined : messages.noUsersMatchFilters)
+					}}
 				</div></template
 			>
 			<template #cell-username="{ row }">
@@ -157,7 +159,7 @@ import {
 	useRelativeTime,
 	useVIntl,
 } from '@modrinth/ui'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 
 import {
 	type MethodFilter,
@@ -170,6 +172,7 @@ import {
 const props = defineProps<{
 	rows: ShareRow[]
 	actionsLocked?: boolean
+	inviteDisabled?: boolean
 	invitePending?: boolean
 	pushUpdateDisabled?: boolean
 	pushUpdatePending?: boolean
@@ -191,6 +194,7 @@ const methodFilterOptions: Array<{ id: ShareMethod; label: string }> = [
 	{ id: 'direct', label: methodLabels.direct },
 	{ id: 'link', label: methodLabels.link },
 ]
+const hasMultipleMethods = computed(() => new Set(props.rows.map((row) => row.method)).size > 1)
 const columns = computed<TableColumn<ShareTableColumn>[]>(() => {
 	const result: TableColumn<ShareTableColumn>[] = [
 		{
@@ -286,11 +290,23 @@ function filterClass(active: boolean) {
 	]
 }
 
+watch(hasMultipleMethods, (multiple) => {
+	if (!multiple) methodFilter.value = 'all'
+})
+
 const messages = defineMessages({
 	pushUpdate: {
 		id: 'app.instance.admonitions.shared-instance.publish-button',
 		defaultMessage: 'Push update',
 	},
+	noUsersJoined: {
+		id: 'app.instance.share.members.empty',
+		defaultMessage: 'No users have joined yet',
+	},
+	noUsersMatchFilters: {
+		id: 'app.instance.share.members.no-filter-results',
+		defaultMessage: 'No users match your filters.',
+	},
 })
 function userProfileLink(username: string) {
 	return !username || username.includes('@') ? undefined : `/user/${encodeURIComponent(username)}`
diff --git a/apps/app-frontend/src/pages/instance/share/shared-instance-share-types.ts b/apps/app-frontend/src/pages/instance/share/shared-instance-share-types.ts
index a6e478ba4e..a9bebd01c2 100644
--- a/apps/app-frontend/src/pages/instance/share/shared-instance-share-types.ts
+++ b/apps/app-frontend/src/pages/instance/share/shared-instance-share-types.ts
@@ -2,6 +2,8 @@ export type ShareMethod = 'direct' | 'link'
 export type MethodFilter = ShareMethod | 'all'
 export type ShareTableColumn = 'username' | 'lastPlayed' | 'joined' | 'method' | 'actions'
 
+export const SHARED_INSTANCE_USER_LIMIT = 50
+
 export type ShareRow = {
 	id: string
 	username: string
diff --git a/apps/app-frontend/src/pages/instance/share/use-shared-instance-invite-link.ts b/apps/app-frontend/src/pages/instance/share/use-shared-instance-invite-link.ts
index 7a7d0a77a9..d7ad386cf6 100644
--- a/apps/app-frontend/src/pages/instance/share/use-shared-instance-invite-link.ts
+++ b/apps/app-frontend/src/pages/instance/share/use-shared-instance-invite-link.ts
@@ -5,8 +5,11 @@ import { config } from '@/config'
 import { toError } from '@/helpers/errors'
 import { create_shared_instance_invite_link } from '@/helpers/instance'
 
+const DEFAULT_INVITE_LINK_MAX_USES = 10
+
 export function useSharedInstanceInviteLink(
 	instanceId: Ref<string>,
+	maxInviteUses: Ref<number>,
 	onError: (error: unknown) => void,
 ) {
 	const details = ref<Awaited<ReturnType<typeof create_shared_instance_invite_link>>>()
@@ -20,10 +23,12 @@ export function useSharedInstanceInviteLink(
 	async function ensure() {
 		if (details.value) return true
 		if (pending.value) return false
+		const maxUses = Math.min(DEFAULT_INVITE_LINK_MAX_USES, Math.floor(maxInviteUses.value))
+		if (maxUses <= 0) return false
 
 		pending.value = true
 		try {
-			details.value = await create_shared_instance_invite_link(instanceId.value)
+			details.value = await create_shared_instance_invite_link(instanceId.value, { maxUses })
 			return true
 		} catch (error) {
 			onError(error)
@@ -35,6 +40,8 @@ export function useSharedInstanceInviteLink(
 
 	async function update(settings: InviteLinkSettings) {
 		if (!details.value) return
+		const maxInviteLinkUses = Math.floor(maxInviteUses.value)
+		if (maxInviteLinkUses <= 0) return
 
 		pending.value = true
 		try {
@@ -44,7 +51,7 @@ export function useSharedInstanceInviteLink(
 			)
 			details.value = await create_shared_instance_invite_link(instanceId.value, {
 				maxAgeSeconds,
-				maxUses: settings.maxUses,
+				maxUses: Math.min(settings.maxUses, maxInviteLinkUses),
 				replaceInviteId: details.value.inviteId,
 			})
 		} catch (error) {
diff --git a/apps/app-frontend/src/pages/instance/share/use-shared-instance-members.ts b/apps/app-frontend/src/pages/instance/share/use-shared-instance-members.ts
index 2b6d1325d0..801f9a3552 100644
--- a/apps/app-frontend/src/pages/instance/share/use-shared-instance-members.ts
+++ b/apps/app-frontend/src/pages/instance/share/use-shared-instance-members.ts
@@ -12,7 +12,11 @@ import {
 } from '@/helpers/instance'
 import type { GameInstance } from '@/helpers/types'
 
-import { normalizeInviteKey, type ShareRow } from './shared-instance-share-types'
+import {
+	normalizeInviteKey,
+	SHARED_INSTANCE_USER_LIMIT,
+	type ShareRow,
+} from './shared-instance-share-types'
 
 type MembersQueryKey = readonly ['sharedInstanceUsers', string]
 
@@ -54,6 +58,7 @@ export function useSharedInstanceMembers(options: {
 		queryFn: ({ queryKey }) => fetchRows(queryKey),
 		enabled: () =>
 			options.isSignedIn.value && !!options.instance.value.id && !options.actionsLocked.value,
+		retry: false,
 		staleTime: Infinity,
 		refetchOnMount: 'always',
 		refetchOnReconnect: false,
@@ -139,6 +144,7 @@ export function useSharedInstanceMembers(options: {
 		if (
 			options.actionsLocked.value ||
 			exclusiveMutationPending.value ||
+			rows.value.length >= SHARED_INSTANCE_USER_LIMIT ||
 			invitingUserIds.has(normalizedId) ||
 			find(user.id, user.username)
 		) {
diff --git a/apps/app-frontend/src/store/theme.ts b/apps/app-frontend/src/store/theme.ts
index b5bb57070e..38bac76762 100644
--- a/apps/app-frontend/src/store/theme.ts
+++ b/apps/app-frontend/src/store/theme.ts
@@ -19,7 +19,7 @@ export const DEFAULT_FEATURE_FLAGS = {
 	always_show_copy_details: false,
 }
 
-export const THEME_OPTIONS = ['dark', 'light', 'oled', 'system'] as const
+export const THEME_OPTIONS = ['dark', 'light', 'oled', 'retro', 'system'] as const
 
 export type FeatureFlag = keyof typeof DEFAULT_FEATURE_FLAGS
 export type FeatureFlags = Record<FeatureFlag, boolean>
diff --git a/apps/app/build.rs b/apps/app/build.rs
index eb826b13da..514b389e19 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -227,6 +227,8 @@ fn main() {
                         "instance_share_get_users",
                         "instance_share_invite_users",
                         "instance_share_create_invite_link",
+                        "instance_share_get_invites",
+                        "instance_share_revoke_invite",
                         "instance_share_remove_users",
                         "instance_share_get_publish_preview",
                         "instance_share_publish",
diff --git a/apps/app/src/api/instance.rs b/apps/app/src/api/instance.rs
index 3de25824f9..570deca20b 100644
--- a/apps/app/src/api/instance.rs
+++ b/apps/app/src/api/instance.rs
@@ -56,6 +56,8 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
             instance_share_get_users,
             instance_share_invite_users,
             instance_share_create_invite_link,
+            instance_share_get_invites,
+            instance_share_revoke_invite,
             instance_share_remove_users,
             instance_share_get_publish_preview,
             instance_share_publish,
@@ -825,6 +827,27 @@ pub async fn instance_share_create_invite_link(
     .await?)
 }
 
+#[tauri::command]
+pub async fn instance_share_get_invites(
+    instance_id: &str,
+) -> Result<Vec<theseus::instance::SharedInstanceInvite>> {
+    Ok(theseus::instance::get_shared_instance_invites(instance_id).await?)
+}
+
+#[tauri::command]
+pub async fn instance_share_revoke_invite(
+    instance_id: &str,
+    invite_id: String,
+) -> Result<()> {
+    Ok(
+        theseus::instance::revoke_shared_instance_invite(
+            instance_id,
+            invite_id,
+        )
+        .await?,
+    )
+}
+
 #[tauri::command]
 pub async fn instance_share_remove_users(
     instance_id: &str,
diff --git a/apps/app/src/api/mod.rs b/apps/app/src/api/mod.rs
index acbe75b556..d7c0853ad8 100644
--- a/apps/app/src/api/mod.rs
+++ b/apps/app/src/api/mod.rs
@@ -91,14 +91,25 @@ macro_rules! impl_serialize {
                             theseus::ErrorKind::SharedInstanceUnavailable(reason) => Some(reason),
                             _ => None,
                         };
+                        let code = match theseus_error.raw.as_ref() {
+                            theseus::ErrorKind::SharedInstanceUnavailable(_) => {
+                                Some("shared_instance_unavailable")
+                            }
+                            theseus::ErrorKind::SharedInstancesApiError(_) => {
+                                Some("shared_instances_api_error")
+                            }
+                            _ => None,
+                        };
                         let mut state = serializer.serialize_struct(
                             "Theseus",
-                            if unavailable_reason.is_some() { 4 } else { 2 },
+                            2 + usize::from(code.is_some()) + usize::from(unavailable_reason.is_some()),
                         )?;
                         state.serialize_field("field_name", "Theseus")?;
                         state.serialize_field("message", &theseus_error.to_string())?;
+                        if let Some(code) = code {
+                            state.serialize_field("code", code)?;
+                        }
                         if let Some(reason) = unavailable_reason {
-                            state.serialize_field("code", "shared_instance_unavailable")?;
                             state.serialize_field("reason", reason)?;
                         }
                         state.end()
diff --git a/apps/frontend/src/assets/styles/global.scss b/apps/frontend/src/assets/styles/global.scss
index 56214eba8c..8ad63c2da1 100644
--- a/apps/frontend/src/assets/styles/global.scss
+++ b/apps/frontend/src/assets/styles/global.scss
@@ -280,15 +280,19 @@ html {
 }
 
 .retro-mode {
-	--color-bg: #191917;
-	--color-raised-bg: #1d1e1b;
+	--surface-1: #191917;
+	--surface-2: rgb(22, 22, 21);
+	--surface-3: #232421;
+	--surface-4: #3a3b38;
+	--surface-5: #5a5c58;
 	--color-button-bg: #3a3b38;
 	--color-base: #c3c4b3;
-	--color-secondary: #777a74;
+	--color-secondary: #9b9e98;
 	--color-contrast: #e6e2d1;
 
 	--color-brand: #4d9227;
 	--color-brand-highlight: #25421e;
+	--color-accent-contrast: #ffffff;
 	--color-ad: var(--color-brand-highlight);
 	--color-ad-raised: var(--color-brand);
 	--color-ad-contrast: black;
diff --git a/apps/frontend/src/components/ui/AdsConsentNotification.vue b/apps/frontend/src/components/ui/AdsConsentNotification.vue
index 4734b96260..e3fff38da6 100644
--- a/apps/frontend/src/components/ui/AdsConsentNotification.vue
+++ b/apps/frontend/src/components/ui/AdsConsentNotification.vue
@@ -590,6 +590,7 @@ onBeforeUnmount(() => {
 })
 </script>
 
+<template><div></div></template>
 <style>
 html.modrinth-cmp-summary-hidden .qc-cmp2-container,
 html.modrinth-cmp-summary-hidden #qc-cmp2-container,
diff --git a/apps/frontend/src/components/ui/AuthorizationCard.vue b/apps/frontend/src/components/ui/AuthorizationCard.vue
new file mode 100644
index 0000000000..58eee3d8cb
--- /dev/null
+++ b/apps/frontend/src/components/ui/AuthorizationCard.vue
@@ -0,0 +1,165 @@
+<template>
+	<div class="rounded-2xl border border-solid border-surface-4 bg-surface-3">
+		<div class="flex flex-col gap-2 border-0 border-b border-solid border-surface-4 p-4">
+			<div class="flex flex-wrap justify-between gap-3">
+				<div class="flex items-center gap-3">
+					<Avatar :src="authorization.app.icon_url" size="48px" />
+					<div class="flex flex-col gap-0.5">
+						<h2 class="m-0 flex items-center gap-1 text-base font-semibold">
+							{{ authorization.app.name }}
+
+							<BadgeCheckIcon
+								v-if="isOfficial"
+								v-tooltip="formatMessage(messages.officialTooltip)"
+								class="size-5 text-green"
+								fill="currentColor"
+								fill-opacity="0.125"
+							/>
+						</h2>
+						<PageHeaderMetadata>
+							<PageHeaderMetadataItem>
+								<IntlFormatted :message-id="messages.byLabel">
+									<template #~user>
+										<nuxt-link
+											:to="'/user/' + authorization.owner.id"
+											class="flex items-center gap-1 hover:underline"
+											target="_blank"
+										>
+											<Avatar :src="authorization.owner.avatar_url" size="24px" circle />
+											{{ authorization.owner.username }}
+										</nuxt-link>
+									</template>
+								</IntlFormatted>
+							</PageHeaderMetadataItem>
+							<PageHeaderMetadataItem v-if="authorization.app.url">
+								<a class="text-link" :to="authorization.app.url" target="_blank">
+									{{ authorization.app.url }}
+								</a>
+							</PageHeaderMetadataItem>
+						</PageHeaderMetadata>
+					</div>
+				</div>
+				<div>
+					<ButtonStyled color="red">
+						<button @click="emit('revoke', authorization.app_id)">
+							<XCircleIcon />
+							{{ formatMessage(messages.revokeAction) }}
+						</button>
+					</ButtonStyled>
+				</div>
+			</div>
+			<div v-if="showUnofficialDisclosure" class="flex items-center gap-1 text-orange">
+				<IssuesIcon />
+				{{ formatMessage(messages.unofficialDisclosure) }}
+			</div>
+		</div>
+		<div class="rounded-b-2xl bg-surface-2 p-4">
+			<template v-if="authorization.app.description">
+				<label :for="descriptionId" class="mb-1 flex font-semibold text-contrast">
+					{{ formatMessage(messages.aboutThisAppLabel) }}
+				</label>
+				<div :id="descriptionId" class="mb-4">{{ authorization.app.description }}</div>
+			</template>
+
+			<label :for="scopeListId" class="mb-1 flex font-semibold text-contrast">
+				{{ formatMessage(commonMessages.permissionsLabel) }}
+			</label>
+			<div :id="scopeListId" class="grid gap-1 sm:grid-cols-2">
+				<div
+					v-for="scope in scopesToDefinitions(BigInt(authorization.scopes || 0))"
+					:key="scope"
+					class="flex items-center gap-1"
+				>
+					<CheckIcon class="size-5 shrink-0 text-green" />
+					{{ scope }}
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import { BadgeCheckIcon, CheckIcon, IssuesIcon, XCircleIcon } from '@modrinth/assets'
+import {
+	Avatar,
+	ButtonStyled,
+	commonMessages,
+	defineMessages,
+	IntlFormatted,
+	PageHeaderMetadata,
+	PageHeaderMetadataItem,
+	useVIntl,
+} from '@modrinth/ui'
+import { isOfficialAccount } from '@modrinth/utils'
+
+import { useScopes } from '~/composables/auth/scopes.ts'
+
+export type AuthorizationCardData = Labrinth.OAuth.Internal.OAuthClientAuthorization & {
+	app: Labrinth.OAuth.Internal.OAuthClient
+	owner: Labrinth.Users.v2.User
+}
+
+const props = defineProps<{
+	authorization: AuthorizationCardData
+}>()
+
+const emit = defineEmits<{
+	revoke: [appId: string]
+}>()
+
+const { formatMessage } = useVIntl()
+const { scopesToDefinitions } = useScopes()
+
+const descriptionId = computed(() => `app-description-${props.authorization.id}`)
+const scopeListId = computed(() => `app-scope-list-${props.authorization.id}`)
+
+const unofficialTriggerWords = [
+	'modrinth',
+	'mod rinth',
+	'rnodrinth',
+	'rinth',
+	'modrith',
+	'official',
+	'verified',
+	'verification',
+]
+
+const showUnofficialDisclosure = computed(() => {
+	return (
+		(unofficialTriggerWords.some((word) =>
+			props.authorization.app.name.toLowerCase().includes(word),
+		) ||
+			unofficialTriggerWords.some((word) =>
+				props.authorization.owner.username?.toLowerCase().includes(word),
+			)) &&
+		!isOfficial.value
+	)
+})
+
+const isOfficial = computed(() => {
+	return isOfficialAccount(props.authorization.owner.id)
+})
+
+const messages = defineMessages({
+	revokeAction: {
+		id: 'settings.authorizations.revoke.action',
+		defaultMessage: 'Revoke',
+	},
+	byLabel: {
+		id: 'settings.authorizations.created-by',
+		defaultMessage: 'Created by {user}',
+	},
+	aboutThisAppLabel: {
+		id: 'settings.authorizations.about-this-app',
+		defaultMessage: 'About this app',
+	},
+	unofficialDisclosure: {
+		id: 'settings.authorizations.unofficial-disclosure',
+		defaultMessage: 'This app is not affiliated with Modrinth in any way, despite its name.',
+	},
+	officialTooltip: {
+		id: 'settings.authorizations.official-tooltip',
+		defaultMessage: 'This app is created by an official Modrinth account.',
+	},
+})
+</script>
diff --git a/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue b/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue
index 247ba590e3..6e2a91f743 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue
@@ -604,13 +604,18 @@ async function loadSharedInstanceVersionContent(
 		dependency.project_id ? [dependency.project_id] : [],
 	)
 	const projectIds = [
-		...new Set([...versions.map((version) => version.project_id), ...dependencyProjectIds]),
+		...new Set([
+			...versions.map((version) => version.project_id),
+			...dependencyProjectIds,
+			...(modpackVersion ? [modpackVersion.project_id] : []),
+		]),
 	]
 	const projects = projectIds.length
 		? await client.labrinth.projects_v2.getMultiple(projectIds)
 		: []
 	const versionsById = new Map(versions.map((version) => [version.id, version]))
 	const projectsById = new Map(projects.map((project) => [project.id, project]))
+	const modpackProject = modpackVersion ? projectsById.get(modpackVersion.project_id) : undefined
 
 	const directContent: ContentItem[] = [...new Set(directVersionIds)].flatMap((versionId) => {
 		const version = versionsById.get(versionId)
@@ -633,13 +638,19 @@ async function loadSharedInstanceVersionContent(
 		const fileName =
 			primaryFile?.filename ?? dependency.file_name ?? project?.title ?? version?.name ?? 'Unknown'
 
-		return sharedInstanceContentItem(
+		const item = sharedInstanceContentItem(
 			version,
 			project,
 			fileName,
 			dependency.project_id ?? fileName,
 			!project && !version,
 		)
+		return modpackProject
+			? {
+					...item,
+					source: { project: modpackProject },
+				}
+			: item
 	})
 
 	const externalContent: ContentItem[] = instanceVersion.external_files.map((file, index) => ({
diff --git a/apps/frontend/src/components/ui/report/ReportInfo.vue b/apps/frontend/src/components/ui/report/ReportInfo.vue
index 3f584a0d5e..0d5ccfec21 100644
--- a/apps/frontend/src/components/ui/report/ReportInfo.vue
+++ b/apps/frontend/src/components/ui/report/ReportInfo.vue
@@ -64,11 +64,18 @@
 			</template>
 		</div>
 		<div v-else-if="report.item_type === 'shared-instance'" class="item-info">
-			<div class="backed-svg" :class="{ raised: raised }">
+			<Avatar
+				v-if="report.shared_instance"
+				:src="report.shared_instance.icon"
+				size="xs"
+				no-shadow
+				:raised="raised"
+			/>
+			<div v-else class="backed-svg" :class="{ raised: raised }">
 				<BoxesIcon />
 			</div>
 			<div class="stacked">
-				<span class="title">Shared instance</span>
+				<span class="title">{{ report.shared_instance?.name ?? 'Shared instance' }}</span>
 				<span>
 					Version {{ report.shared_instance_version_id ?? 'unknown' }} ·
 					<CopyCode :text="report.item_id" />
@@ -89,8 +96,7 @@
 		<ThreadSummary
 			v-if="thread"
 			:thread="thread"
-			class="thread-summary"
-			:raised="raised"
+			class="thread-summary !bg-surface-2"
 			:link="`/${moderation ? 'moderation' : 'dashboard'}/report/${report.id}`"
 			:auth="auth"
 		/>
diff --git a/apps/frontend/src/components/ui/report/ReportView.vue b/apps/frontend/src/components/ui/report/ReportView.vue
index 7989da545c..2ed7ef236d 100644
--- a/apps/frontend/src/components/ui/report/ReportView.vue
+++ b/apps/frontend/src/components/ui/report/ReportView.vue
@@ -1,5 +1,5 @@
 <template>
-	<div>
+	<div class="pb-20">
 		<section>
 			<Breadcrumbs
 				v-if="breadcrumbsStack"
@@ -111,6 +111,16 @@ const { data: project } = useQuery({
 	enabled: computed(() => !!projectId.value),
 })
 
+const sharedInstanceId = computed(() =>
+	rawReport.value?.item_type === 'shared-instance' ? rawReport.value.item_id : null,
+)
+
+const { data: sharedInstance } = useQuery({
+	queryKey: computed(() => ['shared-instance', sharedInstanceId.value]),
+	queryFn: () => client.sharedinstances.instances_v1.get(sharedInstanceId.value),
+	enabled: computed(() => !!sharedInstanceId.value),
+})
+
 // Assemble the full report object
 const report = computed(() => {
 	if (!rawReport.value) return null
@@ -118,6 +128,7 @@ const report = computed(() => {
 		...rawReport.value,
 		project: project.value ?? null,
 		version: version.value ?? null,
+		shared_instance: sharedInstance.value ?? null,
 		reporterUser: (users.value || []).find((user) => user.id === rawReport.value.reporter),
 		user:
 			rawReport.value.item_type === 'user'
diff --git a/apps/frontend/src/components/ui/report/ReportsList.vue b/apps/frontend/src/components/ui/report/ReportsList.vue
index 5f91a7132c..7e295c70cf 100644
--- a/apps/frontend/src/components/ui/report/ReportsList.vue
+++ b/apps/frontend/src/components/ui/report/ReportsList.vue
@@ -19,7 +19,7 @@
 		:moderation="moderation"
 		raised
 		:auth="auth"
-		class="universal-card recessed"
+		class="card-shadow mb-4 rounded-2xl border border-solid border-surface-4 bg-surface-3 p-4"
 	/>
 	<p v-if="filteredReports.length === 0">You don't have any active reports.</p>
 </template>
@@ -51,7 +51,7 @@ const MAX_REPORTS = 1500
 
 const { data: rawReportsData } = useQuery({
 	queryKey: ['reports', MAX_REPORTS],
-	queryFn: () => client.labrinth.reports_v3.list({ count: MAX_REPORTS }),
+	queryFn: () => client.labrinth.reports_v3.list({ count: MAX_REPORTS, all: false }),
 	placeholderData: [],
 })
 
@@ -67,6 +67,13 @@ const versionReports = computed(() =>
 const versionIds = computed(() => [
 	...new Set(versionReports.value.map((report) => report.item_id)),
 ])
+const sharedInstanceIds = computed(() => [
+	...new Set(
+		rawReports.value
+			.filter((report) => report.item_type === 'shared-instance')
+			.map((report) => report.item_id),
+	),
+])
 const userIds = computed(() => [...new Set(reporterUsers.value.concat(reportedUsers.value))])
 const threadIds = computed(() => [
 	...new Set(
@@ -94,6 +101,21 @@ const { data: versions } = useQuery({
 	placeholderData: [],
 })
 
+const { data: sharedInstances } = useQuery({
+	queryKey: computed(() => ['shared-instances', sharedInstanceIds.value]),
+	queryFn: async () => {
+		const results = await Promise.allSettled(
+			sharedInstanceIds.value.map(async (id) => ({
+				id,
+				instance: await client.sharedinstances.instances_v1.get(id),
+			})),
+		)
+		return results.flatMap((result) => (result.status === 'fulfilled' ? [result.value] : []))
+	},
+	enabled: computed(() => sharedInstanceIds.value.length > 0),
+	placeholderData: [],
+})
+
 const { data: threads } = useQuery({
 	queryKey: computed(() => ['threads', threadIds.value]),
 	queryFn: () =>
@@ -123,6 +145,9 @@ const { data: projects } = useQuery({
 const userMap = computed(() => new Map(users.value.map((u) => [u.id, u])))
 const versionMap = computed(() => new Map(versions.value.map((v) => [v.id, v])))
 const projectMap = computed(() => new Map(projects.value.map((p) => [p.id, p])))
+const sharedInstanceMap = computed(
+	() => new Map(sharedInstances.value.map(({ id, instance }) => [id, instance])),
+)
 const threadMap = computed(() => new Map(threads.value.map((t) => [t.id, t])))
 
 const reports = computed(() =>
@@ -136,6 +161,8 @@ const reports = computed(() =>
 		} else if (report.item_type === 'version') {
 			enrichedReport.version = versionMap.value.get(report.item_id)
 			enrichedReport.project = projectMap.value.get(enrichedReport.version?.project_id)
+		} else if (report.item_type === 'shared-instance') {
+			enrichedReport.shared_instance = sharedInstanceMap.value.get(report.item_id)
 		}
 		if (report.thread_id) {
 			const thread = threadMap.value.get(report.thread_id)
@@ -149,7 +176,7 @@ const reports = computed(() =>
 const filteredReports = computed(() =>
 	reports.value?.filter(
 		(x) =>
-			(props.moderation || x.reporterUser?.id === props.auth.user.id) &&
+			(props.moderation || x.reporter === props.auth.user.id) &&
 			(viewMode.value === 'open' ? x.open : !x.open) &&
 			(reasonFilter.value === 'All' || reasonFilter.value === x.report_type),
 	),
diff --git a/apps/frontend/src/locales/cs-CZ/index.json b/apps/frontend/src/locales/cs-CZ/index.json
index 40011ff811..7c5f37a35a 100644
--- a/apps/frontend/src/locales/cs-CZ/index.json
+++ b/apps/frontend/src/locales/cs-CZ/index.json
@@ -2828,9 +2828,6 @@
   "settings.authorizations.about-this-app": {
     "message": "O této aplikaci"
   },
-  "settings.authorizations.by": {
-    "message": "od"
-  },
   "settings.authorizations.head-title": {
     "message": "Autorizace"
   },
diff --git a/apps/frontend/src/locales/da-DK/index.json b/apps/frontend/src/locales/da-DK/index.json
index c00234128b..540fbf5e2d 100644
--- a/apps/frontend/src/locales/da-DK/index.json
+++ b/apps/frontend/src/locales/da-DK/index.json
@@ -2996,9 +2996,6 @@
   "settings.authorizations.about-this-app": {
     "message": "Omkring denne app"
   },
-  "settings.authorizations.by": {
-    "message": "af"
-  },
   "settings.billing.charges.product.midas": {
     "message": "Modrinth Plus"
   },
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index 78d7dbdb7c..7c34a785b0 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -4769,15 +4769,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Über diese Anwendung"
   },
-  "settings.authorizations.by": {
-    "message": "von"
-  },
   "settings.authorizations.description": {
     "message": "Wenn du eine Anwendung mit deinem Modrinth-Konto autorisierst, gewährst du dieser Zugriff auf dein Konto. Du kannst den Zugriff auf dein Konto hier jederzeit verwalten und überprüfen."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Wir konnen aktuell deine autorisierten Anwendungen nicht anzeigen und arbeiten an einer lösung dafür. Bitte besuche diese Seite zu einem späteren Zeitpunkt erneut!"
-  },
   "settings.authorizations.head-title": {
     "message": "Autorisierungen"
   },
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index 28bc7b9e8f..806f0fa756 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -4769,15 +4769,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Über diese Anwendung"
   },
-  "settings.authorizations.by": {
-    "message": "von"
-  },
   "settings.authorizations.description": {
     "message": "Wenn du eine Anwendung mit deinem Modrinth-Konto autorisierst, gewährst du dieser Zugriff auf dein Konto. Du kannst den Zugriff auf dein Konto hier jederzeit verwalten und überprüfen."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Wir können deine autorisierten Apps derzeit nicht anzeigen, wir arbeiten daran, das zu beheben. Bitte besuche diese Seite zu einem späteren Zeitpunkt erneut!"
-  },
   "settings.authorizations.head-title": {
     "message": "Autorisierungen"
   },
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 898a59dd44..39c42f3296 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -4799,18 +4799,24 @@
   "settings.authorizations.about-this-app": {
     "message": "About this app"
   },
-  "settings.authorizations.by": {
-    "message": "by"
+  "settings.authorizations.created-by": {
+    "message": "Created by {user}"
   },
   "settings.authorizations.description": {
     "message": "When you authorize an application with your Modrinth account, you grant it access to your account. You can manage and review access to your account here at any time."
   },
-  "settings.authorizations.empty-state": {
-    "message": "We currently can't display your authorized apps, we're working to fix this. Please visit this page at a later date!"
+  "settings.authorizations.empty-state.description": {
+    "message": "Applications you authorize will appear here."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "No authorized apps"
   },
   "settings.authorizations.head-title": {
     "message": "Authorizations"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "This app is created by an official Modrinth account."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Revoke"
   },
@@ -4820,6 +4826,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "Are you sure you want to revoke this application?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "This app is not affiliated with Modrinth in any way, despite its name."
+  },
   "settings.billing.charges.description": {
     "message": "All of your past charges to your Modrinth account will be listed here:"
   },
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index 42b21e60a1..6c54397ebb 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -4277,15 +4277,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Acerca de esta aplicación"
   },
-  "settings.authorizations.by": {
-    "message": "por"
-  },
   "settings.authorizations.description": {
     "message": "Cuando autorizas una aplicación con tu cuenta de Modrinth, le concedes acceso a tu cuenta. Puedes gestionar y revisar los accesos a tu cuenta aquí en cualquier momento."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Actualmente no podemos mostrar tus aplicaciones autorizadas. Estamos trabajando para solucionar esto. ¡Por favor, visita esta página más tarde!"
-  },
   "settings.authorizations.head-title": {
     "message": "Autorizaciones"
   },
diff --git a/apps/frontend/src/locales/es-ES/index.json b/apps/frontend/src/locales/es-ES/index.json
index 842629bd94..df0f57bf49 100644
--- a/apps/frontend/src/locales/es-ES/index.json
+++ b/apps/frontend/src/locales/es-ES/index.json
@@ -3950,15 +3950,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Acerca de esta aplicación"
   },
-  "settings.authorizations.by": {
-    "message": "por"
-  },
   "settings.authorizations.description": {
     "message": "Cuando autorizas una aplicación con tu cuenta de Modrinth, le concedes acceso a tu cuenta. Puedes gestionar y revisar el acceso a tu cuenta aquí en cualquier momento."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Por el momento no podemos mostrar tus aplicaciones autorizadas, pero estamos trabajando para solucionar el problema. ¡Vuelve a visitar esta página más adelante!"
-  },
   "settings.authorizations.head-title": {
     "message": "Autorizaciones"
   },
diff --git a/apps/frontend/src/locales/fil-PH/index.json b/apps/frontend/src/locales/fil-PH/index.json
index e3a72075a9..0a09b270b1 100644
--- a/apps/frontend/src/locales/fil-PH/index.json
+++ b/apps/frontend/src/locales/fil-PH/index.json
@@ -2930,12 +2930,6 @@
   "settings.authorizations.about-this-app": {
     "message": "Tungkol sa app"
   },
-  "settings.authorizations.by": {
-    "message": "ni/ng"
-  },
-  "settings.authorizations.empty-state": {
-    "message": "Kasalukuyang hindi namin mapapakita ang mga pinahintulutang app, kinukumpuni pa namin ito. Mangyaring bisitahin ang pahinang ito sa ibang pagkataon!"
-  },
   "settings.authorizations.head-title": {
     "message": "Mga pagpapahintulot"
   },
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index 4d2916f786..1cd8de9e33 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -4757,15 +4757,9 @@
   "settings.authorizations.about-this-app": {
     "message": "À propos de cette application"
   },
-  "settings.authorizations.by": {
-    "message": "par"
-  },
   "settings.authorizations.description": {
     "message": "Lorsque vous autorisez une application avec votre compte Modrinth, vous lui accordez l’accès à votre compte. Vous pouvez gérer et consulter les accès à votre compte ici à tout moment."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Nous ne pouvons pas afficher vos applications autorisées pour le moment, nous travaillons à résoudre ce problème. Veuillez revenir sur cette page ultérieurement !"
-  },
   "settings.authorizations.head-title": {
     "message": "Autorisations"
   },
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index d0c3b624c0..7927085606 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -4220,15 +4220,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Az alkalmazásról"
   },
-  "settings.authorizations.by": {
-    "message": "által"
-  },
   "settings.authorizations.description": {
     "message": "Amikor engedélyezel egy alkalmazást a Modrinth fiókoddal, hozzáférést biztosítasz számára a fiókodhoz. A fiókodhoz való hozzáférést bármikor kezelheted és ellenőrizheted itt."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Jelenleg nem tudjuk megjeleníteni az azonosított alkalmazásokat, dolgozunk a probléma megoldásán. Kérlek látogasd meg ezt az oldalt később!"
-  },
   "settings.authorizations.head-title": {
     "message": "Engedélyek"
   },
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index d738cafd3c..a33a050ade 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -4757,15 +4757,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Info sull'app"
   },
-  "settings.authorizations.by": {
-    "message": "da"
-  },
   "settings.authorizations.description": {
     "message": "Quando autorizzi un'applicazione, le concedi l'accesso al tuo account Modrinth. Qui puoi gestirne e controllarne l'accesso in qualsiasi momento."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Al momento non riusciamo a mostrare le tue app autorizzate, stiamo lavorando per risolvere il problema. Ritorna più tardi!"
-  },
   "settings.authorizations.head-title": {
     "message": "Autorizzazioni"
   },
diff --git a/apps/frontend/src/locales/ja-JP/index.json b/apps/frontend/src/locales/ja-JP/index.json
index e64b756542..e8f5177dfe 100644
--- a/apps/frontend/src/locales/ja-JP/index.json
+++ b/apps/frontend/src/locales/ja-JP/index.json
@@ -3710,15 +3710,9 @@
   "settings.authorizations.about-this-app": {
     "message": "このアプリについて"
   },
-  "settings.authorizations.by": {
-    "message": "作成者"
-  },
   "settings.authorizations.description": {
     "message": "Modrinthアカウントでアプリケーションを承認することにより、アプリケーションがあなたのアカウントにアクセスできるようになります。 アクセス権はいつでも確認でき、変更可能です。"
   },
-  "settings.authorizations.empty-state": {
-    "message": "現在承認済みアプリを表示することができません。現在修正中のため、また後ほど確認ください！"
-  },
   "settings.authorizations.head-title": {
     "message": "承認"
   },
diff --git a/apps/frontend/src/locales/ko-KR/index.json b/apps/frontend/src/locales/ko-KR/index.json
index 47d03de0c7..9087ab4b0f 100644
--- a/apps/frontend/src/locales/ko-KR/index.json
+++ b/apps/frontend/src/locales/ko-KR/index.json
@@ -4721,15 +4721,9 @@
   "settings.authorizations.about-this-app": {
     "message": "이 앱에 대해"
   },
-  "settings.authorizations.by": {
-    "message": "제작자"
-  },
   "settings.authorizations.description": {
     "message": "Modrinth 계정으로 애플리케이션에 권한을 부여하면, 해당 앱이 귀하의 계정에 접근할 수 있게 됩니다. 여기에서 언제든지 계정 접근 권한을 관리하고 확인할 수 있습니다."
   },
-  "settings.authorizations.empty-state": {
-    "message": "현재 승인한 애플리케이션을 표시할 수 없습니다. 이 문제를 해결하기 위해 노력 중입니다. 나중에 다시 확인해 주세요!"
-  },
   "settings.authorizations.head-title": {
     "message": "승인"
   },
diff --git a/apps/frontend/src/locales/ms-MY/index.json b/apps/frontend/src/locales/ms-MY/index.json
index 5fe0481d38..2172658903 100644
--- a/apps/frontend/src/locales/ms-MY/index.json
+++ b/apps/frontend/src/locales/ms-MY/index.json
@@ -3743,15 +3743,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Mengenai aplikasi ini"
   },
-  "settings.authorizations.by": {
-    "message": "oleh"
-  },
   "settings.authorizations.description": {
     "message": "Apabila anda membenarkan aplikasi ini dengan akaun Modrinth anda, anda memberikannya akses kepada akaun anda. Anda boleh mengurus dan menyemak akses kepada akaun anda di sini pada bila-bila masa."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Kami tidak dapat memaparkan aplikasi yang dibenarkan oleh anda pada masa ini, kami sedang berusaha untuk memperbaikinya. Sila kunjungi laman ini pada tarikh yang akan datang!"
-  },
   "settings.authorizations.head-title": {
     "message": "Kebenaran"
   },
diff --git a/apps/frontend/src/locales/nl-NL/index.json b/apps/frontend/src/locales/nl-NL/index.json
index 285c82449a..dc34dc60e8 100644
--- a/apps/frontend/src/locales/nl-NL/index.json
+++ b/apps/frontend/src/locales/nl-NL/index.json
@@ -4796,15 +4796,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Over deze app"
   },
-  "settings.authorizations.by": {
-    "message": "door"
-  },
   "settings.authorizations.description": {
     "message": "Wanneer je een app via je Modrinth-account autoriseert, verleen je die app toegang tot je account. Je kunt de toegang tot je account hier op elk moment beheren en bekijken."
   },
-  "settings.authorizations.empty-state": {
-    "message": "We kunnen je geautoriseerde apps momenteel niet weergeven, maar we werken eraan om dit te verhelpen. Kom later nog eens terug op deze pagina!"
-  },
   "settings.authorizations.head-title": {
     "message": "Toestemmingen"
   },
diff --git a/apps/frontend/src/locales/no-NO/index.json b/apps/frontend/src/locales/no-NO/index.json
index 970fd83896..3ec6e3d5f7 100644
--- a/apps/frontend/src/locales/no-NO/index.json
+++ b/apps/frontend/src/locales/no-NO/index.json
@@ -3629,15 +3629,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Om denne appen"
   },
-  "settings.authorizations.by": {
-    "message": "fra"
-  },
   "settings.authorizations.description": {
     "message": "Når du autoriserer en applikasjon med Modrinth-kontoen din, så gir du tilgang til kontoen din. Du kan handere og gå gjennom tilgang til kontoen din her når som helst."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Vi kan ikke vise de autoriserte appene dine akkurat nå, vi jobber med å fikse det. Vær så snill å besøk denne sida seinere!"
-  },
   "settings.authorizations.head-title": {
     "message": "Autoriseringer"
   },
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index e384ac248d..122450be38 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -4712,15 +4712,9 @@
   "settings.authorizations.about-this-app": {
     "message": "O aplikacji"
   },
-  "settings.authorizations.by": {
-    "message": "od"
-  },
   "settings.authorizations.description": {
     "message": "Kiedy autoryzujesz aplikacje ze swoim kontem Modrinth, dajesz jej dostęp do swojego konta. Możesz tutaj zawsze zarządzać oraz przeglądać stan aplikacji z dostępem do Twojego konta."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Nie udało się nam wyświetlić twoich zautoryzowanych aplikacji, pracujemy nad tym, aby to naprawić. Odwiedź tę stronę później!"
-  },
   "settings.authorizations.head-title": {
     "message": "Autoryzacje"
   },
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index ac44cdf098..c5b9eb2e0a 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -4799,15 +4799,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Sobre este aplicativo"
   },
-  "settings.authorizations.by": {
-    "message": "por"
-  },
   "settings.authorizations.description": {
     "message": "Ao autorizar um aplicativo com sua conta do Modrinth, você concede acesso à sua conta. Você pode gerenciar e revisar o acesso à sua conta aqui a qualquer momento."
   },
-  "settings.authorizations.empty-state": {
-    "message": "No momento, não podemos exibir seus aplicativos autorizados. Estamos trabalhando para corrigir isso. Visite esta página novamente mais tarde!"
-  },
   "settings.authorizations.head-title": {
     "message": "Autorizações"
   },
diff --git a/apps/frontend/src/locales/pt-PT/index.json b/apps/frontend/src/locales/pt-PT/index.json
index 33cf2da31c..61a4200af4 100644
--- a/apps/frontend/src/locales/pt-PT/index.json
+++ b/apps/frontend/src/locales/pt-PT/index.json
@@ -3440,15 +3440,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Sobre esta aplicação"
   },
-  "settings.authorizations.by": {
-    "message": "por"
-  },
   "settings.authorizations.description": {
     "message": "Quando autorizas uma aplicação com a tua conta Modrinth, dás-lhe acesso à tua conta. Podes gerir e rever acesso à tua conta aqui quando quiseres."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Neste momento, não conseguimos mostrar as tuas aplicações autorizadas, estamos a tentar corrigir isto. Por favor tenta novamente mais tarde!"
-  },
   "settings.authorizations.head-title": {
     "message": "Autorizações"
   },
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index c92f68b5b7..8ae93f59d0 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -4745,15 +4745,9 @@
   "settings.authorizations.about-this-app": {
     "message": "О приложении"
   },
-  "settings.authorizations.by": {
-    "message": "от"
-  },
   "settings.authorizations.description": {
     "message": "Авторизованные приложения получают доступ к аккаунту Modrinth. Здесь можно просматривать и отзывать этот доступ."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Список приложений временно недоступен. Мы работаем над исправлением — загляните сюда позже."
-  },
   "settings.authorizations.head-title": {
     "message": "Авторизации"
   },
diff --git a/apps/frontend/src/locales/sr-CS/index.json b/apps/frontend/src/locales/sr-CS/index.json
index 3d1446d1da..dff4254bb2 100644
--- a/apps/frontend/src/locales/sr-CS/index.json
+++ b/apps/frontend/src/locales/sr-CS/index.json
@@ -1679,9 +1679,6 @@
   "settings.authorizations.about-this-app": {
     "message": "O ovoj aplikaciji"
   },
-  "settings.authorizations.by": {
-    "message": "od"
-  },
   "settings.authorizations.revoke.action": {
     "message": "Oduzmi"
   },
diff --git a/apps/frontend/src/locales/sv-SE/index.json b/apps/frontend/src/locales/sv-SE/index.json
index 84baa828c7..dc8ba74898 100644
--- a/apps/frontend/src/locales/sv-SE/index.json
+++ b/apps/frontend/src/locales/sv-SE/index.json
@@ -3788,9 +3788,6 @@
   "settings.authorizations.about-this-app": {
     "message": "Om appen"
   },
-  "settings.authorizations.by": {
-    "message": "av"
-  },
   "settings.authorizations.head-title": {
     "message": "Autentiseringar"
   },
diff --git a/apps/frontend/src/locales/tr-TR/index.json b/apps/frontend/src/locales/tr-TR/index.json
index f8f51502d4..0c3fa270f6 100644
--- a/apps/frontend/src/locales/tr-TR/index.json
+++ b/apps/frontend/src/locales/tr-TR/index.json
@@ -4208,15 +4208,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Bu uygulama hakkında"
   },
-  "settings.authorizations.by": {
-    "message": "tarafından"
-  },
   "settings.authorizations.description": {
     "message": "Modrinth hesabınızla bir uygulamayı yetkilendirdiğinizde, ona hesabınıza erişim izni vermiş olursunuz. Hesabınıza verilen erişimi dilediğiniz zaman burada yönetebilir ve gözden geçirebilirsiniz."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Yetkilendirdiğiniz uygulamalar şu anda görüntülenemiyor, bunu düzeltmek için çalışıyoruz. Lütfen bu sayfayı daha sonra tekrar ziyaret edin."
-  },
   "settings.authorizations.head-title": {
     "message": "Yetkiler"
   },
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index 6ead0d1141..7f41df1c7f 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -4721,15 +4721,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Про застосунок"
   },
-  "settings.authorizations.by": {
-    "message": "від"
-  },
   "settings.authorizations.description": {
     "message": "Коли ви авторизуєтеся у застосунку за допомогою Modrinth, ви надаєте йому доступ до вашого облікового запису. Ви завжди можете переглядати й керувати доступом до свого облікового запису тут."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Наразі ми не можемо показати ваші авторизовані застосунки, але ми працюємо, щоб виправити це. Будь ласка, завітайте на цю сторінку пізніше!"
-  },
   "settings.authorizations.head-title": {
     "message": "Авторизації"
   },
diff --git a/apps/frontend/src/locales/vi-VN/index.json b/apps/frontend/src/locales/vi-VN/index.json
index 46abc67f31..a5cc2f052b 100644
--- a/apps/frontend/src/locales/vi-VN/index.json
+++ b/apps/frontend/src/locales/vi-VN/index.json
@@ -3908,15 +3908,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Về ứng dụng này"
   },
-  "settings.authorizations.by": {
-    "message": "bởi"
-  },
   "settings.authorizations.description": {
     "message": "Khi bạn ủy quyền cho một ứng dụng bằng tài khoản Modrinth của mình, bạn đã cấp cho ứng dụng đó quyền truy cập vào tài khoản của bạn. Bạn có thể quản lý và xem lại quyền truy cập vào tài khoản của mình tại đây bất cứ lúc nào."
   },
-  "settings.authorizations.empty-state": {
-    "message": "Hiện tại chúng tôi không thể hiển thị các ứng dụng đã ủy quyền của bạn, chúng tôi đang nỗ lực khắc phục sự cố này. Vui lòng quay lại trang này sau!"
-  },
   "settings.authorizations.head-title": {
     "message": "Quyền hạn"
   },
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index 0dcef3a302..1fbfb97d02 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -4799,15 +4799,9 @@
   "settings.authorizations.about-this-app": {
     "message": "关于此应用"
   },
-  "settings.authorizations.by": {
-    "message": "by"
-  },
   "settings.authorizations.description": {
     "message": "当您使用 Modrinth 账户授权某个应用程序时，即表示您授予其访问您账户的权限。您可以随时在此处管理和审查对您账户的访问权限。"
   },
-  "settings.authorizations.empty-state": {
-    "message": "我们目前无法显示您授权的应用程序，我们正在努力解决这个问题。请稍后再访问此页面！"
-  },
   "settings.authorizations.head-title": {
     "message": "授权"
   },
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index e0ff84f06e..d1549f6fbc 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -4799,15 +4799,9 @@
   "settings.authorizations.about-this-app": {
     "message": "關於這個應用程式"
   },
-  "settings.authorizations.by": {
-    "message": "作者"
-  },
   "settings.authorizations.description": {
     "message": "當你使用 Modrinth 帳號授權應用程式時，即代表你授予該應用程式存取你帳戶的權限。你可以隨時在這裡管理並審查帳號的存取權。"
   },
-  "settings.authorizations.empty-state": {
-    "message": "目前無法顯示你已授權的應用程式，我們正在努力修正這個問題。請稍後再回來查看！"
-  },
   "settings.authorizations.head-title": {
     "message": "授權"
   },
diff --git a/apps/frontend/src/pages/dashboard/reports.vue b/apps/frontend/src/pages/dashboard/reports.vue
index e538b5e480..960f7c7cb1 100644
--- a/apps/frontend/src/pages/dashboard/reports.vue
+++ b/apps/frontend/src/pages/dashboard/reports.vue
@@ -1,9 +1,9 @@
 <template>
-	<div>
-		<section class="universal-card">
-			<h2 class="text-2xl">{{ formatMessage(messages.reportsTitle) }}</h2>
-			<ReportsList :auth="auth" />
-		</section>
+	<div class="flex flex-col gap-4 pb-20 lg:pl-4 lg:pt-1.5">
+		<h2 class="m-0 text-xl font-semibold text-contrast md:text-2xl">
+			{{ formatMessage(messages.reportsTitle) }}
+		</h2>
+		<ReportsList :auth="auth" />
 	</div>
 </template>
 <script setup>
diff --git a/apps/frontend/src/pages/moderation/reports/index.vue b/apps/frontend/src/pages/moderation/reports/index.vue
index 8f231c28e1..e2728ef956 100644
--- a/apps/frontend/src/pages/moderation/reports/index.vue
+++ b/apps/frontend/src/pages/moderation/reports/index.vue
@@ -235,9 +235,12 @@ const { data: allReports } = await useLazyAsyncData('new-moderation-reports', as
 	let reports: Labrinth.Reports.v3.Report[]
 	let hasMoreReports = true
 	while (hasMoreReports) {
-		reports = (await useBaseFetch(`report?count=${REPORT_ENDPOINT_COUNT}&offset=${currentOffset}`, {
-			apiVersion: 3,
-		})) as Labrinth.Reports.v3.Report[]
+		reports = (await useBaseFetch(
+			`report?count=${REPORT_ENDPOINT_COUNT}&offset=${currentOffset}&all=true`,
+			{
+				apiVersion: 3,
+			},
+		)) as Labrinth.Reports.v3.Report[]
 
 		hasMoreReports = reports.length > 0
 		if (!hasMoreReports) {
diff --git a/apps/frontend/src/pages/settings.vue b/apps/frontend/src/pages/settings.vue
index 3c9690faae..f06cb13dfc 100644
--- a/apps/frontend/src/pages/settings.vue
+++ b/apps/frontend/src/pages/settings.vue
@@ -1,10 +1,12 @@
 <template>
 	<div>
-		<div class="normal-page no-sidebar">
-			<h1>{{ formatMessage(commonMessages.settingsLabel) }}</h1>
-		</div>
-		<div class="normal-page">
-			<div class="normal-page__sidebar">
+		<NormalPage sidebar="left">
+			<template #header>
+				<h1 class="m-0 text-3xl font-semibold">
+					{{ formatMessage(commonMessages.settingsLabel) }}
+				</h1>
+			</template>
+			<template #sidebar>
 				<NavStack
 					:items="
 						[
@@ -18,7 +20,6 @@
 								link: '/settings/language',
 								label: formatMessage(commonSettingsMessages.language),
 								icon: LanguagesIcon,
-								badge: `${formatMessage(commonMessages.beta)}`,
 							},
 							flags.developerMode
 								? {
@@ -81,11 +82,9 @@
 						].filter(Boolean)
 					"
 				/>
-			</div>
-			<div class="normal-page__content mt-3 lg:mt-0">
-				<NuxtPage :route="route" />
-			</div>
-		</div>
+			</template>
+			<NuxtPage :route="route" />
+		</NormalPage>
 	</div>
 </template>
 <script setup>
@@ -101,7 +100,13 @@ import {
 	ToggleRightIcon,
 	UserIcon,
 } from '@modrinth/assets'
-import { commonMessages, commonSettingsMessages, defineMessages, useVIntl } from '@modrinth/ui'
+import {
+	commonMessages,
+	commonSettingsMessages,
+	defineMessages,
+	NormalPage,
+	useVIntl,
+} from '@modrinth/ui'
 
 import NavStack from '~/components/ui/NavStack.vue'
 
diff --git a/apps/frontend/src/pages/settings/authorizations.vue b/apps/frontend/src/pages/settings/authorizations.vue
index 5c5df7636c..6cd1771e06 100644
--- a/apps/frontend/src/pages/settings/authorizations.vue
+++ b/apps/frontend/src/pages/settings/authorizations.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="universal-card">
+	<div class="flex flex-col">
 		<ConfirmModal
 			ref="modal_confirm"
 			:title="formatMessage(messages.revokeConfirmTitle)"
@@ -7,101 +7,70 @@
 			:proceed-label="formatMessage(messages.revokeAction)"
 			@proceed="revokeApp(revokingId)"
 		/>
-		<h2 class="text-2xl">{{ formatMessage(commonSettingsMessages.authorizedApps) }}</h2>
-		<p>
+		<h2 class="m-0 text-2xl font-semibold">
+			{{ formatMessage(commonSettingsMessages.authorizedApps) }}
+		</h2>
+		<p class="mb-4 mt-2">
 			{{ formatMessage(messages.description) }}
 		</p>
-		<div v-if="appInfoLookup.length === 0" class="universal-card recessed">
-			{{ formatMessage(messages.emptyState) }}
-		</div>
-		<div
-			v-for="authorization in appInfoLookup"
-			:key="authorization.id"
-			class="universal-card recessed token mt-4"
-		>
-			<div class="token-content">
-				<div>
-					<div class="icon-name">
-						<Avatar :src="authorization.app.icon_url" />
-						<div>
-							<h2 class="token-title">
-								{{ authorization.app.name }}
-							</h2>
-							<div>
-								{{ formatMessage(messages.byLabel) }}
-								<nuxt-link class="text-link" :to="'/user/' + authorization.owner.id">{{
-									authorization.owner.username
-								}}</nuxt-link>
-								<template v-if="authorization.app.url">
-									<span> ⋅ </span>
-									<nuxt-link class="text-link" :to="authorization.app.url">
-										{{ authorization.app.url }}
-									</nuxt-link>
-								</template>
-							</div>
+		<template v-if="isLoading">
+			<div class="flex flex-col gap-4">
+				<div
+					v-for="i in 2"
+					:key="`authorization-skeleton-${i}`"
+					class="overflow-hidden rounded-2xl border border-solid border-surface-4 bg-surface-3"
+				>
+					<div class="flex items-center gap-3 border-0 border-b border-solid border-surface-4 p-4">
+						<div class="size-12 shrink-0 animate-pulse rounded-xl bg-surface-4" />
+						<div class="flex flex-1 flex-col gap-2">
+							<div class="h-4 w-36 animate-pulse rounded-lg bg-surface-4" />
+							<div class="h-3 w-48 animate-pulse rounded-lg bg-surface-4" />
 						</div>
+						<div class="h-9 w-24 animate-pulse rounded-xl bg-surface-4" />
 					</div>
-				</div>
-				<div>
-					<template v-if="authorization.app.description">
-						<label for="app-description">
-							<span class="label__title">{{ formatMessage(messages.aboutThisAppLabel) }}</span>
-						</label>
-						<div id="app-description">{{ authorization.app.description }}</div>
-					</template>
-
-					<label for="app-scope-list">
-						<span class="label__title">{{ formatMessage(commonMessages.scopesLabel) }}</span>
-					</label>
-					<div class="scope-list">
-						<div
-							v-for="scope in scopesToDefinitions(authorization.scopes)"
-							:key="scope"
-							class="scope-list-item"
-						>
-							<div class="scope-list-item-icon">
-								<CheckIcon />
-							</div>
-							{{ scope }}
+					<div class="bg-surface-2 p-4">
+						<div class="mb-3 h-3 w-28 animate-pulse rounded-lg bg-surface-3" />
+						<div class="grid gap-2 sm:grid-cols-2">
+							<div
+								v-for="j in 4"
+								:key="`authorization-skeleton-${i}-scope-${j}`"
+								class="h-4 w-full animate-pulse rounded-lg bg-surface-3"
+							/>
 						</div>
 					</div>
 				</div>
 			</div>
-
-			<div class="input-group">
-				<ButtonStyled color="red">
-					<button
-						@click="
-							() => {
-								revokingId = authorization.app_id
-								$refs.modal_confirm.show()
-							}
-						"
-					>
-						<TrashIcon />
-						{{ formatMessage(messages.revokeAction) }}
-					</button>
-				</ButtonStyled>
-			</div>
+		</template>
+		<EmptyState
+			v-else-if="showEmptyState"
+			type="done"
+			:heading="formatMessage(messages.emptyStateHeading)"
+			:description="formatMessage(messages.emptyStateDescription)"
+		/>
+		<div v-else class="flex flex-col gap-4">
+			<AuthorizationCard
+				v-for="authorization in appInfoLookup"
+				:key="authorization.id"
+				:authorization="authorization"
+				@revoke="onRevoke"
+			/>
 		</div>
 	</div>
 </template>
 <script setup>
-import { CheckIcon, TrashIcon } from '@modrinth/assets'
 import {
-	Avatar,
-	ButtonStyled,
 	commonMessages,
 	commonSettingsMessages,
 	ConfirmModal,
 	defineMessages,
+	EmptyState,
 	injectModrinthClient,
 	injectNotificationManager,
 	useVIntl,
 } from '@modrinth/ui'
 import { useQuery } from '@tanstack/vue-query'
 
-import { useScopes } from '~/composables/auth/scopes.ts'
+import AuthorizationCard from '~/components/ui/AuthorizationCard.vue'
 
 const client = injectModrinthClient()
 const { addNotification } = injectNotificationManager()
@@ -117,10 +86,13 @@ const messages = defineMessages({
 		defaultMessage:
 			'When you authorize an application with your Modrinth account, you grant it access to your account. You can manage and review access to your account here at any time.',
 	},
-	emptyState: {
-		id: 'settings.authorizations.empty-state',
-		defaultMessage:
-			"We currently can't display your authorized apps, we're working to fix this. Please visit this page at a later date!",
+	emptyStateHeading: {
+		id: 'settings.authorizations.empty-state.heading',
+		defaultMessage: 'No authorized apps',
+	},
+	emptyStateDescription: {
+		id: 'settings.authorizations.empty-state.description',
+		defaultMessage: 'Applications you authorize will appear here.',
 	},
 	revokeConfirmTitle: {
 		id: 'settings.authorizations.revoke.confirm.title',
@@ -135,19 +107,10 @@ const messages = defineMessages({
 		id: 'settings.authorizations.revoke.action',
 		defaultMessage: 'Revoke',
 	},
-	byLabel: {
-		id: 'settings.authorizations.by',
-		defaultMessage: 'by',
-	},
-	aboutThisAppLabel: {
-		id: 'settings.authorizations.about-this-app',
-		defaultMessage: 'About this app',
-	},
 })
 
-const { scopesToDefinitions } = useScopes()
-
 const revokingId = ref(null)
+const modal_confirm = ref()
 
 definePageMeta({
 	middleware: 'auth',
@@ -176,20 +139,58 @@ const { data: appCreatorsInformation } = useQuery({
 })
 
 const appInfoLookup = computed(() => {
-	if (!usersApps.value || !appInformation.value || !appCreatorsInformation.value) {
+	if (!usersApps.value || !appInformation.value) {
 		return []
 	}
-	return usersApps.value.map((app) => {
-		const info = appInformation.value.find((c) => c.id === app.app_id)
-		const owner = appCreatorsInformation.value.find((c) => c.id === info?.created_by)
-		return {
-			...app,
-			app: info || null,
-			owner: owner || null,
-		}
-	})
+	if (appInformation.value.length === 0) {
+		return []
+	}
+	if (!appCreatorsInformation.value) {
+		return []
+	}
+
+	return usersApps.value
+		.map((app) => {
+			const info = appInformation.value.find((c) => c.id === app.app_id)
+			const owner = appCreatorsInformation.value.find((c) => c.id === info?.created_by)
+			if (!info || !owner) {
+				return null
+			}
+			return {
+				...app,
+				app: info,
+				owner,
+			}
+		})
+		.filter(Boolean)
 })
 
+const showEmptyState = computed(() => {
+	if (!usersApps.value) {
+		return false
+	}
+	if (usersApps.value.length === 0) {
+		return true
+	}
+	if (!appInformation.value) {
+		return false
+	}
+	if (appInformation.value.length === 0) {
+		return true
+	}
+	if (!appCreatorsInformation.value) {
+		return false
+	}
+	return appInfoLookup.value.length === 0
+})
+
+const isLoading = computed(() => !showEmptyState.value && appInfoLookup.value.length === 0)
+
+function onRevoke(appId) {
+	revokingId.value = appId
+	modal_confirm.value.show()
+}
+
 async function revokeApp(id) {
 	try {
 		await client.labrinth.oauth_internal.revokeAuthorization(id)
@@ -204,73 +205,3 @@ async function revokeApp(id) {
 	}
 }
 </script>
-
-<style lang="scss" scoped>
-.input-group {
-	// Overrides for omorphia compat
-	> * {
-		padding: var(--gap-sm) var(--gap-lg) !important;
-	}
-}
-
-.scope-list {
-	display: grid;
-	grid-template-columns: repeat(auto-fit, minmax(16rem, 1fr));
-	gap: var(--gap-sm);
-
-	.scope-list-item {
-		display: flex;
-		align-items: center;
-		gap: 0.5rem;
-		border-radius: 0.25rem;
-		background-color: var(--color-gray-200);
-		color: var(--color-gray-700);
-		font-size: 0.875rem;
-		font-weight: 500;
-		line-height: 1.25rem;
-
-		// avoid breaking text or overflowing
-		white-space: nowrap;
-		overflow: hidden;
-	}
-
-	.scope-list-item-icon {
-		width: 1.25rem;
-		height: 1.25rem;
-		flex: 0 0 auto;
-
-		border-radius: 50%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		background-color: var(--color-green);
-		color: var(--color-raised-bg);
-	}
-}
-
-.icon-name {
-	display: flex;
-	align-items: flex-start;
-	gap: var(--gap-lg);
-	padding-bottom: var(--gap-sm);
-}
-
-.token-content {
-	width: 100%;
-
-	.token-title {
-		margin-bottom: var(--spacing-card-xs);
-	}
-}
-
-.token {
-	display: flex;
-	flex-direction: column;
-	gap: 0.5rem;
-
-	@media screen and (min-width: 800px) {
-		flex-direction: row;
-		align-items: flex-start;
-	}
-}
-</style>
diff --git a/apps/labrinth/src/queue/email/templates.rs b/apps/labrinth/src/queue/email/templates.rs
index 62db4dab9a..1ef37e77fe 100644
--- a/apps/labrinth/src/queue/email/templates.rs
+++ b/apps/labrinth/src/queue/email/templates.rs
@@ -4,6 +4,7 @@ use crate::database::models::ids::*;
 use crate::database::models::notifications_template_item::{
     NotificationTemplate, get_or_set_cached_dynamic_html,
 };
+use crate::database::models::report_item::DBReport;
 use crate::database::models::{
     DBOrganization, DBProject, DBUser, DatabaseError,
 };
@@ -11,10 +12,12 @@ use crate::env::ENV;
 use crate::models::v3::notifications::NotificationBody;
 use crate::routes::ApiError;
 use crate::util::error::Context;
+use crate::util::http::HTTP_CLIENT;
 use ariadne::ids::base62_impl::to_base62;
 use futures::TryFutureExt;
 use lettre::Message;
 use lettre::message::{Mailbox, MultiPart, SinglePart};
+use serde::Deserialize;
 use sqlx::query;
 use std::collections::HashMap;
 use std::time::Duration;
@@ -312,6 +315,70 @@ enum EmailTemplate {
     },
 }
 
+#[derive(Deserialize)]
+struct SharedInstance {
+    name: String,
+}
+
+async fn resolve_report_title(
+    exec: &mut PgTransaction<'_>,
+    report_id: DBReportId,
+    title: String,
+) -> Result<String, ApiError> {
+    if title != "unknown" {
+        return Ok(title);
+    }
+
+    let Some(report) = DBReport::get(report_id, &mut *exec).await? else {
+        return Ok(title);
+    };
+    let Some(shared_instance_id) = report.shared_instance_id else {
+        return Ok(title);
+    };
+
+    let instance_id = to_base62(shared_instance_id.0 as u64);
+    let with_version = |name: String| match report.shared_instance_version_id {
+        Some(version) => format!("{name} (version {version})"),
+        None => name,
+    };
+    let fallback = with_version(format!("shared instance {instance_id}"));
+    let response = HTTP_CLIENT
+        .get(format!(
+            "{}/v1/instances/{instance_id}",
+            ENV.SHARED_INSTANCES_URL
+        ))
+        .bearer_auth(&ENV.SHARED_INSTANCES_KEY)
+        .send()
+        .await
+        .and_then(reqwest::Response::error_for_status);
+
+    let response = match response {
+        Ok(response) => response,
+        Err(error) => {
+            warn!(
+                %error,
+                report_id = report_id.0,
+                %instance_id,
+                "Failed to fetch shared instance name for report email"
+            );
+            return Ok(fallback);
+        }
+    };
+
+    match response.json::<SharedInstance>().await {
+        Ok(instance) => Ok(with_version(instance.name)),
+        Err(error) => {
+            warn!(
+                %error,
+                report_id = report_id.0,
+                %instance_id,
+                "Failed to parse shared instance name for report email"
+            );
+            Ok(fallback)
+        }
+    }
+}
+
 async fn collect_template_variables(
     exec: &mut PgTransaction<'_>,
     redis: &RedisPool,
@@ -359,7 +426,15 @@ async fn collect_template_variables(
             .await?;
 
             map.insert(REPORT_ID, to_base62(report_id.0));
-            map.insert(REPORT_TITLE, result.title);
+            map.insert(
+                REPORT_TITLE,
+                resolve_report_title(
+                    exec,
+                    DBReportId(report_id.0 as i64),
+                    result.title,
+                )
+                .await?,
+            );
             map.insert(REPORT_DATE, date_human_readable(result.created));
             Ok(EmailTemplate::Static(map))
         }
@@ -380,7 +455,15 @@ async fn collect_template_variables(
             .fetch_one(&mut *exec)
             .await?;
 
-            map.insert(REPORT_TITLE, result.title);
+            map.insert(
+                REPORT_TITLE,
+                resolve_report_title(
+                    exec,
+                    DBReportId(report_id.0 as i64),
+                    result.title,
+                )
+                .await?,
+            );
             map.insert(NEWREPORT_ID, to_base62(report_id.0));
             Ok(EmailTemplate::Static(map))
         }
diff --git a/apps/labrinth/src/routes/v2/reports.rs b/apps/labrinth/src/routes/v2/reports.rs
index b74fc88683..c50950e544 100644
--- a/apps/labrinth/src/routes/v2/reports.rs
+++ b/apps/labrinth/src/routes/v2/reports.rs
@@ -60,16 +60,13 @@ pub async fn report_create(
 pub struct ReportsRequestOptions {
     #[serde(default = "default_count")]
     count: u16,
-    #[serde(default = "default_all")]
+    #[serde(default)]
     all: bool,
 }
 
 fn default_count() -> u16 {
     100
 }
-fn default_all() -> bool {
-    true
-}
 
 /// Get open reports for the current user.  
 #[utoipa::path(
diff --git a/apps/labrinth/src/routes/v3/reports.rs b/apps/labrinth/src/routes/v3/reports.rs
index c5defa4ddf..04dc2b3028 100644
--- a/apps/labrinth/src/routes/v3/reports.rs
+++ b/apps/labrinth/src/routes/v3/reports.rs
@@ -320,16 +320,13 @@ pub struct ReportsRequestOptions {
     pub count: u16,
     #[serde(default)]
     pub offset: u32,
-    #[serde(default = "default_all")]
+    #[serde(default)]
     pub all: bool,
 }
 
 fn default_count() -> u16 {
     100
 }
-fn default_all() -> bool {
-    true
-}
 
 #[utoipa::path(
 	tag = "reports",
diff --git a/package.json b/package.json
index 05de315e58..edebadb426 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "@modrinth/tooling-config": "workspace:*",
     "@tailwindcss/container-queries": "^0.1.1",
     "@types/node": "^24",
+    "@typescript-eslint/typescript-estree": "^8.64.0",
     "@vue/compiler-dom": "^3.5.26",
     "@vue/compiler-sfc": "^3.5.26",
     "chalk": "^5.6.2",
diff --git a/packages/api-client/src/modules/labrinth/oauth/internal.ts b/packages/api-client/src/modules/labrinth/oauth/internal.ts
index 0b44186320..680009e05e 100644
--- a/packages/api-client/src/modules/labrinth/oauth/internal.ts
+++ b/packages/api-client/src/modules/labrinth/oauth/internal.ts
@@ -45,14 +45,15 @@ export class LabrinthOAuthInternalModule extends AbstractModule {
 	 * @returns Promise resolving to an array of OAuth clients
 	 */
 	public async getApps(ids: string[]): Promise<Labrinth.OAuth.Internal.OAuthClient[]> {
-		return this.client.request<Labrinth.OAuth.Internal.OAuthClient[]>(
-			`/oauth/apps?ids=${encodeURIComponent(JSON.stringify(ids))}`,
-			{
-				api: 'labrinth',
-				version: 'internal',
-				method: 'GET',
-			},
-		)
+		if (ids.length === 0) {
+			return []
+		}
+
+		// bulk `/oauth/apps` is broken on backend, fetch by id instead
+		// TODO: Remove this once the backend is fixed
+		const results = await Promise.all(ids.map((id) => this.getApp(id).catch(() => null)))
+
+		return results.filter((app): app is Labrinth.OAuth.Internal.OAuthClient => app !== null)
 	}
 
 	/**
diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml
index 2ddccf999d..b3d05f8885 100644
--- a/packages/app-lib/Cargo.toml
+++ b/packages/app-lib/Cargo.toml
@@ -47,6 +47,7 @@ governor = { workspace = true }
 heck = { workspace = true }
 hickory-resolver = { workspace = true }
 httpdate = { workspace = true }
+image = { workspace = true, features = ["gif", "jpeg", "png", "webp"] }
 indicatif = { workspace = true, optional = true }
 itertools = { workspace = true }
 modrinth-content-management = { workspace = true }
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index ad30a0780a..43f84769ba 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -4,6 +4,7 @@ mod content;
 mod content_set_diff;
 mod export_mrpack;
 mod get;
+mod icon;
 mod install;
 mod lifecycle;
 mod paths;
@@ -21,9 +22,13 @@ pub use self::export_mrpack::{
     create_mrpack_json, export_mrpack, get_pack_export_candidates,
 };
 pub use self::get::{get, get_many, list};
+pub use self::icon::edit_icon;
+pub(crate) use self::icon::{
+    cache_icon, cache_icon_from_path, migrate_legacy_icons,
+};
 pub use self::install::get_optimal_jre_key;
 pub(crate) use self::lifecycle::create;
-pub use self::lifecycle::{edit, edit_icon, remove};
+pub use self::lifecycle::{edit, remove};
 pub use self::paths::{get_full_path, get_mod_full_path};
 pub use self::projects::{
     InstallProjectWithDependenciesRequest, add_project_from_path,
@@ -42,17 +47,19 @@ pub(crate) use self::shared::{
 };
 pub use self::shared::{
     SharedInstanceExternalFilePreview, SharedInstanceInstallPreview,
-    SharedInstanceInviteInstallPreview, SharedInstanceInviteLink,
-    SharedInstanceJoinType, SharedInstancePublishPreview,
-    SharedInstanceUpdateDiff, SharedInstanceUpdateDiffType,
-    SharedInstanceUpdatePreview, SharedInstanceUser, SharedInstanceUsers,
+    SharedInstanceInvite, SharedInstanceInviteInstallPreview,
+    SharedInstanceInviteLink, SharedInstanceJoinType,
+    SharedInstancePublishPreview, SharedInstanceUpdateDiff,
+    SharedInstanceUpdateDiffType, SharedInstanceUpdatePreview,
+    SharedInstanceUser, SharedInstanceUsers,
     accept_pending_shared_instance_invite,
     accept_shared_instance_invite_for_install,
     can_active_user_use_shared_instances, create_shared_instance_invite_link,
     decline_pending_shared_instance_invite,
-    get_shared_instance_install_preview, get_shared_instance_publish_preview,
-    get_shared_instance_update_preview, get_shared_instance_users,
-    install_shared_instance, invite_shared_instance_users,
-    publish_shared_instance, remove_shared_instance_users,
+    get_shared_instance_install_preview, get_shared_instance_invites,
+    get_shared_instance_publish_preview, get_shared_instance_update_preview,
+    get_shared_instance_users, install_shared_instance,
+    invite_shared_instance_users, publish_shared_instance,
+    remove_shared_instance_users, revoke_shared_instance_invite,
     unlink_shared_instance, unpublish_shared_instance, update_shared_instance,
 };
diff --git a/packages/app-lib/src/api/instance/icon.rs b/packages/app-lib/src/api/instance/icon.rs
new file mode 100644
index 0000000000..1e79dbd49b
--- /dev/null
+++ b/packages/app-lib/src/api/instance/icon.rs
@@ -0,0 +1,318 @@
+use crate::event::InstancePayloadType;
+use crate::event::emit::emit_instance;
+use crate::state::instances::adapters::sqlite::instance_rows;
+use crate::state::{EditInstance, State};
+use crate::util::fetch::{sha1_async, write};
+use crate::util::io;
+use bytes::Bytes;
+use std::fs::File as StdFile;
+use std::io::{BufRead, BufReader, Cursor, Seek};
+use std::path::{Path, PathBuf};
+
+const INSTANCE_ICON_MAX_BYTES: usize = 4 * 1024 * 1024;
+const INSTANCE_ICON_MAX_DIMENSION: u32 = 512;
+const INSTANCE_ICON_MAX_SOURCE_DIMENSION: u32 = 8_192;
+const INSTANCE_ICON_MAX_DECODE_BYTES: u64 = 64 * 1024 * 1024;
+
+enum LegacyIconAction {
+    Keep,
+    Normalize,
+    Remove,
+}
+
+pub async fn edit_icon(
+    instance_id: &str,
+    icon_path: Option<&Path>,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let icon_path = if let Some(icon_path) = icon_path {
+        Some(
+            cache_icon_from_path(icon_path, &state)
+                .await?
+                .to_string_lossy()
+                .to_string(),
+        )
+    } else {
+        None
+    };
+
+    apply_instance_icon(instance_id, icon_path, &state).await
+}
+
+pub(crate) async fn cache_icon(
+    bytes: Bytes,
+    state: &State,
+) -> crate::Result<PathBuf> {
+    let bytes = tokio::task::spawn_blocking(move || {
+        if looks_like_svg(&bytes) {
+            return Err(svg_not_supported_error());
+        }
+
+        normalize_raster(Cursor::new(bytes))
+    })
+    .await??;
+
+    write_cached_icon(bytes, state).await
+}
+
+pub(crate) async fn cache_icon_from_path(
+    icon_path: &Path,
+    state: &State,
+) -> crate::Result<PathBuf> {
+    let icon_path = icon_path.to_path_buf();
+    let bytes = tokio::task::spawn_blocking(move || {
+        let file = StdFile::open(&icon_path).map_err(|error| {
+            crate::ErrorKind::InputError(format!(
+                "Could not open instance icon {}: {error}",
+                icon_path.display()
+            ))
+        })?;
+        let mut reader = BufReader::new(file);
+        let looks_like_svg = {
+            let bytes = reader.fill_buf().map_err(|error| {
+                crate::ErrorKind::InputError(format!(
+                    "Could not inspect instance icon {}: {error}",
+                    icon_path.display()
+                ))
+            })?;
+            looks_like_svg(bytes)
+        };
+        if has_svg_extension(&icon_path) || looks_like_svg {
+            return Err(svg_not_supported_error());
+        }
+
+        normalize_raster(reader)
+    })
+    .await??;
+
+    write_cached_icon(bytes, state).await
+}
+
+pub(crate) async fn migrate_legacy_icons() -> crate::Result<()> {
+    let state = State::get().await?;
+    let instances = instance_rows::list_instances(&state.pool).await?;
+
+    for instance in instances {
+        let Some(icon_path) = instance.icon_path.as_deref() else {
+            continue;
+        };
+        let action = match inspect_legacy_icon(Path::new(icon_path)) {
+            Ok(action) => action,
+            Err(error) => {
+                tracing::warn!(
+                    instance_id = instance.id,
+                    icon_path,
+                    error = %error,
+                    "Failed to inspect legacy instance icon"
+                );
+                continue;
+            }
+        };
+
+        match action {
+            LegacyIconAction::Keep => {}
+            LegacyIconAction::Normalize => {
+                if let Err(error) =
+                    edit_icon(&instance.id, Some(Path::new(icon_path))).await
+                {
+                    tracing::warn!(
+                        instance_id = instance.id,
+                        icon_path,
+                        error = %error,
+                        "Failed to normalize legacy instance icon"
+                    );
+                }
+            }
+            LegacyIconAction::Remove => {
+                if let Err(error) =
+                    apply_instance_icon(&instance.id, None, &state).await
+                {
+                    tracing::warn!(
+                        instance_id = instance.id,
+                        icon_path,
+                        error = %error,
+                        "Failed to remove legacy SVG instance icon"
+                    );
+                }
+            }
+        }
+    }
+
+    Ok(())
+}
+
+async fn apply_instance_icon(
+    instance_id: &str,
+    icon_path: Option<String>,
+    state: &State,
+) -> crate::Result<()> {
+    let instance =
+        instance_rows::get_instance_display_info(instance_id, &state.pool)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError("Unknown instance".to_string())
+            })?;
+    crate::state::edit_instance(
+        instance_id,
+        EditInstance {
+            icon_path: Some(icon_path.clone()),
+            ..EditInstance::default()
+        },
+        &state.pool,
+    )
+    .await?;
+
+    if let Err(error) = super::shared::sync_shared_instance_icon(
+        instance_id,
+        icon_path.as_deref(),
+        state,
+    )
+    .await
+    {
+        tracing::warn!(
+            instance_id,
+            error = %error,
+            "Failed to sync shared instance icon"
+        );
+    }
+
+    emit_instance(&instance.id, InstancePayloadType::Edited).await?;
+
+    Ok(())
+}
+
+async fn write_cached_icon(
+    bytes: Bytes,
+    state: &State,
+) -> crate::Result<PathBuf> {
+    if bytes.len() >= INSTANCE_ICON_MAX_BYTES {
+        return Err(icon_too_large_error());
+    }
+
+    let hash = sha1_async(bytes.clone()).await?;
+    let path = state
+        .directories
+        .caches_dir()
+        .join("icons")
+        .join(format!("{hash}.png"));
+    write(&path, &bytes, &state.io_semaphore).await?;
+
+    Ok(io::canonicalize(path)?)
+}
+
+fn normalize_raster<R>(reader: R) -> crate::Result<Bytes>
+where
+    R: BufRead + Seek,
+{
+    let mut reader = image::ImageReader::new(reader)
+        .with_guessed_format()
+        .map_err(|error| {
+            crate::ErrorKind::InputError(format!(
+                "Could not identify instance icon format: {error}"
+            ))
+        })?;
+    let mut limits = image::Limits::default();
+    limits.max_image_width = Some(INSTANCE_ICON_MAX_SOURCE_DIMENSION);
+    limits.max_image_height = Some(INSTANCE_ICON_MAX_SOURCE_DIMENSION);
+    limits.max_alloc = Some(INSTANCE_ICON_MAX_DECODE_BYTES);
+    reader.limits(limits);
+
+    let image = reader.decode().map_err(|error| {
+        crate::ErrorKind::InputError(format!(
+            "Could not decode instance icon: {error}"
+        ))
+    })?;
+    let image = if image.width() > INSTANCE_ICON_MAX_DIMENSION
+        || image.height() > INSTANCE_ICON_MAX_DIMENSION
+    {
+        image.resize(
+            INSTANCE_ICON_MAX_DIMENSION,
+            INSTANCE_ICON_MAX_DIMENSION,
+            image::imageops::FilterType::Lanczos3,
+        )
+    } else {
+        image
+    };
+    let mut normalized = Cursor::new(Vec::new());
+    image::DynamicImage::ImageRgba8(image.to_rgba8())
+        .write_to(&mut normalized, image::ImageFormat::Png)
+        .map_err(|error| {
+            crate::ErrorKind::InputError(format!(
+                "Could not encode instance icon as PNG: {error}"
+            ))
+        })?;
+
+    validate_normalized_icon(normalized.into_inner())
+}
+
+fn inspect_legacy_icon(icon_path: &Path) -> crate::Result<LegacyIconAction> {
+    let metadata = std::fs::metadata(icon_path).map_err(|error| {
+        crate::ErrorKind::InputError(format!(
+            "Could not inspect instance icon {}: {error}",
+            icon_path.display()
+        ))
+    })?;
+    let file = StdFile::open(icon_path).map_err(|error| {
+        crate::ErrorKind::InputError(format!(
+            "Could not open instance icon {}: {error}",
+            icon_path.display()
+        ))
+    })?;
+    let mut reader = BufReader::new(file);
+    let bytes = reader.fill_buf().map_err(|error| {
+        crate::ErrorKind::InputError(format!(
+            "Could not inspect instance icon {}: {error}",
+            icon_path.display()
+        ))
+    })?;
+
+    if has_svg_extension(icon_path) || looks_like_svg(bytes) {
+        return Ok(LegacyIconAction::Remove);
+    }
+
+    if metadata.len() < INSTANCE_ICON_MAX_BYTES as u64
+        && image::guess_format(bytes).ok() == Some(image::ImageFormat::Png)
+    {
+        return Ok(LegacyIconAction::Keep);
+    }
+
+    Ok(LegacyIconAction::Normalize)
+}
+
+fn validate_normalized_icon(normalized: Vec<u8>) -> crate::Result<Bytes> {
+    if normalized.len() >= INSTANCE_ICON_MAX_BYTES {
+        return Err(icon_too_large_error());
+    }
+
+    Ok(Bytes::from(normalized))
+}
+
+fn looks_like_svg(bytes: &[u8]) -> bool {
+    if image::guess_format(bytes).is_ok() {
+        return false;
+    }
+
+    bytes[..bytes.len().min(1_024)]
+        .windows(4)
+        .any(|window| window.eq_ignore_ascii_case(b"<svg"))
+}
+
+fn has_svg_extension(path: &Path) -> bool {
+    path.extension()
+        .and_then(|extension| extension.to_str())
+        .is_some_and(|extension| extension.eq_ignore_ascii_case("svg"))
+}
+
+fn icon_too_large_error() -> crate::Error {
+    crate::ErrorKind::InputError(format!(
+        "Instance icons must be smaller than {INSTANCE_ICON_MAX_BYTES} bytes"
+    ))
+    .into()
+}
+
+fn svg_not_supported_error() -> crate::Error {
+    crate::ErrorKind::InputError(
+        "SVG instance icons are not supported".to_string(),
+    )
+    .into()
+}
diff --git a/packages/app-lib/src/api/instance/lifecycle.rs b/packages/app-lib/src/api/instance/lifecycle.rs
index 94b37e1f5b..f58f10eb8c 100644
--- a/packages/app-lib/src/api/instance/lifecycle.rs
+++ b/packages/app-lib/src/api/instance/lifecycle.rs
@@ -5,8 +5,6 @@ use crate::state::{
     CreateInstance, EditInstance, InstanceLink, InstanceMetadata, ModLoader,
     State,
 };
-use crate::util::io;
-use std::path::Path;
 
 #[tracing::instrument]
 #[allow(clippy::too_many_arguments)]
@@ -73,60 +71,6 @@ pub async fn edit(
     Ok(instance)
 }
 
-pub async fn edit_icon(
-    instance_id: &str,
-    icon_path: Option<&Path>,
-) -> crate::Result<()> {
-    let state = State::get().await?;
-    let instance =
-        instance_rows::get_instance_display_info(instance_id, &state.pool)
-            .await?
-            .ok_or_else(|| {
-                crate::ErrorKind::InputError("Unknown instance".to_string())
-            })?;
-    let icon_path = if let Some(icon) = icon_path {
-        let bytes = io::read(icon).await?;
-        let file = crate::util::fetch::write_cached_icon(
-            &icon.to_string_lossy(),
-            &state.directories.caches_dir(),
-            bytes::Bytes::from(bytes),
-            &state.io_semaphore,
-        )
-        .await?;
-        Some(file.to_string_lossy().to_string())
-    } else {
-        None
-    };
-
-    crate::state::edit_instance(
-        instance_id,
-        EditInstance {
-            icon_path: Some(icon_path.clone()),
-            ..EditInstance::default()
-        },
-        &state.pool,
-    )
-    .await?;
-
-    if let Err(error) = super::shared::sync_shared_instance_icon(
-        instance_id,
-        icon_path.as_deref(),
-        &state,
-    )
-    .await
-    {
-        tracing::warn!(
-            instance_id,
-            error = %error,
-            "Failed to sync shared instance icon"
-        );
-    }
-
-    emit_instance(&instance.id, InstancePayloadType::Edited).await?;
-
-    Ok(())
-}
-
 #[tracing::instrument]
 pub async fn remove(instance_id: &str) -> crate::Result<()> {
     let state = State::get().await?;
diff --git a/packages/app-lib/src/api/instance/shared/client.rs b/packages/app-lib/src/api/instance/shared/client.rs
index 05e00a46b2..132034e982 100644
--- a/packages/app-lib/src/api/instance/shared/client.rs
+++ b/packages/app-lib/src/api/instance/shared/client.rs
@@ -73,6 +73,14 @@ pub(super) struct CreateInstanceInviteResponse {
     pub(super) id: String,
 }
 
+#[derive(Clone, Debug, Deserialize)]
+pub(super) struct InstanceInviteResponse {
+    pub(super) id: String,
+    pub(super) expiration: DateTime<Utc>,
+    pub(super) max_uses: i32,
+    pub(super) uses: i32,
+}
+
 #[derive(Clone, Debug, Deserialize)]
 pub(super) struct BlacklistStatusResponse {
     pub(super) blacklisted: bool,
@@ -502,6 +510,20 @@ pub(super) async fn delete_remote_invite(
     .await
 }
 
+pub(super) async fn get_remote_invites(
+    shared_instance_id: &str,
+    state: &State,
+) -> crate::Result<Vec<InstanceInviteResponse>> {
+    request_json(
+        "get_instance_invites",
+        Method::GET,
+        &format!("/instances/{shared_instance_id}/invites"),
+        None,
+        state,
+    )
+    .await
+}
+
 pub(super) async fn get_shared_instance_invite_info(
     invite_id: &str,
     state: &State,
@@ -691,9 +713,17 @@ where
     let body = match response.text().await {
         Ok(body) => body,
         Err(error) if strip_response_url => {
-            return Err(error.without_url().into());
+            return Err(crate::ErrorKind::SharedInstancesApiError(
+                error.without_url().to_string(),
+            )
+            .into());
+        }
+        Err(error) => {
+            return Err(crate::ErrorKind::SharedInstancesApiError(
+                error.to_string(),
+            )
+            .into());
         }
-        Err(error) => return Err(error.into()),
     };
     serde_json::from_str::<T>(&body).map_err(|error| {
 		tracing::warn!(
@@ -707,7 +737,7 @@ where
             error_column = error.column(),
             "Shared instances API returned an invalid JSON response"
 		);
-		crate::ErrorKind::OtherError(format!(
+		crate::ErrorKind::SharedInstancesApiError(format!(
 			"Shared instances API request {operation} {method} {log_path} returned invalid JSON with status {status}"
 		))
 		.into()
@@ -848,7 +878,12 @@ pub(super) async fn send_bytes_request_to_url(
         .header(reqwest::header::CONTENT_TYPE, "application/octet-stream")
         .body(body)
         .send()
-        .await?;
+        .await
+        .map_err(|error| {
+            crate::ErrorKind::SharedInstancesApiError(
+                error.without_url().to_string(),
+            )
+        })?;
 
     if response.status().is_success() {
         let request_id = response_request_id(&response);
@@ -938,9 +973,17 @@ async fn send_request_with_auth_and_log_path(
     let response = match request.send().await {
         Ok(response) => response,
         Err(error) if path != log_path => {
-            return Err(error.without_url().into());
+            return Err(crate::ErrorKind::SharedInstancesApiError(
+                error.without_url().to_string(),
+            )
+            .into());
+        }
+        Err(error) => {
+            return Err(crate::ErrorKind::SharedInstancesApiError(
+                error.to_string(),
+            )
+            .into());
         }
-        Err(error) => return Err(error.into()),
     };
     if response.status().is_success() {
         let request_id = response_request_id(&response);
@@ -973,10 +1016,14 @@ pub(super) async fn shared_instances_request_error<T>(
         request_id = request_id.as_deref().unwrap_or("none"),
         "Shared instances API request failed"
     );
-    Err(crate::ErrorKind::OtherError(format!(
+    let message = format!(
         "Shared instances API request {operation} {method} {path} failed with status {status}"
-    ))
-    .into())
+    );
+    if status.is_server_error() {
+        return Err(crate::ErrorKind::SharedInstancesApiError(message).into());
+    }
+
+    Err(crate::ErrorKind::OtherError(message).into())
 }
 
 pub(super) fn response_request_id(
diff --git a/packages/app-lib/src/api/instance/shared/install.rs b/packages/app-lib/src/api/instance/shared/install.rs
index 85a82a809e..f2de99b2c4 100644
--- a/packages/app-lib/src/api/instance/shared/install.rs
+++ b/packages/app-lib/src/api/instance/shared/install.rs
@@ -244,13 +244,7 @@ pub(crate) async fn check_shared_instance_availability_before_launch(
     let availability =
         match get_remote_instance_access(&attachment.id, state).await {
             Ok(availability) => availability,
-            Err(error)
-                if matches!(
-                    error.raw.as_ref(),
-                    crate::ErrorKind::NoCredentialsError
-                        | crate::ErrorKind::FetchError(_)
-                ) =>
-            {
+            Err(error) => {
                 tracing::warn!(
                     instance_id,
                     shared_instance_id = %attachment.id,
@@ -259,7 +253,6 @@ pub(crate) async fn check_shared_instance_availability_before_launch(
                 );
                 return Ok(());
             }
-            Err(error) => return Err(error),
         };
 
     if let SharedInstanceRemoteResponse::Unavailable(reason) = availability {
diff --git a/packages/app-lib/src/api/instance/shared/invites.rs b/packages/app-lib/src/api/instance/shared/invites.rs
index a778cc40af..1e322aa561 100644
--- a/packages/app-lib/src/api/instance/shared/invites.rs
+++ b/packages/app-lib/src/api/instance/shared/invites.rs
@@ -124,6 +124,44 @@ pub async fn create_shared_instance_invite_link(
     })
 }
 
+#[tracing::instrument]
+pub async fn get_shared_instance_invites(
+    instance_id: &str,
+) -> crate::Result<Vec<SharedInstanceInvite>> {
+    let state = State::get().await?;
+    let Some(attachment) = shared_attachment(instance_id, &state).await? else {
+        return Ok(Vec::new());
+    };
+    ensure_owner(&attachment)?;
+
+    Ok(get_remote_invites(&attachment.id, &state)
+        .await?
+        .into_iter()
+        .map(|invite| SharedInstanceInvite {
+            id: invite.id,
+            expiration: invite.expiration,
+            max_uses: invite.max_uses,
+            uses: invite.uses,
+        })
+        .collect())
+}
+
+#[tracing::instrument(skip(invite_id))]
+pub async fn revoke_shared_instance_invite(
+    instance_id: &str,
+    invite_id: String,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let _shared_instance_lock = state.lock_shared_instance(instance_id).await;
+    let Some(attachment) = shared_attachment(instance_id, &state).await? else {
+        return Ok(());
+    };
+    ensure_owner(&attachment)?;
+
+    delete_remote_invite(&attachment.id, &invite_id, &state).await?;
+    emit_instance(instance_id, InstancePayloadType::Edited).await
+}
+
 #[tracing::instrument]
 pub async fn remove_shared_instance_users(
     instance_id: &str,
diff --git a/packages/app-lib/src/api/instance/shared/mod.rs b/packages/app-lib/src/api/instance/shared/mod.rs
index 5ebb1a13d9..b0e87153da 100644
--- a/packages/app-lib/src/api/instance/shared/mod.rs
+++ b/packages/app-lib/src/api/instance/shared/mod.rs
@@ -110,8 +110,9 @@ pub use self::install::{
 };
 pub use self::invites::{
     accept_pending_shared_instance_invite, create_shared_instance_invite_link,
-    decline_pending_shared_instance_invite, get_shared_instance_users,
-    invite_shared_instance_users, remove_shared_instance_users,
+    decline_pending_shared_instance_invite, get_shared_instance_invites,
+    get_shared_instance_users, invite_shared_instance_users,
+    remove_shared_instance_users, revoke_shared_instance_invite,
 };
 pub use self::publish::{
     get_shared_instance_publish_preview, publish_shared_instance,
@@ -119,10 +120,11 @@ pub use self::publish::{
 };
 pub use self::types::{
     SharedInstanceExternalFilePreview, SharedInstanceInstallPreview,
-    SharedInstanceInviteInstallPreview, SharedInstanceInviteLink,
-    SharedInstanceJoinType, SharedInstancePublishPreview,
-    SharedInstanceUpdateDiff, SharedInstanceUpdateDiffType,
-    SharedInstanceUpdatePreview, SharedInstanceUser, SharedInstanceUsers,
+    SharedInstanceInvite, SharedInstanceInviteInstallPreview,
+    SharedInstanceInviteLink, SharedInstanceJoinType,
+    SharedInstancePublishPreview, SharedInstanceUpdateDiff,
+    SharedInstanceUpdateDiffType, SharedInstanceUpdatePreview,
+    SharedInstanceUser, SharedInstanceUsers,
 };
 
 pub async fn can_active_user_use_shared_instances() -> crate::Result<bool> {
diff --git a/packages/app-lib/src/api/instance/shared/types.rs b/packages/app-lib/src/api/instance/shared/types.rs
index 05a98d7883..a6def37dec 100644
--- a/packages/app-lib/src/api/instance/shared/types.rs
+++ b/packages/app-lib/src/api/instance/shared/types.rs
@@ -116,6 +116,15 @@ pub struct SharedInstanceInviteLink {
     pub max_uses: i32,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SharedInstanceInvite {
+    pub id: String,
+    pub expiration: DateTime<Utc>,
+    pub max_uses: i32,
+    pub uses: i32,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SharedInstanceInviteInstallPreview {
diff --git a/packages/app-lib/src/api/pack/import/curseforge.rs b/packages/app-lib/src/api/pack/import/curseforge.rs
index becc532407..e1f4630222 100644
--- a/packages/app-lib/src/api/pack/import/curseforge.rs
+++ b/packages/app-lib/src/api/pack/import/curseforge.rs
@@ -7,10 +7,7 @@ use crate::{
     install::{InstallPhaseDetails, InstallProgressReporter},
     prelude::ModLoader,
     state::{AppliedContentSetPatch, EditInstance, InstanceInstallStage},
-    util::{
-        fetch::{fetch, write_cached_icon},
-        io,
-    },
+    util::{fetch::fetch, io},
 };
 
 use super::{finish_import, recache_icon};
@@ -90,18 +87,8 @@ pub async fn import_curseforge(
             &state.pool,
         )
         .await?;
-        let filename = thumbnail_url.rsplit('/').next_back();
-        if let Some(filename) = filename {
-            icon = Some(
-                write_cached_icon(
-                    filename,
-                    &state.directories.caches_dir(),
-                    icon_bytes,
-                    &state.io_semaphore,
-                )
-                .await?,
-            );
-        }
+        icon =
+            Some(crate::api::instance::cache_icon(icon_bytes, &state).await?);
     }
 
     // base mod loader is always None for vanilla
diff --git a/packages/app-lib/src/api/pack/import/mod.rs b/packages/app-lib/src/api/pack/import/mod.rs
index 4a58cfcbf3..20b7f287ab 100644
--- a/packages/app-lib/src/api/pack/import/mod.rs
+++ b/packages/app-lib/src/api/pack/import/mod.rs
@@ -346,19 +346,10 @@ pub async fn recache_icon(
 ) -> crate::Result<Option<PathBuf>> {
     let state = crate::State::get().await?;
 
-    let bytes = tokio::fs::read(&icon_path).await;
-    if let Ok(bytes) = bytes {
-        let bytes = bytes::Bytes::from(bytes);
-        let cache_dir = &state.directories.caches_dir();
-        let semaphore = &state.io_semaphore;
+    if tokio::fs::try_exists(&icon_path).await.unwrap_or(false) {
         Ok(Some(
-            fetch::write_cached_icon(
-                &icon_path.to_string_lossy(),
-                cache_dir,
-                bytes,
-                semaphore,
-            )
-            .await?,
+            crate::api::instance::cache_icon_from_path(&icon_path, &state)
+                .await?,
         ))
     } else {
         // could not find icon (for instance, prism default icon, etc)
diff --git a/packages/app-lib/src/api/pack/install_from.rs b/packages/app-lib/src/api/pack/install_from.rs
index e4a86d79f1..c894b94ad2 100644
--- a/packages/app-lib/src/api/pack/install_from.rs
+++ b/packages/app-lib/src/api/pack/install_from.rs
@@ -10,7 +10,7 @@ use crate::state::{
 };
 use crate::util::fetch::{
     DownloadMeta, DownloadReason, FetchProgressFn, fetch,
-    fetch_advanced_with_progress, sha1_file_async, write_cached_icon,
+    fetch_advanced_with_progress, sha1_file_async,
 };
 use path_util::SafeRelativeUtf8UnixPathBuf;
 use reqwest::Method;
@@ -415,21 +415,7 @@ pub(crate) async fn generate_pack_from_version_id_with_reporter(
             )
             .await?;
 
-            let filename = icon_url.rsplit('/').next();
-
-            if let Some(filename) = filename {
-                Some(
-                    write_cached_icon(
-                        filename,
-                        &state.directories.caches_dir(),
-                        icon_bytes,
-                        &state.io_semaphore,
-                    )
-                    .await?,
-                )
-            } else {
-                None
-            }
+            Some(crate::api::instance::cache_icon(icon_bytes, &state).await?)
         } else {
             None
         }
diff --git a/packages/app-lib/src/error.rs b/packages/app-lib/src/error.rs
index ad7dca9e59..675b2b582c 100644
--- a/packages/app-lib/src/error.rs
+++ b/packages/app-lib/src/error.rs
@@ -124,6 +124,9 @@ pub enum ErrorKind {
     #[error("Shared instance unavailable: {0}")]
     SharedInstanceUnavailable(SharedInstanceUnavailableReason),
 
+    #[error("Shared instances API request failed: {0}")]
+    SharedInstancesApiError(String),
+
     #[error("Join handle error: {0}")]
     JoinError(#[from] tokio::task::JoinError),
 
diff --git a/packages/app-lib/src/install/runner.rs b/packages/app-lib/src/install/runner.rs
index 49a39be065..3fa2940019 100644
--- a/packages/app-lib/src/install/runner.rs
+++ b/packages/app-lib/src/install/runner.rs
@@ -1433,6 +1433,7 @@ fn install_error_code(
         ErrorKind::SharedInstanceUnavailable(_) => {
             "shared_instance_unavailable"
         }
+        ErrorKind::SharedInstancesApiError(_) => "shared_instances_api_error",
         ErrorKind::InputError(_) => match phase {
             PreparingInstance | Finalizing => "instance_error",
             ResolvingPack | DownloadingPackFile | ReadingPackManifest => {
diff --git a/packages/app-lib/src/state/instances/commands/create_instance.rs b/packages/app-lib/src/state/instances/commands/create_instance.rs
index 7567ec815c..21d1068b1d 100644
--- a/packages/app-lib/src/state/instances/commands/create_instance.rs
+++ b/packages/app-lib/src/state/instances/commands/create_instance.rs
@@ -8,7 +8,7 @@ use crate::state::{
     InstanceInstallStage, LauncherFeatureVersion, ModLoader, ReleaseChannel,
     State,
 };
-use crate::util::fetch::{self, write_cached_icon};
+use crate::util::fetch;
 use crate::util::io;
 use chrono::Utc;
 use serde::{Deserialize, Serialize};
@@ -174,10 +174,8 @@ async fn resolve_icon_path(
         return Ok(None);
     };
 
-    let (bytes, file_name) = if icon.starts_with("https://")
-        || icon.starts_with("http://")
-    {
-        let fetched = fetch::fetch(
+    let file = if icon.starts_with("https://") || icon.starts_with("http://") {
+        let bytes = fetch::fetch(
             icon,
             None,
             None,
@@ -186,21 +184,15 @@ async fn resolve_icon_path(
             &state.pool,
         )
         .await?;
-        let name = icon.rsplit('/').next().unwrap_or("icon").to_string();
-        (fetched, name)
+        crate::api::instance::cache_icon(bytes, state).await?
     } else {
-        let data = io::read(state.directories.caches_dir().join(icon)).await?;
-        (bytes::Bytes::from(data), icon.to_string())
+        crate::api::instance::cache_icon_from_path(
+            &state.directories.caches_dir().join(icon),
+            state,
+        )
+        .await?
     };
 
-    let file = write_cached_icon(
-        &file_name,
-        &state.directories.caches_dir(),
-        bytes,
-        &state.io_semaphore,
-    )
-    .await?;
-
     Ok(Some(file.to_string_lossy().to_string()))
 }
 
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index c848699726..246e183779 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -150,6 +150,10 @@ impl State {
             )
             .await;
 
+            if let Err(e) = crate::api::instance::migrate_legacy_icons().await {
+                tracing::error!("Error migrating legacy instance icons: {e}");
+            }
+
             let res = tokio::try_join!(
                 state.discord_rpc.clear_to_default(true),
                 instances::refresh_all_instances(),
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 61f8891d41..e8769cfcfe 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -328,6 +328,7 @@ pub enum Theme {
     Dark,
     Light,
     Oled,
+    Retro,
     System,
 }
 
@@ -337,6 +338,7 @@ impl Theme {
             Theme::Dark => "dark",
             Theme::Light => "light",
             Theme::Oled => "oled",
+            Theme::Retro => "retro",
             Theme::System => "system",
         }
     }
@@ -346,6 +348,7 @@ impl Theme {
             "dark" => Theme::Dark,
             "light" => Theme::Light,
             "oled" => Theme::Oled,
+            "retro" => Theme::Retro,
             "system" => Theme::System,
             _ => Theme::Dark,
         }
diff --git a/packages/app-lib/src/util/fetch.rs b/packages/app-lib/src/util/fetch.rs
index fbca82414c..a7cb5215ae 100644
--- a/packages/app-lib/src/util/fetch.rs
+++ b/packages/app-lib/src/util/fetch.rs
@@ -14,10 +14,9 @@ use reqwest::Method;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, VecDeque};
-use std::ffi::OsStr;
 use std::future::Future;
 use std::num::NonZeroU32;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::pin::Pin;
 use std::sync::{Arc, LazyLock};
 use std::time::{self, Duration, Instant, SystemTime};
@@ -907,33 +906,6 @@ pub async fn copy(
     Ok(())
 }
 
-// Writes a icon to the cache and returns the absolute path of the icon within the cache directory
-#[tracing::instrument(skip(bytes, semaphore))]
-pub async fn write_cached_icon(
-    icon_path: &str,
-    cache_dir: &Path,
-    bytes: Bytes,
-    semaphore: &IoSemaphore,
-) -> crate::Result<PathBuf> {
-    let hash = sha1_async(bytes.clone()).await?;
-    let path = cache_dir
-        .join("icons")
-        .join(cached_icon_file_name(icon_path, &hash));
-
-    write(&path, &bytes, semaphore).await?;
-
-    let path = io::canonicalize(path)?;
-    Ok(path)
-}
-
-fn cached_icon_file_name(icon_path: &str, hash: &str) -> String {
-    let path = icon_path.split(['?', '#']).next().unwrap_or(icon_path);
-    match Path::new(path).extension().and_then(OsStr::to_str) {
-        Some(extension) => format!("{hash}.{extension}"),
-        None => hash.to_string(),
-    }
-}
-
 pub async fn sha1_async(bytes: Bytes) -> crate::Result<String> {
     let hash = tokio::task::spawn_blocking(move || {
         sha1_smol::Sha1::from(bytes).hexdigest()
diff --git a/packages/assets/styles/variables.scss b/packages/assets/styles/variables.scss
index fdcb7bbabd..43bc28aa50 100644
--- a/packages/assets/styles/variables.scss
+++ b/packages/assets/styles/variables.scss
@@ -422,6 +422,39 @@ html {
 }
 
 .retro-mode {
+	@extend .dark-mode;
+	--surface-1: #191917;
+	--surface-2: rgb(22, 22, 21);
 	--surface-2-5: #3a3c3e;
+	--surface-3: #232421;
+	--surface-4: #3a3b38;
+	--surface-5: #5a5c58;
+	--color-button-bg: #3a3b38;
+	--color-base: #c3c4b3;
+	--color-secondary: #9b9e98;
+	--color-contrast: #e6e2d1;
+
+	--color-brand: #4d9227;
+	--color-brand-highlight: #25421e;
+	--color-accent-contrast: #ffffff;
+	--color-ad: var(--color-brand-highlight);
+	--color-ad-raised: var(--color-brand);
+	--color-ad-contrast: black;
+	--color-ad-highlight: var(--color-brand);
+
+	--color-red: rgb(232, 32, 13);
+	--color-orange: rgb(232, 141, 13);
+	--color-green: rgb(60, 219, 54);
+	--color-blue: rgb(9, 159, 239);
+	--color-purple: rgb(139, 129, 230);
+	--color-gray: #718096;
+
+	--color-red-highlight: rgba(232, 32, 13, 0.25);
+	--color-orange-highlight: rgba(232, 141, 13, 0.25);
+	--color-green-highlight: rgba(60, 219, 54, 0.25);
+	--color-blue-highlight: rgba(9, 159, 239, 0.25);
+	--color-purple-highlight: rgba(139, 129, 230, 0.25);
+	--color-gray-highlight: rgba(113, 128, 150, 0.25);
+
 	--brand-gradient-strong-bg: #3a3b38;
 }
diff --git a/packages/ui/src/components/base/CopyCode.vue b/packages/ui/src/components/base/CopyCode.vue
index 9c2f9b47ed..201ea09bde 100644
--- a/packages/ui/src/components/base/CopyCode.vue
+++ b/packages/ui/src/components/base/CopyCode.vue
@@ -4,7 +4,7 @@
 		:title="formatMessage(copiedMessage)"
 		@click="copyText"
 	>
-		<span>{{ text }}</span>
+		<span>{{ displayText ?? text }}</span>
 		<CheckIcon v-if="copied" />
 		<ClipboardCopyIcon v-else />
 	</button>
@@ -12,7 +12,7 @@
 
 <script setup lang="ts">
 import { CheckIcon, ClipboardCopyIcon } from '@modrinth/assets'
-import { ref } from 'vue'
+import { onBeforeUnmount, ref } from 'vue'
 
 import { defineMessage, useVIntl } from '../../composables/i18n'
 
@@ -22,12 +22,22 @@ const copiedMessage = defineMessage({
 })
 const { formatMessage } = useVIntl()
 
-const props = defineProps<{ text: string }>()
+const props = defineProps<{
+	text: string
+	displayText?: string
+}>()
 
 const copied = ref(false)
+let copiedResetTimeout: ReturnType<typeof setTimeout> | undefined
 
 async function copyText() {
 	await navigator.clipboard.writeText(props.text)
 	copied.value = true
+	clearTimeout(copiedResetTimeout)
+	copiedResetTimeout = setTimeout(() => {
+		copied.value = false
+	}, 2000)
 }
+
+onBeforeUnmount(() => clearTimeout(copiedResetTimeout))
 </script>
diff --git a/packages/ui/src/components/base/StyledInput.vue b/packages/ui/src/components/base/StyledInput.vue
index ad0573b57a..31a9ca57d5 100644
--- a/packages/ui/src/components/base/StyledInput.vue
+++ b/packages/ui/src/components/base/StyledInput.vue
@@ -142,6 +142,7 @@ const props = withDefaults(
 		min?: number
 		max?: number
 		step?: number
+		clamp?: boolean
 		disabled?: boolean
 		readonly?: boolean
 		error?: boolean
@@ -159,6 +160,7 @@ const props = withDefaults(
 		type: 'text',
 		size: 'standard',
 		variant: 'filled',
+		clamp: false,
 		disabled: false,
 		readonly: false,
 		error: false,
@@ -189,12 +191,22 @@ defineExpose({
 
 function onInput(event: Event) {
 	const target = event.target as HTMLInputElement | HTMLTextAreaElement
-	model.value =
-		props.type === 'number' && !props.multiline
-			? target.value === ''
-				? undefined
-				: Number(target.value)
-			: target.value
+	if (props.type !== 'number' || props.multiline) {
+		model.value = target.value
+		return
+	}
+	if (target.value === '') {
+		model.value = undefined
+		return
+	}
+
+	let value = Number(target.value)
+	if (props.clamp) {
+		if (props.min !== undefined) value = Math.max(props.min, value)
+		if (props.max !== undefined) value = Math.min(props.max, value)
+		target.value = String(value)
+	}
+	model.value = value
 }
 
 function clear() {
diff --git a/packages/ui/src/components/modal/TabbedModal.vue b/packages/ui/src/components/modal/TabbedModal.vue
index 538676d640..465ffb1226 100644
--- a/packages/ui/src/components/modal/TabbedModal.vue
+++ b/packages/ui/src/components/modal/TabbedModal.vue
@@ -9,6 +9,7 @@ import { useScrollIndicator } from '../../composables/scroll-indicator'
 import NewModal from './NewModal.vue'
 export interface Tab {
 	name: MessageDescriptor
+	category?: MessageDescriptor
 	icon: Component
 	content?: Component
 	href?: string
@@ -61,6 +62,11 @@ function hide() {
 	modal.value?.hide()
 }
 
+function startsCategory(index: number) {
+	const category = visibleTabs.value[index]?.category
+	return !!category && category.id !== visibleTabs.value[index - 1]?.category?.id
+}
+
 defineExpose({ show, hide, selectedTab, setTab })
 </script>
 <template>
@@ -81,26 +87,32 @@ defineExpose({ show, hide, selectedTab, setTab })
 			<div
 				class="flex flex-col gap-1 border-solid pr-4 border-0 border-r-[1px] border-divider min-w-[200px]"
 			>
-				<component
-					:is="tab.href ? 'a' : 'button'"
-					v-for="(tab, index) in visibleTabs"
-					:key="index"
-					:href="tab.href ?? undefined"
-					:target="tab.href ? '_blank' : undefined"
-					:rel="tab.href ? 'noopener noreferrer' : undefined"
-					:class="`flex gap-2 items-center text-left rounded-xl px-4 py-2 border-none text-nowrap font-semibold cursor-pointer active:scale-[0.97] transition-all no-underline ${!tab.href && selectedTab === index ? 'bg-button-bgSelected text-button-textSelected' : 'bg-transparent text-button-text hover:bg-button-bg hover:text-contrast'}`"
-					@click="!tab.href && setTab(index)"
-				>
-					<component :is="tab.icon" class="w-4 h-4 flex-shrink-0" />
-					<span>{{ formatMessage(tab.name) }}</span>
-					<span
-						v-if="tab.badge"
-						class="rounded-full px-1.5 py-0.5 text-xs font-bold bg-brand-highlight text-brand-green"
+				<template v-for="(tab, index) in visibleTabs" :key="index">
+					<div
+						v-if="startsCategory(index) && tab.category"
+						class="px-4 pb-1 pt-2 text-xs font-bold uppercase tracking-wide text-secondary"
 					>
-						{{ formatMessage(tab.badge) }}
-					</span>
-					<RightArrowIcon v-if="tab.href" class="size-4 ml-auto" />
-				</component>
+						{{ formatMessage(tab.category) }}
+					</div>
+					<component
+						:is="tab.href ? 'a' : 'button'"
+						:href="tab.href ?? undefined"
+						:target="tab.href ? '_blank' : undefined"
+						:rel="tab.href ? 'noopener noreferrer' : undefined"
+						:class="`flex gap-2 items-center text-left rounded-xl px-4 py-2 border-none text-nowrap font-semibold cursor-pointer active:scale-[0.97] transition-all no-underline ${!tab.href && selectedTab === index ? 'bg-button-bgSelected text-button-textSelected' : 'bg-transparent text-button-text hover:bg-button-bg hover:text-contrast'}`"
+						@click="!tab.href && setTab(index)"
+					>
+						<component :is="tab.icon" class="w-4 h-4 flex-shrink-0" />
+						<span>{{ formatMessage(tab.name) }}</span>
+						<span
+							v-if="tab.badge"
+							class="rounded-full px-1.5 py-0.5 text-xs font-bold bg-brand-highlight text-brand-green"
+						>
+							{{ formatMessage(tab.badge) }}
+						</span>
+						<RightArrowIcon v-if="tab.href" class="size-4 ml-auto" />
+					</component>
+				</template>
 
 				<slot name="footer" />
 			</div>
diff --git a/packages/ui/src/components/sharing/invite-players-modal/index.vue b/packages/ui/src/components/sharing/invite-players-modal/index.vue
index 038c7e8e8f..0499ee1af7 100644
--- a/packages/ui/src/components/sharing/invite-players-modal/index.vue
+++ b/packages/ui/src/components/sharing/invite-players-modal/index.vue
@@ -135,6 +135,7 @@
 		ref="inviteLinkEditor"
 		:link-expires-at="linkExpiresAt"
 		:link-max-uses="linkMaxUses"
+		:link-max-uses-limit="linkMaxUsesLimit"
 		:update-invite-link="updateInviteLink"
 	/>
 </template>
@@ -169,6 +170,7 @@ const props = withDefaults(
 		link?: string
 		linkExpiresAt?: string | Date | null
 		linkMaxUses?: number
+		linkMaxUsesLimit?: number
 		updateInviteLink?: (settings: InviteLinkSettings) => Promise<void>
 		friendsLabel?: string
 		searchPlaceholder?: string
@@ -188,6 +190,7 @@ const props = withDefaults(
 		suggestions: () => [],
 		canInvite: true,
 		linkMaxUses: 10,
+		linkMaxUsesLimit: 2147483647,
 	},
 )
 
diff --git a/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue b/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
index 60264bc2d1..433b42085e 100644
--- a/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
+++ b/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
@@ -1,19 +1,62 @@
 <template>
-	<NewModal ref="modal" :header="formatMessage(messages.title)" max-width="30rem">
+	<NewModal ref="modal" :header="formatMessage(messages.title)" width="420px" max-width="420px">
 		<div class="flex flex-col gap-6">
 			<div class="flex flex-col gap-2">
 				<span class="font-semibold text-contrast">{{ formatMessage(messages.expiryLabel) }}</span>
-				<DatePicker
-					v-model="expiry"
+				<Combobox
+					:model-value="selectedExpiryPreset"
+					:options="expiryDropdownOptions"
+					:display-value="expiryPickerLabel"
 					:disabled="saving"
-					:min-date="minimumExpiry"
-					:max-date="maximumExpiry"
-					date-format="Y-m-d H:i"
-					alt-format="F j, Y at h:i K"
-					enable-time
-					wrapper-class="w-full"
-					input-class="w-full"
-				/>
+					:dropdown-min-width="customExpiryOpen ? '20rem' : undefined"
+					:dropdown-class="customExpiryOpen ? 'bg-transparent border-0 -mt-1 pb-2 shadow-none' : ''"
+					@open="handleExpiryPickerOpen"
+					@close="handleExpiryPickerClose"
+					@select="selectExpiryPreset"
+				>
+					<template #dropdown-footer>
+						<div
+							v-if="customExpiryOpen"
+							class="flex flex-col rounded-2xl border border-solid border-surface-5 bg-surface-3 p-1"
+						>
+							<DatePicker
+								v-model="customExpiry"
+								:min-date="minimumExpiry"
+								:max-date="maximumExpiry"
+								:default-view-date="customExpiry || minimumExpiry"
+								date-format="Y-m-d H:i"
+								enable-time
+								calendar-only
+								wrapper-class="w-full"
+								calendar-class="!border-none"
+							/>
+							<div class="flex justify-end gap-2 p-3 pt-1">
+								<ButtonStyled type="outlined">
+									<button type="button" @click="cancelCustomExpiry">
+										{{ formatMessage(messages.cancel) }}
+									</button>
+								</ButtonStyled>
+								<ButtonStyled color="brand">
+									<button
+										type="button"
+										:disabled="!canApplyCustomExpiry"
+										@click="applyCustomExpiry"
+									>
+										{{ formatMessage(messages.apply) }}
+									</button>
+								</ButtonStyled>
+							</div>
+						</div>
+						<button
+							v-else
+							type="button"
+							class="flex w-full cursor-pointer items-center border-0 border-t border-solid border-surface-5 bg-transparent px-4 py-3 text-left text-base font-semibold leading-tight text-primary transition-colors hover:bg-surface-5"
+							@click.stop="openCustomExpiry"
+						>
+							{{ formatMessage(messages.customExpiry) }}
+						</button>
+					</template>
+				</Combobox>
 			</div>
 			<div class="flex flex-col gap-2">
 				<span class="font-semibold text-contrast">{{ formatMessage(messages.maxUsesLabel) }}</span>
@@ -21,9 +64,10 @@
 					v-model="maxUses"
 					type="number"
 					:min="1"
-					:max="2147483647"
+					:max="maximumUses"
 					:step="1"
-					:disabled="saving"
+					:disabled="saving || maximumUses === 0"
+					clamp
 				/>
 			</div>
 		</div>
@@ -49,29 +93,58 @@
 
 <script setup lang="ts">
 import { SaveIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 
+import { useFormatDateTime } from '../../../composables'
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { injectNotificationManager } from '../../../providers'
 import ButtonStyled from '../../base/ButtonStyled.vue'
+import Combobox, { type ComboboxOption } from '../../base/Combobox.vue'
 import DatePicker from '../../base/DatePicker.vue'
 import StyledInput from '../../base/StyledInput.vue'
 import NewModal from '../../modal/NewModal.vue'
 import type { InviteLinkSettings } from './types'
 
-const props = defineProps<{
-	linkExpiresAt?: string | Date | null
-	linkMaxUses: number
-	updateInviteLink?: (settings: InviteLinkSettings) => Promise<void>
-}>()
+const EXPIRY_PRESET_DURATIONS = {
+	one_hour: 3_600_000,
+	six_hours: 6 * 3_600_000,
+	twelve_hours: 12 * 3_600_000,
+	one_day: 86_400_000,
+	three_days: 3 * 86_400_000,
+	seven_days: 7 * 86_400_000,
+} as const
+const MINIMUM_EXPIRY_DURATION = EXPIRY_PRESET_DURATIONS.one_hour
+const MAXIMUM_EXPIRY_DURATION = EXPIRY_PRESET_DURATIONS.seven_days
+const EXPIRY_PRESET_MATCH_TOLERANCE = 2 * 60_000
+
+type ExpiryPreset = keyof typeof EXPIRY_PRESET_DURATIONS
+
+const props = withDefaults(
+	defineProps<{
+		linkExpiresAt?: string | Date | null
+		linkMaxUses: number
+		linkMaxUsesLimit?: number
+		updateInviteLink?: (settings: InviteLinkSettings) => Promise<void>
+	}>(),
+	{
+		linkMaxUsesLimit: 2147483647,
+	},
+)
 const { formatMessage } = useVIntl()
 const notificationManager = injectNotificationManager(null)
 const modal = ref<InstanceType<typeof NewModal> | null>(null)
 const expiry = ref('')
+const expiryMode = ref<'preset' | 'custom'>('preset')
+const expiryPreset = ref<ExpiryPreset>('seven_days')
+const expiryReferenceTime = ref(Date.now())
+const customExpiry = ref('')
+const customExpiryOpen = ref(false)
 const maxUses = ref<number>()
 const minimumExpiry = ref(new Date())
 const maximumExpiry = ref(new Date())
 const saving = ref(false)
+const maximumUses = computed(() => Math.max(0, Math.floor(props.linkMaxUsesLimit)))
+const formatExpiryDate = useFormatDateTime({ dateStyle: 'medium', timeStyle: 'short' })
 
 const messages = defineMessages({
 	title: {
@@ -86,10 +159,46 @@ const messages = defineMessages({
 		id: 'sharing.invite-players-modal.max-uses-label',
 		defaultMessage: 'Maximum uses',
 	},
+	inOneHour: {
+		id: 'sharing.invite-players-modal.expiry-in-one-hour',
+		defaultMessage: 'In 1 hour',
+	},
+	inSixHours: {
+		id: 'sharing.invite-players-modal.expiry-in-six-hours',
+		defaultMessage: 'In 6 hours',
+	},
+	inTwelveHours: {
+		id: 'sharing.invite-players-modal.expiry-in-twelve-hours',
+		defaultMessage: 'In 12 hours',
+	},
+	inOneDay: {
+		id: 'sharing.invite-players-modal.expiry-in-one-day',
+		defaultMessage: 'In 1 day',
+	},
+	inThreeDays: {
+		id: 'sharing.invite-players-modal.expiry-in-three-days',
+		defaultMessage: 'In 3 days',
+	},
+	inSevenDays: {
+		id: 'sharing.invite-players-modal.expiry-in-seven-days',
+		defaultMessage: 'In 7 days',
+	},
+	customExpiry: {
+		id: 'sharing.invite-players-modal.custom-expiry',
+		defaultMessage: 'Custom...',
+	},
+	customExpiryValue: {
+		id: 'sharing.invite-players-modal.custom-expiry-value',
+		defaultMessage: 'Custom: {date}',
+	},
 	cancel: {
 		id: 'sharing.invite-players-modal.cancel-button',
 		defaultMessage: 'Cancel',
 	},
+	apply: {
+		id: 'sharing.invite-players-modal.apply-button',
+		defaultMessage: 'Apply',
+	},
 	save: {
 		id: 'sharing.invite-players-modal.save-button',
 		defaultMessage: 'Save',
@@ -100,6 +209,35 @@ const messages = defineMessages({
 	},
 })
 
+const expiryOptions = computed<ComboboxOption<ExpiryPreset>[]>(() => [
+	{ value: 'one_hour', label: formatMessage(messages.inOneHour) },
+	{ value: 'six_hours', label: formatMessage(messages.inSixHours) },
+	{ value: 'twelve_hours', label: formatMessage(messages.inTwelveHours) },
+	{ value: 'one_day', label: formatMessage(messages.inOneDay) },
+	{ value: 'three_days', label: formatMessage(messages.inThreeDays) },
+	{ value: 'seven_days', label: formatMessage(messages.inSevenDays) },
+])
+const expiryDropdownOptions = computed(() => (customExpiryOpen.value ? [] : expiryOptions.value))
+const selectedExpiryPreset = computed(() =>
+	expiryMode.value === 'preset' ? expiryPreset.value : undefined,
+)
+const expiryPickerLabel = computed(() => {
+	if (expiryMode.value === 'preset') {
+		return (
+			expiryOptions.value.find((option) => option.value === expiryPreset.value)?.label ??
+			formatMessage(messages.inSevenDays)
+		)
+	}
+
+	const date = parseLocalDate(expiry.value)
+	return date
+		? formatMessage(messages.customExpiryValue, { date: formatExpiryDate(date) })
+		: formatMessage(messages.customExpiry)
+})
+const canApplyCustomExpiry = computed(() => {
+	const date = parseLocalDate(customExpiry.value)
+	return !!date && date >= minimumExpiry.value && date <= maximumExpiry.value
+})
 const canSave = computed(() => {
 	const date = parseLocalDate(expiry.value)
 	return (
@@ -109,7 +247,7 @@ const canSave = computed(() => {
 		date <= maximumExpiry.value &&
 		Number.isInteger(maxUses.value ?? 0) &&
 		(maxUses.value ?? 0) > 0 &&
-		(maxUses.value ?? 0) <= 2147483647
+		(maxUses.value ?? 0) <= maximumUses.value
 	)
 })
 
@@ -126,13 +264,48 @@ function parseLocalDate(value: string) {
 	return Number.isNaN(date.getTime()) ? null : date
 }
 
+function roundDownToMinute(timestamp: number) {
+	const date = new Date(timestamp)
+	date.setSeconds(0, 0)
+	return date
+}
+
+function roundUpToMinute(timestamp: number) {
+	const date = roundDownToMinute(timestamp)
+	if (date.getTime() < timestamp) date.setMinutes(date.getMinutes() + 1)
+	return date
+}
+
+function expiryForPreset(preset: ExpiryPreset) {
+	const expiryTimestamp = expiryReferenceTime.value + EXPIRY_PRESET_DURATIONS[preset]
+	const date = roundDownToMinute(expiryTimestamp)
+	if (date < minimumExpiry.value) return minimumExpiry.value
+	if (date > maximumExpiry.value) return maximumExpiry.value
+	return date
+}
+
+function matchingExpiryPreset(date: Date) {
+	const duration = date.getTime() - expiryReferenceTime.value
+	let closestPreset: ExpiryPreset | null = null
+	let closestDifference = Number.POSITIVE_INFINITY
+
+	for (const [preset, presetDuration] of Object.entries(EXPIRY_PRESET_DURATIONS) as Array<
+		[ExpiryPreset, number]
+	>) {
+		const difference = Math.abs(duration - presetDuration)
+		if (difference < closestDifference) {
+			closestPreset = preset
+			closestDifference = difference
+		}
+	}
+
+	return closestDifference <= EXPIRY_PRESET_MATCH_TOLERANCE ? closestPreset : null
+}
+
 function show() {
-	const now = new Date()
-	minimumExpiry.value = new Date(now.getTime() + 3_600_000)
-	minimumExpiry.value.setSeconds(0, 0)
-	minimumExpiry.value.setMinutes(minimumExpiry.value.getMinutes() + 1)
-	maximumExpiry.value = new Date(now.getTime() + 7 * 86_400_000)
-	maximumExpiry.value.setSeconds(0, 0)
+	expiryReferenceTime.value = Date.now()
+	minimumExpiry.value = roundUpToMinute(expiryReferenceTime.value + MINIMUM_EXPIRY_DURATION)
+	maximumExpiry.value = roundDownToMinute(expiryReferenceTime.value + MAXIMUM_EXPIRY_DURATION)
 	const currentExpiry = props.linkExpiresAt ? new Date(props.linkExpiresAt) : maximumExpiry.value
 	const date =
 		Number.isNaN(currentExpiry.getTime()) || currentExpiry < minimumExpiry.value
@@ -141,16 +314,63 @@ function show() {
 				? maximumExpiry.value
 				: currentExpiry
 	expiry.value = formatLocalDate(date)
-	maxUses.value = props.linkMaxUses
+	const matchingPreset = matchingExpiryPreset(date)
+	expiryMode.value = matchingPreset ? 'preset' : 'custom'
+	if (matchingPreset) expiryPreset.value = matchingPreset
+	customExpiry.value = expiry.value
+	customExpiryOpen.value = false
+	maxUses.value = Math.min(props.linkMaxUses, maximumUses.value)
 	modal.value?.show()
 }
 
+function selectExpiryPreset(option: ComboboxOption<ExpiryPreset>) {
+	expiryMode.value = 'preset'
+	expiryPreset.value = option.value
+	expiry.value = formatLocalDate(expiryForPreset(option.value))
+}
+
+function handleExpiryPickerOpen() {
+	customExpiryOpen.value = false
+}
+
+function handleExpiryPickerClose() {
+	customExpiryOpen.value = false
+	customExpiry.value = expiry.value
+}
+
+function openCustomExpiry() {
+	customExpiry.value = expiry.value
+	customExpiryOpen.value = true
+}
+
+function cancelCustomExpiry() {
+	customExpiry.value = expiry.value
+	customExpiryOpen.value = false
+}
+
+function closeExpiryPicker(event: Event) {
+	const target = event.target
+	if (!(target instanceof HTMLElement)) return
+	target
+		.closest('[role="listbox"], [role="menu"]')
+		?.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }))
+}
+
+function applyCustomExpiry(event: MouseEvent) {
+	const date = parseLocalDate(customExpiry.value)
+	if (!canApplyCustomExpiry.value || !date) return
+	expiryMode.value = 'custom'
+	expiry.value = formatLocalDate(date)
+	closeExpiryPicker(event)
+}
+
 async function save() {
 	const date = parseLocalDate(expiry.value)
 	if (!canSave.value || !date || !props.updateInviteLink) return
+	const clampedMaxUses = Math.min(maxUses.value ?? 1, maximumUses.value)
 	saving.value = true
 	try {
-		await props.updateInviteLink({ expiresAt: date, maxUses: maxUses.value ?? 1 })
+		await props.updateInviteLink({ expiresAt: date, maxUses: clampedMaxUses })
 		modal.value?.hide()
 	} catch (error) {
 		notificationManager?.addNotification({
@@ -163,5 +383,9 @@ async function save() {
 	}
 }
 
+watch([maxUses, maximumUses], ([uses, limit]) => {
+	if (uses !== undefined && uses > limit) maxUses.value = limit
+})
+
 defineExpose({ show })
 </script>
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
index 831866e867..930615c2f5 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
@@ -29,6 +29,7 @@ import type {
 	ContentCardProject,
 	ContentCardVersion,
 	ContentOwner,
+	ContentSource,
 } from '../types'
 
 const { formatMessage } = useVIntl()
@@ -46,6 +47,7 @@ interface Props {
 	version?: ContentCardVersion
 	versionLink?: string | RouteLocationRaw
 	owner?: ContentOwner
+	source?: ContentSource
 	enabled?: boolean
 	installing?: boolean
 	hasUpdate?: boolean
@@ -68,6 +70,7 @@ const props = withDefaults(defineProps<Props>(), {
 	version: undefined,
 	versionLink: undefined,
 	owner: undefined,
+	source: undefined,
 	enabled: undefined,
 	installing: false,
 	hasUpdate: false,
@@ -196,8 +199,32 @@ const deleteHovered = ref(false)
 					</div>
 
 					<div class="flex min-w-0 items-center gap-1">
+						<template v-if="source">
+							<AutoLink
+								:target="
+									typeof source.link === 'string' && source.link.startsWith('http')
+										? '_blank'
+										: undefined
+								"
+								:to="source.link"
+								class="flex min-w-0 items-center gap-1 !decoration-secondary"
+								:class="{ 'hover:underline': source.link }"
+							>
+								<Avatar
+									:src="source.project.icon_url"
+									:alt="source.project.title"
+									:tint-by="source.project.id"
+									size="1.25rem"
+									no-shadow
+									class="shrink-0 rounded-md"
+								/>
+								<span class="truncate text-sm leading-5 text-secondary">
+									{{ source.project.title }}
+								</span>
+							</AutoLink>
+						</template>
 						<AutoLink
-							v-if="owner"
+							v-else-if="owner"
 							:target="
 								typeof owner.link === 'string' && owner.link.startsWith('http')
 									? '_blank'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentCardTable.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentCardTable.vue
index d9bb586159..146c818eb0 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentCardTable.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentCardTable.vue
@@ -264,6 +264,7 @@ function handleSort(column: ContentCardTableSortColumn) {
 					:version="item.version"
 					:version-link="item.versionLink"
 					:owner="item.owner"
+					:source="item.source"
 					:enabled="item.enabled"
 					:installing="item.installing"
 					:has-update="item.hasUpdate"
@@ -327,6 +328,7 @@ function handleSort(column: ContentCardTableSortColumn) {
 				:version="item.version"
 				:version-link="item.versionLink"
 				:owner="item.owner"
+				:source="item.source"
 				:enabled="item.enabled"
 				:installing="item.installing"
 				:has-update="item.hasUpdate"
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
index ec9075ac16..f7107f9c53 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
@@ -20,6 +20,7 @@ import type { Option as OverflowMenuOption } from '#ui/components/base/OverflowM
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
+import { injectPageContext } from '#ui/providers/page-context'
 import {
 	commonMessages,
 	commonProjectTypeCategoryMessages,
@@ -28,11 +29,12 @@ import {
 } from '#ui/utils/common-messages'
 
 import { getClientWarningType, isClientOnlyEnvironment } from '../../composables/content-filtering'
-import type { ContentCardTableItem, ContentItem } from '../../types'
+import type { ContentCardProject, ContentCardTableItem, ContentItem } from '../../types'
 import ContentCardTable from '../ContentCardTable.vue'
 import ContentSelectionBar from '../ContentSelectionBar.vue'
 
 const { formatMessage } = useVIntl()
+const pageContext = injectPageContext(null)
 
 interface Props {
 	header?: string
@@ -266,6 +268,12 @@ const tableItems = computed<ContentCardTableItem[]>(() =>
 							: `https://modrinth.com/organization/${item.owner.id}`,
 				}
 			: undefined,
+		source: item.source
+			? {
+					...item.source,
+					link: item.source.link ?? sourceProjectLink(item.source.project),
+				}
+			: undefined,
 		...(props.enableToggle ? { enabled: item.enabled } : {}),
 		installing: item.installing === true,
 		toggleDisabled: props.actionDisabled,
@@ -293,7 +301,7 @@ const tableItems = computed<ContentCardTableItem[]>(() =>
 	})),
 )
 const externalItemIds = computed(
-	() => new Set(items.value.filter((item) => item.external).map((item) => item.id)),
+	() => new Set(items.value.filter((item) => item.external && !item.source).map((item) => item.id)),
 )
 const externalSlicerUrls = computed(() => {
 	const urls: Record<string, string> = {}
@@ -335,6 +343,12 @@ function itemDisplayName(item: ContentItem) {
 	return item.project?.title ?? item.file_name
 }
 
+function sourceProjectLink(project: ContentCardProject) {
+	const projectId = project.slug ?? project.id
+	const url = `https://modrinth.com/modpack/${encodeURIComponent(projectId)}`
+	return pageContext ? () => pageContext.openExternalUrl(url) : url
+}
+
 function handleEnabledChange(id: string, value: boolean) {
 	if (props.actionDisabled) return
 	const item = items.value.find((item) => item.id === id)
diff --git a/packages/ui/src/layouts/shared/content-tab/types.ts b/packages/ui/src/layouts/shared/content-tab/types.ts
index c92f8216a9..b643787f58 100644
--- a/packages/ui/src/layouts/shared/content-tab/types.ts
+++ b/packages/ui/src/layouts/shared/content-tab/types.ts
@@ -21,6 +21,11 @@ export interface ContentOwner {
 	link?: string | RouteLocationRaw | (() => void)
 }
 
+export interface ContentSource {
+	project: ContentCardProject
+	link?: string | RouteLocationRaw | (() => void)
+}
+
 export type ClientWarningType = 'retained' | 'depends' | 'environment'
 
 export type ContentSourceKind =
@@ -44,6 +49,7 @@ export interface ContentCardTableItem {
 	version?: ContentCardVersion
 	versionLink?: string | RouteLocationRaw
 	owner?: ContentOwner
+	source?: ContentSource
 	enabled?: boolean
 	disabled?: boolean
 	disabledTooltip?: string | null
diff --git a/packages/ui/src/layouts/shared/user-profile/layout.vue b/packages/ui/src/layouts/shared/user-profile/layout.vue
index 28dcdf0f8d..6ba0cdf85d 100644
--- a/packages/ui/src/layouts/shared/user-profile/layout.vue
+++ b/packages/ui/src/layouts/shared/user-profile/layout.vue
@@ -402,7 +402,11 @@ import {
 	SpinnerIcon,
 	XIcon,
 } from '@modrinth/assets'
-import { UserBadge } from '@modrinth/utils'
+import {
+	isModrinthUser as checkIsModrinthUser,
+	isOfficialAccount as checkIsOfficialAccount,
+	UserBadge,
+} from '@modrinth/utils'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -716,8 +720,8 @@ const earliestProjectByType = computed(() => {
 	return earliest
 })
 
-const isModrinthUser = computed(() => user.value?.id === '2REoufqX')
-const isOfficialAccount = computed(() => isModrinthUser.value || user.value?.id === 'GVFjtWTf')
+const isModrinthUser = computed(() => checkIsModrinthUser(user.value?.id))
+const isOfficialAccount = computed(() => checkIsOfficialAccount(user.value?.id))
 const isSelf = computed(() => auth.user.value?.id === user.value?.id)
 const isAdminViewing = computed(() => auth.user.value?.role === 'admin')
 const isStaffViewing = computed(
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 2419d9374b..2f9bbb5114 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -2321,6 +2321,9 @@
   "label.password": {
     "defaultMessage": "Password"
   },
+  "label.permissions": {
+    "defaultMessage": "Permissions"
+  },
   "label.plan-custom": {
     "defaultMessage": "Custom"
   },
@@ -5240,6 +5243,9 @@
   "sharing.invite-players-modal.already-invited": {
     "defaultMessage": "This user has already been invited."
   },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Apply"
+  },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username}'s avatar"
   },
@@ -5249,12 +5255,36 @@
   "sharing.invite-players-modal.cancel-button": {
     "defaultMessage": "Cancel"
   },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Custom..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Custom: {date}"
+  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Edit invite link."
   },
   "sharing.invite-players-modal.edit-invite-link-title": {
     "defaultMessage": "Edit invite link"
   },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "In 1 day"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "In 1 hour"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "In 7 days"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "In 6 hours"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "In 3 days"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "In 12 hours"
+  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Expiry date"
   },
diff --git a/packages/ui/src/stories/modal/TabbedModal.stories.ts b/packages/ui/src/stories/modal/TabbedModal.stories.ts
index 6503064cf1..7ed018ee8c 100644
--- a/packages/ui/src/stories/modal/TabbedModal.stories.ts
+++ b/packages/ui/src/stories/modal/TabbedModal.stories.ts
@@ -232,46 +232,55 @@ export const ManyTabs: StoryObj = {
 			const tabs = [
 				{
 					name: { id: 'general', defaultMessage: 'General' },
+					category: { id: 'display-category', defaultMessage: 'Display' },
 					icon: InfoIcon,
 					content: makeTabContent('General'),
 				},
 				{
 					name: { id: 'appearance', defaultMessage: 'Appearance' },
+					category: { id: 'display-category', defaultMessage: 'Display' },
 					icon: PaintbrushIcon,
 					content: makeTabContent('Appearance'),
 				},
 				{
 					name: { id: 'language', defaultMessage: 'Language' },
+					category: { id: 'display-category', defaultMessage: 'Display' },
 					icon: LanguagesIcon,
 					content: makeTabContent('Language'),
 				},
 				{
 					name: { id: 'privacy', defaultMessage: 'Privacy' },
+					category: { id: 'account-category', defaultMessage: 'Account' },
 					icon: ShieldIcon,
 					content: makeTabContent('Privacy'),
 				},
 				{
 					name: { id: 'java', defaultMessage: 'Java and memory' },
+					category: { id: 'instances-category', defaultMessage: 'Instances' },
 					icon: CoffeeIcon,
 					content: makeTabContent('Java and memory'),
 				},
 				{
 					name: { id: 'instances', defaultMessage: 'Default instance options' },
+					category: { id: 'instances-category', defaultMessage: 'Instances' },
 					icon: GameIcon,
 					content: makeTabContent('Default instance options'),
 				},
 				{
 					name: { id: 'resources', defaultMessage: 'Resource management' },
+					category: { id: 'instances-category', defaultMessage: 'Instances' },
 					icon: GaugeIcon,
 					content: makeTabContent('Resource management'),
 				},
 				{
 					name: { id: 'window', defaultMessage: 'Window' },
+					category: { id: 'advanced-category', defaultMessage: 'Advanced' },
 					icon: MonitorIcon,
 					content: makeTabContent('Window'),
 				},
 				{
 					name: { id: 'hooks', defaultMessage: 'Launch hooks' },
+					category: { id: 'advanced-category', defaultMessage: 'Advanced' },
 					icon: WrenchIcon,
 					content: makeTabContent('Launch hooks'),
 				},
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index 0cfa7eac27..676b9c2606 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -291,6 +291,10 @@ export const commonMessages = defineMessages({
 		id: 'label.scopes',
 		defaultMessage: 'Scopes',
 	},
+	permissionsLabel: {
+		id: 'label.permissions',
+		defaultMessage: 'Permissions',
+	},
 	searchLabel: {
 		id: 'label.search',
 		defaultMessage: 'Search',
diff --git a/packages/utils/users.ts b/packages/utils/users.ts
index f13f438d81..192955dd9d 100644
--- a/packages/utils/users.ts
+++ b/packages/utils/users.ts
@@ -13,3 +13,17 @@ export const isAdmin = (user) => {
 }
 
 export const STAFF_ROLES = ['moderator', 'admin']
+
+export const MODRINTH_USER_ID = '2REoufqX'
+export const AUTOMOD_USER_ID = ''
+export const MODRINTH_ARCHIVES_USER_ID = 'GVFjtWTf'
+
+export const OFFICIAL_ACCOUNT_IDS = [MODRINTH_USER_ID, AUTOMOD_USER_ID, MODRINTH_ARCHIVES_USER_ID]
+
+export const isModrinthUser = (userId) => {
+	return userId === MODRINTH_USER_ID
+}
+
+export const isOfficialAccount = (userId) => {
+	return OFFICIAL_ACCOUNT_IDS.includes(userId)
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3d8dbc26de..72a32c7ed6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -31,6 +31,9 @@ importers:
       '@types/node':
         specifier: ^24
         version: 24.12.2
+      '@typescript-eslint/typescript-estree':
+        specifier: ^8.64.0
+        version: 8.64.0(typescript@5.9.3)
       '@vue/compiler-dom':
         specifier: ^3.5.26
         version: 3.5.27
@@ -4536,6 +4539,12 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/project-service@8.64.0':
+    resolution: {integrity: sha512-tk4WpOJ6IEbGrVHaNmM0YRrwAD3exZlIK3iadQNAxh4YKk6jvUQ4ecq18n+v7+meh+cJ3j+D8nbk8sRKhlwLQg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/scope-manager@8.54.0':
     resolution: {integrity: sha512-27rYVQku26j/PbHYcVfRPonmOlVI6gihHtXFbTdB5sb6qA0wdAQAbyXFVarQ5t4HRojIz64IV90YtsjQSSGlQg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4546,6 +4555,12 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/tsconfig-utils@8.64.0':
+    resolution: {integrity: sha512-2yo8rRNKuzbVWQp5kslhANqZ2uDAeROQHBRZNPu8JDsHmeFNj/XJJhX/FhNUWmkHHvoNsKa6+tHJiig87EzsQw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/type-utils@8.54.0':
     resolution: {integrity: sha512-hiLguxJWHjjwL6xMBwD903ciAwd7DmK30Y9Axs/etOkftC3ZNN9K44IuRD/EB08amu+Zw6W37x9RecLkOo3pMA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4557,12 +4572,22 @@ packages:
     resolution: {integrity: sha512-PDUI9R1BVjqu7AUDsRBbKMtwmjWcn4J3le+5LpcFgWULN3LvHC5rkc9gCVxbrsrGmO1jfPybN5s6h4Jy+OnkAA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/types@8.64.0':
+    resolution: {integrity: sha512-qjhfuTfLXjA4IOzXvz0rTjT01BqEiIgPoUeMwiEjnaHKJMTNo8rH5pYW1a2L/0Dnux2fPC85AeyJoWaGa8WxTA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@typescript-eslint/typescript-estree@8.54.0':
     resolution: {integrity: sha512-BUwcskRaPvTk6fzVWgDPdUndLjB87KYDrN5EYGetnktoeAvPtO4ONHlAZDnj5VFnUANg0Sjm7j4usBlnoVMHwA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/typescript-estree@8.64.0':
+    resolution: {integrity: sha512-Pztpsn1aCE1oWDvDEfUk31nngvvF7vUB5SwHFEaZIFpvw7WJtqUHHL4plBZDA9HfWJJjL13BdG0YrJInTUvoVA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/utils@8.54.0':
     resolution: {integrity: sha512-9Cnda8GS57AQakvRyG0PTejJNlA2xhvyNtEVIMlDWOOeEyBkYWhGPnfrIAnqxLMTSTo6q8g12XVjjev5l1NvMA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4574,6 +4599,10 @@ packages:
     resolution: {integrity: sha512-VFlhGSl4opC0bprJiItPQ1RfUhGDIBokcPwaFH4yiBCaNPeld/9VeXbiPO1cLyorQi1G1vL+ecBk1x8o1axORA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/visitor-keys@8.64.0':
+    resolution: {integrity: sha512-mrtuL8Nsn6gi2H4mo5KMTp823M+3Q19Ew/i+Zlikq20tIMm99C3Ez0dCmkWWnxut20esQvTg8aUSEhMcAOXhEw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
 
@@ -6144,6 +6173,10 @@ packages:
     resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-visitor-keys@5.0.1:
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   eslint@9.39.2:
     resolution: {integrity: sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -9249,6 +9282,12 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4'
 
+  ts-api-utils@2.5.0:
+    resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
+    engines: {node: '>=18.12'}
+    peerDependencies:
+      typescript: '>=4.8.4'
+
   ts-dedent@2.2.0:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
     engines: {node: '>=6.10'}
@@ -9953,8 +9992,8 @@ packages:
   vue-component-type-helpers@3.2.4:
     resolution: {integrity: sha512-05lR16HeZDcDpB23ku5b5f1fBOoHqFnMiKRr2CiEvbG5Ux4Yi0McmQBOET0dR0nxDXosxyVqv67q6CzS3AK8rw==}
 
-  vue-component-type-helpers@3.3.5:
-    resolution: {integrity: sha512-Fe1jyPJoUGpJOYKOri44jduR7My4yYINOMJISuMAbmrs+L5LbIDUc8NTWZYY3EJLK0yPLuCmcd5zoCsE4k2/KA==}
+  vue-component-type-helpers@3.3.7:
+    resolution: {integrity: sha512-Skkhw9agYSgsWqv7bxSOGJZa9SaiJbZVGdXuFWnrzKaQYHnw9qbjD630rw6RyMqDbp54nfLCLw5SZA55if7JLg==}
 
   vue-confetti-explosion@1.0.2:
     resolution: {integrity: sha512-80OboM3/6BItIoZ6DpNcZFqGpF607kjIVc5af56oKgtFmt5yWehvJeoYhkzYlqxrqdBe0Ko4Ie3bWrmLau+dJw==}
@@ -13436,7 +13475,7 @@ snapshots:
       storybook: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       type-fest: 2.19.0
       vue: 3.5.27(typescript@5.9.3)
-      vue-component-type-helpers: 3.3.5
+      vue-component-type-helpers: 3.3.7
 
   '@stripe/stripe-js@7.9.0': {}
 
@@ -13891,6 +13930,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/project-service@8.64.0(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.64.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.64.0
+      debug: 4.4.3
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/scope-manager@8.54.0':
     dependencies:
       '@typescript-eslint/types': 8.54.0
@@ -13900,6 +13948,10 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
+  '@typescript-eslint/tsconfig-utils@8.64.0(typescript@5.9.3)':
+    dependencies:
+      typescript: 5.9.3
+
   '@typescript-eslint/type-utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/types': 8.54.0
@@ -13914,6 +13966,8 @@ snapshots:
 
   '@typescript-eslint/types@8.54.0': {}
 
+  '@typescript-eslint/types@8.64.0': {}
+
   '@typescript-eslint/typescript-estree@8.54.0(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/project-service': 8.54.0(typescript@5.9.3)
@@ -13929,6 +13983,21 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/typescript-estree@8.64.0(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.64.0(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.64.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.64.0
+      '@typescript-eslint/visitor-keys': 8.64.0
+      debug: 4.4.3
+      minimatch: 10.2.3
+      semver: 7.7.4
+      tinyglobby: 0.2.15
+      ts-api-utils: 2.5.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
@@ -13956,6 +14025,11 @@ snapshots:
       '@typescript-eslint/types': 8.54.0
       eslint-visitor-keys: 4.2.1
 
+  '@typescript-eslint/visitor-keys@8.64.0':
+    dependencies:
+      '@typescript-eslint/types': 8.64.0
+      eslint-visitor-keys: 5.0.1
+
   '@ungap/structured-clone@1.3.0': {}
 
   '@unhead/vue@2.1.2(vue@3.5.27(typescript@5.9.3))':
@@ -15815,6 +15889,8 @@ snapshots:
 
   eslint-visitor-keys@4.2.1: {}
 
+  eslint-visitor-keys@5.0.1: {}
+
   eslint@9.39.2(jiti@1.21.7):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
@@ -19773,6 +19849,10 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
+  ts-api-utils@2.5.0(typescript@5.9.3):
+    dependencies:
+      typescript: 5.9.3
+
   ts-dedent@2.2.0: {}
 
   ts-interface-checker@0.1.13: {}
@@ -20277,22 +20357,6 @@ snapshots:
       yaml: 2.8.2
     optional: true
 
-  vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2):
-    dependencies:
-      lightningcss: 1.32.0
-      picomatch: 4.0.4
-      postcss: 8.5.8
-      rolldown: 1.0.0-rc.12
-      tinyglobby: 0.2.15
-    optionalDependencies:
-      '@types/node': 24.12.2
-      esbuild: 0.27.3
-      fsevents: 2.3.3
-      jiti: 1.21.7
-      sass: 1.97.3
-      terser: 5.46.0
-      yaml: 2.8.2
-
   vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2):
     dependencies:
       lightningcss: 1.32.0
@@ -20429,7 +20493,7 @@ snapshots:
 
   vue-component-type-helpers@3.2.4: {}
 
-  vue-component-type-helpers@3.3.5: {}
+  vue-component-type-helpers@3.3.7: {}
 
   vue-confetti-explosion@1.0.2(vue@3.5.27(typescript@5.9.3)):
     dependencies: