diff --git a/README.md b/README.md
index f7c3730a79..7b4f90ef20 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
 ![Issues](https://img.shields.io/github/issues-raw/Modrinth/code?color=c78aff&label=issues&style=for-the-badge)
 ![Pull Requests](https://img.shields.io/github/issues-pr-raw/Modrinth/code?color=c78aff&label=PRs&style=for-the-badge)
 ![Contributors](https://img.shields.io/github/contributors/Modrinth/code?color=c78aff&label=contributors&style=for-the-badge)
-![Lines](https://img.shields.io/endpoint?url=https://ghloc.vercel.app/api/modrinth/code/badge?style=flat&logoColor=white&color=c78aff&style=for-the-badge)
+![Lines of Code](https://img.shields.io/endpoint?url=https://loctopus.creeperkatze.dev/github/modrinth/code/badge?style=flat&logoColor=white&color=c78aff&style=for-the-badge)
 ![Commit Activity](https://img.shields.io/github/commit-activity/m/Modrinth/code?color=c78aff&label=commits&style=for-the-badge)
 ![Last Commit](https://img.shields.io/github/last-commit/Modrinth/code?color=c78aff&label=last%20commit&style=for-the-badge)
 
 ## Modrinth Monorepo
 
-Welcome to the Modrinth Monorepo, the primary codebase for the Modrinth web interface and app. It contains ![Lines](https://img.shields.io/endpoint?url=https://ghloc.vercel.app/api/modrinth/olympus/badge?logoColor=white&color=black&label=) lines of code and has ![Contributors](https://img.shields.io/github/contributors/Modrinth/code?color=black&label=) contributors!
+Welcome to the Modrinth Monorepo, the primary codebase for the Modrinth web interface and app. It contains ![Lines of Code](https://img.shields.io/endpoint?url=https://loctopus.creeperkatze.dev/github/modrinth/code/badge%3Fformat%3Dhuman&logoColor=white&color=black&label=) lines of code and has ![Contributors](https://img.shields.io/github/contributors/Modrinth/code?color=black&label=) contributors!
 
 If you're not a developer and you've stumbled upon this repository, you can access the web interface on the [Modrinth website](https://modrinth.com) and download the latest release of the app [here](https://modrinth.com/app).
 
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 9b8fdec3b9..fea079df51 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -410,12 +410,27 @@
   "app.project.install-button.already-installed": {
     "message": "This project is already installed"
   },
+  "app.project.install-button.switch-version": {
+    "message": "Switch version"
+  },
   "app.project.install-context.back-to-browse": {
     "message": "Back to discover"
   },
   "app.project.install-context.install-content-to-instance": {
     "message": "Install content to instance"
   },
+  "app.project.version.all-versions": {
+    "message": "All versions"
+  },
+  "app.project.version.download-in-browser": {
+    "message": "Download in browser"
+  },
+  "app.project.version.installing": {
+    "message": "Installing"
+  },
+  "app.project.versions.already-installed": {
+    "message": "Already installed"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Developer mode enabled."
   },
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index 0eeede917a..253d8430eb 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -49,6 +49,7 @@ import {
 	get_installed_project_ids as getInstalledProjectIds,
 } from '@/helpers/instance'
 import { get_loader_versions as getLoaderManifest } from '@/helpers/metadata'
+import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
 import { get_categories, get_game_versions, get_loaders } from '@/helpers/tags'
 import { get_instance_worlds } from '@/helpers/worlds'
 import { injectContentInstall } from '@/providers/content-install'
@@ -1041,10 +1042,24 @@ function getProjectBrowseQuery() {
 	}
 }
 
+const advancedFiltersCollapsed = computed({
+	get: () => themeStore.getFeatureFlag('advanced_filters_collapsed'),
+	set: (value) => {
+		themeStore.featureFlags['advanced_filters_collapsed'] = value
+		getSettings()
+			.then((settings) => {
+				settings.feature_flags['advanced_filters_collapsed'] = value
+				return setSettings(settings)
+			})
+			.catch(handleError)
+	},
+})
+
 provideBrowseManager({
 	tags,
 	projectType,
 	...searchState,
+	advancedFiltersCollapsed,
 	getProjectLink: (result: Labrinth.Search.v2.ResultSearchProject) => ({
 		path: `/project/${result.project_id ?? result.slug}`,
 		query: getProjectBrowseQuery(),
diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue
index 6bcff92a0e..485d3065de 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
@@ -1351,7 +1351,9 @@ provideContentManager({
 			title: item.file_name.replace('.disabled', ''),
 			icon_url: null,
 		},
-		projectLink: item.project?.id ? { path: `/project/${item.project.id}` } : undefined,
+		projectLink: item.project?.id
+			? { path: `/project/${item.project.id}`, query: { i: props.instance.id } }
+			: undefined,
 		version: item.version ?? {
 			id: item.file_name,
 			version_number: formatMessage(commonMessages.unknownLabel),
@@ -1361,6 +1363,7 @@ provideContentManager({
 			item.project?.id && item.version?.id
 				? {
 						path: `/project/${item.project.id}/version/${item.version.id}`,
+						query: { i: props.instance.id },
 					}
 				: undefined,
 		owner: item.owner
diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue
index d9230361ef..e14dcc0f33 100644
--- a/apps/app-frontend/src/pages/project/Index.vue
+++ b/apps/app-frontend/src/pages/project/Index.vue
@@ -116,13 +116,27 @@
 								aria-label="More options"
 							>
 								<MoreVerticalIcon aria-hidden="true" />
-								<template #open-in-browser> <ExternalIcon /> Open in browser </template>
+								<template #open-in-browser>
+									<ExternalIcon /> {{ formatMessage(commonMessages.openInBrowserButton) }}
+								</template>
 								<template #report> <ReportIcon /> Report </template>
 							</OverflowMenu>
 						</ButtonStyled>
 					</template>
 					<template v-else #actions>
-						<ButtonStyled size="large" color="brand">
+						<ButtonStyled v-if="showSwitchVersion && onVersionsPage" size="large">
+							<button v-tooltip="installButtonTooltip" disabled>
+								<CheckIcon />
+								{{ formatMessage(commonMessages.installedLabel) }}
+							</button>
+						</ButtonStyled>
+						<ButtonStyled v-else-if="showSwitchVersion" size="large">
+							<button @click="goToVersions">
+								<SwapIcon />
+								{{ formatMessage(messages.switchVersion) }}
+							</button>
+						</ButtonStyled>
+						<ButtonStyled v-else size="large" color="brand">
 							<button
 								v-tooltip="installButtonTooltip"
 								:disabled="installButtonDisabled"
@@ -171,7 +185,9 @@
 								aria-label="More options"
 							>
 								<MoreVerticalIcon aria-hidden="true" />
-								<template #open-in-browser> <ExternalIcon /> Open in browser </template>
+								<template #open-in-browser>
+									<ExternalIcon /> {{ formatMessage(commonMessages.openInBrowserButton) }}
+								</template>
 								<template #follow> <HeartIcon /> Follow </template>
 								<template #save> <BookmarkIcon /> Save </template>
 								<template #report> <ReportIcon /> Report </template>
@@ -294,6 +310,7 @@ import relativeTime from 'dayjs/plugin/relativeTime'
 import { computed, onUnmounted, ref, shallowRef, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
+import { SwapIcon } from '@/assets/icons/index.js'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import InstanceIndicator from '@/components/ui/InstanceIndicator.vue'
 import {
@@ -349,6 +366,10 @@ const messages = defineMessages({
 		id: 'app.project.install-button.already-installed',
 		defaultMessage: 'This project is already installed',
 	},
+	switchVersion: {
+		id: 'app.project.install-button.switch-version',
+		defaultMessage: 'Switch version',
+	},
 })
 
 const { installingServerProjects, playServerProject, showAddServerToInstanceModal } =
@@ -520,6 +541,13 @@ const installButtonTooltip = computed(() => {
 	return null
 })
 
+const showSwitchVersion = computed(() => !!instance.value && installed.value)
+const onVersionsPage = computed(() => route.name === 'Versions')
+
+function goToVersions() {
+	router.push(versionsHref.value)
+}
+
 const [allLoaders, allGameVersions] = await Promise.all([
 	get_loaders().catch(handleError).then(ref),
 	get_game_versions().catch(handleError).then(ref),
diff --git a/apps/app-frontend/src/pages/project/Version.vue b/apps/app-frontend/src/pages/project/Version.vue
index 8a37f765e2..6ea656c4ed 100644
--- a/apps/app-frontend/src/pages/project/Version.vue
+++ b/apps/app-frontend/src/pages/project/Version.vue
@@ -1,259 +1,152 @@
 <template>
-	<div>
-		<Card>
-			<Breadcrumbs
-				:current-title="version.name"
-				:link-stack="[
-					{
-						href: buildProjectHref(`/project/${route.params.id}/versions`),
-						label: 'Versions',
-					},
-				]"
-			/>
-			<div class="version-title">
-				<h2>{{ version.name }}</h2>
-			</div>
-			<div class="button-group">
+	<div class="flex flex-col">
+		<router-link
+			class="mb-4 flex w-fit items-center gap-2 rounded-lg px-2 py-0.5 pl-0 text-link"
+			:to="buildProjectHref(`/project/${route.params.id}/versions`)"
+		>
+			<ChevronLeftIcon class="shrink-0" /> {{ formatMessage(messages.allVersions) }}
+		</router-link>
+		<VersionPage
+			v-if="version"
+			:version="version"
+			:enrichment="enrichment"
+			:enrichment-loading="enrichmentLoading"
+			:members="members"
+			:dependency-link-creator="createDependencyLink"
+		>
+			<template #headerActions>
 				<ButtonStyled color="brand">
 					<button
 						:disabled="installing || (installed && installedVersion === version.id)"
-						@click="() => install(version.id)"
+						@click="() => version && install(version.id)"
 					>
 						<DownloadIcon v-if="!installed" />
 						<SwapIcon v-else-if="installedVersion !== version.id" />
 						<CheckIcon v-else />
 						{{
 							installing
-								? 'Installing...'
+								? formatMessage(messages.installing)
 								: installed && installedVersion === version.id
-									? 'Installed'
-									: 'Install'
+									? formatMessage(commonMessages.installedLabel)
+									: installed
+										? formatMessage(commonMessages.switchToVersionButton)
+										: formatMessage(commonMessages.installButton)
 						}}
 					</button>
 				</ButtonStyled>
-				<ButtonStyled>
-					<button>
-						<ReportIcon />
-						Report
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<a
-						:href="`https://modrinth.com/mod/${route.params.id}/version/${route.params.version}`"
-						rel="external"
+				<ButtonStyled type="outlined" circular>
+					<OverflowMenu
+						v-tooltip="formatMessage(commonMessages.moreOptionsButton)"
+						:options="[
+							{
+								id: 'open-in-browser',
+								link: `https://modrinth.com/${project.project_type}/${project.slug}/version/${version.id}`,
+								external: true,
+							},
+							{
+								id: 'report',
+								color: 'red',
+								hoverFilled: true,
+								link: `https://modrinth.com/report?item=version&itemID=${version.id}`,
+								external: true,
+							},
+						]"
+						aria-label="More options"
 					>
-						Modrinth website
-						<ExternalIcon />
+						<MoreVerticalIcon aria-hidden="true" />
+						<template #open-in-browser>
+							<ExternalIcon aria-hidden="true" />
+							{{ formatMessage(commonMessages.openInBrowserButton) }}
+						</template>
+						<template #report>
+							<ReportIcon aria-hidden="true" /> {{ formatMessage(commonMessages.reportButton) }}
+						</template>
+					</OverflowMenu>
+				</ButtonStyled>
+			</template>
+			<template #supplementaryResourceActions="{ file }">
+				<ButtonStyled>
+					<a :href="file.url" :download="file.filename" target="_blank">
+						<DownloadIcon aria-hidden="true" />
+						{{ formatMessage(messages.downloadInBrowser) }}
 					</a>
 				</ButtonStyled>
-			</div>
-		</Card>
-		<div class="version-container">
-			<div class="description-cards">
-				<Card>
-					<h3 class="card-title">Changelog</h3>
-					<div class="markdown-body" v-html="renderString(version.changelog ?? '')" />
-				</Card>
-				<Card>
-					<h3 class="card-title">Files</h3>
-					<Card
-						v-for="file in version.files"
-						:key="file.id"
-						:class="{ primary: file.primary }"
-						class="file"
-					>
-						<span class="label">
-							<FileIcon />
-							<span>
-								<span class="title">
-									{{ file.filename }}
-								</span>
-								({{ formatBytes(file.size) }})
-								<span v-if="file.primary" class="primary-label"> Primary </span>
-							</span>
-						</span>
-						<ButtonStyled v-if="project.project_type !== 'modpack' || file.primary" color="brand">
-							<button class="download" :disabled="installed" @click="() => install(version.id)">
-								<DownloadIcon v-if="!installed" />
-								<CheckIcon v-else />
-								{{ installed ? 'Installed' : 'Install' }}
-							</button>
-						</ButtonStyled>
-					</Card>
-				</Card>
-				<Card v-if="displayDependencies.length > 0">
-					<h2>Dependencies</h2>
-					<div v-for="dependency in displayDependencies" :key="dependency.title">
-						<router-link v-if="dependency.link" class="btn dependency" :to="dependency.link">
-							<Avatar size="sm" :src="dependency.icon" />
-							<div>
-								<span class="title"> {{ dependency.title }} </span> <br />
-								<span> {{ dependency.subtitle }} </span>
-							</div>
-						</router-link>
-						<div v-else class="dependency disabled" disabled="">
-							<Avatar size="sm" :src="dependency.icon" />
-							<div class="text">
-								<div class="title">{{ dependency.title }}</div>
-								<div>{{ dependency.subtitle }}</div>
-							</div>
-						</div>
-					</div>
-				</Card>
-			</div>
-			<Card class="metadata-card">
-				<h3 class="card-title">Metadata</h3>
-				<div class="metadata">
-					<div class="metadata-item">
-						<span class="metadata-label">Release Channel</span>
-						<span class="metadata-value"
-							><Badge
-								:color="releaseColor(version.version_type)"
-								:type="
-									version.version_type.charAt(0).toUpperCase() + version.version_type.slice(1)
-								"
-						/></span>
-					</div>
-					<div class="metadata-item">
-						<span class="metadata-label">Version Number</span>
-						<span class="metadata-value">{{ version.version_number }}</span>
-					</div>
-					<div class="metadata-item">
-						<span class="metadata-label">Loaders</span>
-						<span class="metadata-value">{{
-							version.loaders
-								.map((loader) => loader.charAt(0).toUpperCase() + loader.slice(1))
-								.join(', ')
-						}}</span>
-					</div>
-					<div class="metadata-item">
-						<span class="metadata-label">Game Versions</span>
-						<span class="metadata-value"> {{ version.game_versions.join(', ') }} </span>
-					</div>
-					<div class="metadata-item">
-						<span class="metadata-label">Downloads</span>
-						<span class="metadata-value">{{ version.downloads }}</span>
-					</div>
-					<div class="metadata-item">
-						<span class="metadata-label">Publication Date</span>
-						<span class="metadata-value">
-							{{ formatDateTime(version.date_published) }}
-						</span>
-					</div>
-					<div v-if="author" class="metadata-item">
-						<span class="metadata-label">Author</span>
-						<a
-							:href="`https://modrinth.com/user/${author.user.username}`"
-							rel="external"
-							class="metadata-value btn author"
-						>
-							<Avatar size="sm" :src="author.user.avatar_url" circle />
-							<span>
-								<strong>
-									{{ author.user.username }}
-								</strong>
-								<br />
-								{{ author.role }}
-							</span>
-						</a>
-					</div>
-					<div class="metadata-item">
-						<span class="metadata-label">Version ID</span>
-						<span class="metadata-value"><CopyCode class="copycode" :text="version.id" /></span>
-					</div>
-				</div>
-			</Card>
-		</div>
+			</template>
+		</VersionPage>
 	</div>
 </template>
 
-<script setup>
-import { CheckIcon, DownloadIcon, ExternalIcon, FileIcon, ReportIcon } from '@modrinth/assets'
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import {
+	CheckIcon,
+	ChevronLeftIcon,
+	DownloadIcon,
+	ExternalIcon,
+	MoreVerticalIcon,
+	ReportIcon,
+} from '@modrinth/assets'
 import {
-	Avatar,
-	Badge,
-	Breadcrumbs,
 	ButtonStyled,
-	Card,
-	CopyCode,
-	useFormatBytes,
-	useFormatDateTime,
+	commonMessages,
+	defineMessages,
+	type DependencyContext,
+	OverflowMenu,
+	useVIntl,
+	VersionPage,
 } from '@modrinth/ui'
-import { renderString } from '@modrinth/utils'
-import { computed, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
 import { useRoute } from 'vue-router'
 
 import { SwapIcon } from '@/assets/icons'
 import { get_project_many, get_version_many } from '@/helpers/cache.js'
-import { releaseColor } from '@/helpers/utils'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
 
-const formatDateTime = useFormatDateTime({
-	timeStyle: 'short',
-	dateStyle: 'long',
-})
-const formatBytes = useFormatBytes()
+const { formatMessage } = useVIntl()
 
-const breadcrumbs = useBreadcrumbs()
-
-const route = useRoute()
-
-const props = defineProps({
-	project: {
-		type: Object,
-		required: true,
-	},
-	versions: {
-		type: Array,
-		required: true,
-	},
-	members: {
-		type: Array,
-		required: true,
-	},
-	install: {
-		type: Function,
-		required: true,
-	},
-	installed: {
-		type: Boolean,
-		required: true,
+const messages = defineMessages({
+	allVersions: {
+		id: 'app.project.version.all-versions',
+		defaultMessage: 'All versions',
 	},
 	installing: {
-		type: Boolean,
-		required: true,
+		id: 'app.project.version.installing',
+		defaultMessage: 'Installing',
 	},
-	installedVersion: {
-		type: String,
-		required: true,
+	downloadInBrowser: {
+		id: 'app.project.version.download-in-browser',
+		defaultMessage: 'Download in browser',
 	},
 })
 
+const breadcrumbs = useBreadcrumbs()
+const route = useRoute()
+
+const props = defineProps<{
+	project: Labrinth.Projects.v2.Project
+	versions: Labrinth.Versions.v3.Version[]
+	members: Labrinth.Projects.v3.TeamMember[]
+	install: (version: string | null) => void
+	installed: boolean
+	installing: boolean
+	installedVersion: string
+}>()
+
 const version = ref(props.versions.find((version) => version.id === route.params.version))
-breadcrumbs.setName('Version', version.value.name)
+if (version.value) {
+	breadcrumbs.setName('Version', version.value.name)
+}
 
-watch(
-	() => props.versions,
-	async () => {
-		if (route.params.version) {
-			version.value = props.versions.find((version) => version.id === route.params.version)
-			await refreshDisplayDependencies()
-			breadcrumbs.setName('Version', version.value.name)
-		}
-	},
-)
+const enrichment = ref<Labrinth.Projects.v2.DependencyInfo | undefined>(undefined)
+const enrichmentLoading = ref(false)
 
-const author = computed(() =>
-	props.members ? props.members.find((member) => member.user.id === version.value.author_id) : null,
-)
-
-const displayDependencies = ref({})
-
-function buildProjectHref(path) {
+function buildProjectHref(path: string): string {
 	const params = new URLSearchParams()
 	for (const [key, val] of Object.entries(route.query)) {
 		if (Array.isArray(val)) {
-			for (const v of val) params.append(key, v)
+			for (const v of val) {
+				if (v != null) params.append(key, v)
+			}
 		} else if (val) {
 			params.append(key, String(val))
 		}
@@ -262,222 +155,65 @@ function buildProjectHref(path) {
 	return qs ? `${path}?${qs}` : path
 }
 
-async function refreshDisplayDependencies() {
-	const projectIds = new Set()
-	const versionIds = new Set()
-	if (version.value.dependencies) {
-		for (const dependency of version.value.dependencies) {
-			if (dependency.project_id) {
-				projectIds.add(dependency.project_id)
-			}
-			if (dependency.version_id) {
-				versionIds.add(dependency.version_id)
-			}
-		}
+function createDependencyLink(context: DependencyContext): string | undefined {
+	if (context.version) {
+		return buildProjectHref(`/project/${context.version.project_id}/version/${context.version.id}`)
 	}
-	const [projectDeps, versionDeps] = await Promise.all([
-		get_project_many([...projectIds]),
-		get_version_many([...versionIds]),
-	])
-
-	const dependencies = {
-		projects: projectDeps,
-		versions: versionDeps,
+	if (context.project) {
+		return buildProjectHref(`/project/${context.project.id}`)
 	}
-
-	displayDependencies.value = version.value.dependencies.map((dependency) => {
-		const version = dependencies.versions.find((obj) => obj.id === dependency.version_id)
-		if (version) {
-			const project = dependencies.projects.find(
-				(obj) => obj.id === version.project_id || obj.id === dependency.project_id,
-			)
-			return {
-				icon: project?.icon_url,
-				title: project?.title || project?.name,
-				subtitle: `Version ${version.version_number} is ${dependency.dependency_type}`,
-				link: buildProjectHref(`/project/${project.slug}/version/${version.id}`),
-			}
-		} else {
-			const project = dependencies.projects.find((obj) => obj.id === dependency.project_id)
-
-			if (project) {
-				return {
-					icon: project?.icon_url,
-					title: project?.title || project?.name,
-					subtitle: `${dependency.dependency_type}`,
-					link: buildProjectHref(`/project/${project.slug}`),
-				}
-			} else {
-				return {
-					icon: null,
-					title: dependency.file_name,
-					subtitle: `Added via overrides`,
-					link: null,
-				}
-			}
-		}
-	})
+	return undefined
 }
-await refreshDisplayDependencies()
+
+async function refreshEnrichment() {
+	if (!version.value) return
+
+	const projectIds = new Set<string>()
+	const versionIds = new Set<string>()
+	for (const dependency of version.value.dependencies ?? []) {
+		if (dependency.project_id) {
+			projectIds.add(dependency.project_id)
+		}
+		if (dependency.version_id) {
+			versionIds.add(dependency.version_id)
+		}
+	}
+
+	if (projectIds.size === 0 && versionIds.size === 0) {
+		enrichment.value = { projects: [], versions: [] }
+		return
+	}
+
+	enrichmentLoading.value = true
+	try {
+		const versionResults = versionIds.size > 0 ? await get_version_many([...versionIds]) : []
+		for (const dependencyVersion of versionResults ?? []) {
+			if (dependencyVersion.project_id) {
+				projectIds.add(dependencyVersion.project_id)
+			}
+		}
+		const projectResults = projectIds.size > 0 ? await get_project_many([...projectIds]) : []
+		enrichment.value = {
+			projects: projectResults ?? [],
+			versions: versionResults ?? [],
+		}
+	} finally {
+		enrichmentLoading.value = false
+	}
+}
+
+watch(
+	() => props.versions,
+	async () => {
+		if (route.params.version) {
+			version.value = props.versions.find((v) => v.id === route.params.version)
+			if (version.value) {
+				breadcrumbs.setName('Version', version.value.name)
+			}
+			await refreshEnrichment()
+		}
+	},
+)
+
+await refreshEnrichment()
 </script>
-
-<style scoped lang="scss">
-.version-container {
-	display: flex;
-	flex-direction: row;
-	gap: 1rem;
-}
-
-.version-title {
-	margin-bottom: 1rem;
-	h2 {
-		font-size: var(--font-size-2xl);
-		font-weight: 700;
-		color: var(--color-contrast);
-		margin: 0;
-	}
-}
-
-.dependency {
-	display: flex;
-	padding: 0.5rem 1rem 0.5rem 0.5rem;
-	gap: 0.5rem;
-	background: var(--color-raised-bg);
-	color: var(--color-base);
-	width: 100%;
-
-	.title {
-		font-weight: bolder;
-	}
-
-	:deep(svg) {
-		margin-right: 0 !important;
-	}
-}
-
-.file {
-	display: flex;
-	flex-direction: row;
-	gap: 0.5rem;
-	background: var(--color-button-bg);
-	color: var(--color-base);
-	padding: 0.5rem 1rem;
-
-	.download {
-		margin-left: auto;
-		background-color: var(--color-raised-bg);
-	}
-
-	.label {
-		display: flex;
-		margin: auto 0 auto;
-		gap: 0.5rem;
-
-		.title {
-			font-weight: bolder;
-			word-break: break-all;
-		}
-
-		svg {
-			min-width: 1.1rem;
-			min-height: 1.1rem;
-			width: 1.1rem;
-			height: 1.1rem;
-			margin: auto 0;
-		}
-
-		.primary-label {
-			font-style: italic;
-		}
-	}
-}
-
-.primary {
-	background: var(--color-brand-highlight);
-	color: var(--color-contrast);
-}
-
-.button-group {
-	display: flex;
-	flex-wrap: wrap;
-	flex-direction: row;
-	gap: 0.5rem;
-}
-
-.card-title {
-	font-size: var(--font-size-lg);
-	color: var(--color-contrast);
-	margin: 0 0 0.5rem;
-}
-
-.description-cards {
-	width: 100%;
-}
-
-.metadata-card {
-	width: 20rem;
-	height: min-content;
-}
-
-.metadata {
-	display: flex;
-	flex-direction: column;
-	flex-wrap: wrap;
-	gap: 1rem;
-
-	.metadata-item {
-		display: flex;
-		flex-direction: column;
-		gap: 0.5rem;
-
-		.metadata-label {
-			font-weight: bold;
-		}
-	}
-}
-
-.author {
-	display: flex;
-	flex-direction: row;
-	gap: 0.5rem;
-	align-items: center;
-	text-decoration: none;
-	color: var(--color-base);
-	background: var(--color-raised-bg);
-	padding: 0.5rem;
-	width: 100%;
-	box-shadow: none;
-}
-
-.markdown-body {
-	:deep(hr),
-	:deep(h1),
-	:deep(h2),
-	img {
-		max-width: max(60rem, 90%) !important;
-	}
-
-	:deep(ul),
-	:deep(ol) {
-		margin-left: 2rem;
-	}
-}
-
-.copycode {
-	border: 0;
-	color: var(--color-contrast);
-}
-
-.disabled {
-	display: flex;
-	flex-direction: row;
-	vertical-align: center;
-	align-items: center;
-	cursor: not-allowed;
-	border-radius: var(--radius-lg);
-
-	.text {
-		filter: brightness(0.5);
-	}
-}
-</style>
diff --git a/apps/app-frontend/src/pages/project/Versions.vue b/apps/app-frontend/src/pages/project/Versions.vue
index 584801fff5..7d7438cf12 100644
--- a/apps/app-frontend/src/pages/project/Versions.vue
+++ b/apps/app-frontend/src/pages/project/Versions.vue
@@ -9,10 +9,18 @@
 			:version-link="(version) => buildProjectHref(`/project/${project.id}/version/${version.id}`)"
 		>
 			<template #actions="{ version }">
-				<ButtonStyled circular type="transparent" color="green">
+				<ButtonStyled
+					circular
+					type="transparent"
+					:color="installed && version.id === installedVersion ? 'standard' : 'green'"
+				>
 					<button
 						v-tooltip="
-							!installed ? 'Install' : version.id !== installedVersion ? 'Swap version' : ''
+							!installed
+								? formatMessage(commonMessages.installButton)
+								: version.id !== installedVersion
+									? formatMessage(commonMessages.switchToVersionButton)
+									: formatMessage(messages.alreadyInstalled)
 						"
 						:disabled="installing || (installed && version.id === installedVersion)"
 						@click.stop="() => install(version.id)"
@@ -45,11 +53,13 @@
 							<DownloadIcon aria-hidden="true" />
 							Add to another instance
 						</template>
-						<template #open-in-browser> <ExternalIcon /> Open in browser </template>
+						<template #open-in-browser>
+							<ExternalIcon /> {{ formatMessage(commonMessages.openInBrowserButton) }}
+						</template>
 					</OverflowMenu>
 					<a
 						v-else
-						v-tooltip="`Open in browser`"
+						v-tooltip="formatMessage(commonMessages.openInBrowserButton)"
 						:href="`https://modrinth.com/${project.project_type}/${project.slug}/version/${version.id}`"
 						target="_blank"
 					>
@@ -65,9 +75,12 @@
 import { CheckIcon, DownloadIcon, ExternalIcon, MoreVerticalIcon } from '@modrinth/assets'
 import {
 	ButtonStyled,
+	commonMessages,
+	defineMessages,
 	injectNotificationManager,
 	OverflowMenu,
 	ProjectPageVersions,
+	useVIntl,
 } from '@modrinth/ui'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
@@ -76,8 +89,16 @@ import { SwapIcon } from '@/assets/icons/index.js'
 import { get_game_versions, get_loaders } from '@/helpers/tags.js'
 import { useTheming } from '@/store/theme.ts'
 
+const { formatMessage } = useVIntl()
 const themeStore = useTheming()
 
+const messages = defineMessages({
+	alreadyInstalled: {
+		id: 'app.project.versions.already-installed',
+		defaultMessage: 'Already installed',
+	},
+})
+
 defineProps({
 	project: {
 		type: Object,
diff --git a/apps/app-frontend/src/store/theme.ts b/apps/app-frontend/src/store/theme.ts
index 09d7f5189b..7c0d1624e3 100644
--- a/apps/app-frontend/src/store/theme.ts
+++ b/apps/app-frontend/src/store/theme.ts
@@ -16,6 +16,7 @@ export const DEFAULT_FEATURE_FLAGS = {
 	pride_fundraiser: true,
 	i18n_debug: false,
 	show_instance_play_time: true,
+	advanced_filters_collapsed: true,
 }
 
 export const THEME_OPTIONS = ['dark', 'light', 'oled', 'system'] as const
diff --git a/apps/app/build.rs b/apps/app/build.rs
index cda15ffcdf..3bc241475d 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -276,6 +276,8 @@ fn main() {
                         "hide_ads_window",
                         "scroll_ads_window",
                         "show_ads_window",
+                        "show_ads_consent_overlay",
+                        "hide_ads_consent_overlay",
                         "record_ads_click",
                         "open_link",
                         "get_ads_personalization",
diff --git a/apps/app/src/api/ads-init.js b/apps/app/src/api/ads-init.js
index bd4582729c..b8f95bdd46 100644
--- a/apps/app/src/api/ads-init.js
+++ b/apps/app/src/api/ads-init.js
@@ -1,14 +1,16 @@
+const MODRINTH_ORIGIN = 'https://modrinth.com'
+
 document.addEventListener(
 	'click',
 	function (e) {
-		window.top.postMessage({ modrinthAdClick: true }, 'https://modrinth.com')
+		window.top.postMessage({ modrinthAdClick: true }, MODRINTH_ORIGIN)
 
 		let target = e.target
 		while (target != null) {
 			if (target.matches('a')) {
 				e.preventDefault()
 				if (target.href) {
-					window.top.postMessage({ modrinthOpenUrl: target.href }, 'https://modrinth.com')
+					window.top.postMessage({ modrinthOpenUrl: target.href }, MODRINTH_ORIGIN)
 				}
 				break
 			}
@@ -19,7 +21,93 @@ document.addEventListener(
 )
 
 window.open = (url, target, features) => {
-	window.top.postMessage({ modrinthOpenUrl: url }, 'https://modrinth.com')
+	window.top.postMessage({ modrinthOpenUrl: url }, MODRINTH_ORIGIN)
+}
+
+let modrinthAdsConsentOverlayShown = false
+let modrinthTcfListenerInstalled = false
+let modrinthTcfListenerAttempts = 0
+
+function installAdsConsentOverlayStyle() {
+	if (document.getElementById('modrinth-ads-consent-overlay-style')) {
+		return
+	}
+	const style = document.createElement('style')
+	style.id = 'modrinth-ads-consent-overlay-style'
+	style.textContent = `
+		html.modrinth-ads-consent-overlay #modrinth-rail-1 {
+			visibility: hidden !important;
+		}
+	`
+	document.documentElement.appendChild(style)
+}
+
+function getTauriInvoke() {
+	return window.__TAURI__?.core?.invoke ?? window.__TAURI_INTERNALS__?.invoke
+}
+
+function invokeAdsConsentOverlayCommand(shown) {
+	const invoke = getTauriInvoke()
+
+	if (typeof invoke !== 'function') {
+		return
+	}
+
+	const command = shown ? 'show_ads_consent_overlay' : 'hide_ads_consent_overlay'
+	const args = shown ? {} : { dpr: window.devicePixelRatio }
+
+	invoke(`plugin:ads|${command}`, args).catch(() => {})
+}
+
+function setAdsConsentOverlay(shown) {
+	if (modrinthAdsConsentOverlayShown === shown) return
+
+	modrinthAdsConsentOverlayShown = shown
+	installAdsConsentOverlayStyle()
+	document.documentElement.classList.toggle('modrinth-ads-consent-overlay', shown)
+
+	if (window.top === window) {
+		invokeAdsConsentOverlayCommand(shown)
+	} else {
+		window.top.postMessage({ modrinthAdsConsentOverlay: shown }, MODRINTH_ORIGIN)
+	}
+}
+
+if (window.top === window) {
+	window.addEventListener('message', (event) => {
+		if (
+			event.origin === MODRINTH_ORIGIN &&
+			typeof event.data?.modrinthAdsConsentOverlay === 'boolean'
+		) {
+			setAdsConsentOverlay(event.data.modrinthAdsConsentOverlay)
+		}
+	})
+}
+
+function handleTcfConsentEvent(tcData, success) {
+	if (!success || !tcData) return
+
+	if (tcData.eventStatus === 'cmpuishown') {
+		setAdsConsentOverlay(true)
+	} else if (tcData.eventStatus === 'useractioncomplete' || tcData.eventStatus === 'tcloaded') {
+		setAdsConsentOverlay(false)
+	}
+}
+
+// polling to install listener on tcf api
+function installTcfConsentListener() {
+	if (modrinthTcfListenerInstalled) return
+
+	if (typeof window.__tcfapi === 'function') {
+		modrinthTcfListenerInstalled = true
+		window.__tcfapi('addEventListener', 2, handleTcfConsentEvent)
+		return
+	}
+
+	if (modrinthTcfListenerAttempts < 60) {
+		modrinthTcfListenerAttempts += 1
+		setTimeout(installTcfConsentListener, 500)
+	}
 }
 
 function muteAudioContext() {
@@ -100,7 +188,10 @@ function muteVideos() {
 document.addEventListener('DOMContentLoaded', () => {
 	muteVideos()
 	muteAudioContext()
+	installTcfConsentListener()
 
 	const observer = new MutationObserver(muteVideos)
 	observer.observe(document.body, { childList: true, subtree: true })
 })
+
+installTcfConsentListener()
diff --git a/apps/app/src/api/ads.rs b/apps/app/src/api/ads.rs
index 3e23c5275e..ba06283d0b 100644
--- a/apps/app/src/api/ads.rs
+++ b/apps/app/src/api/ads.rs
@@ -11,12 +11,14 @@ use tokio::sync::RwLock;
 pub struct AdsState {
     pub shown: bool,
     pub modal_shown: bool,
+    pub consent_overlay_shown: bool,
     pub occluded: bool,
     pub last_click: Option<Instant>,
     pub malicious_origins: HashSet<String>,
 }
 
 const AD_LINK: &str = "https://modrinth.com/wrapper/app-ads-cookie";
+const APP_TITLE_BAR_HEIGHT: f32 = 48.0;
 #[cfg(any(windows, target_os = "macos"))]
 pub(super) const OCCLUDED_AREA_THRESHOLD: f64 = 0.5;
 #[cfg(not(target_os = "linux"))]
@@ -131,13 +133,16 @@ fn set_webview_visible_for_window<R: Runtime>(
         .and_then(|window| window.is_minimized().ok())
         .unwrap_or(false);
 
-    let is_occluded = app
+    let (is_occluded, consent_overlay_shown) = app
         .state::<RwLock<AdsState>>()
         .try_read()
-        .map(|state| state.occluded)
-        .unwrap_or(false);
+        .map(|state| (state.occluded, state.consent_overlay_shown))
+        .unwrap_or((false, false));
 
-    set_webview_visible(webview, visible && !is_minimized && !is_occluded);
+    set_webview_visible(
+        webview,
+        visible && !is_minimized && (!is_occluded || consent_overlay_shown),
+    );
 }
 
 #[cfg(any(windows, target_os = "macos"))]
@@ -195,7 +200,8 @@ async fn sync_ads_occlusion<R: Runtime>(app: &tauri::AppHandle<R>) {
     }
 
     state.occluded = occluded;
-    let visible = state.shown && !state.modal_shown;
+    let visible =
+        state.shown && (!state.modal_shown || state.consent_overlay_shown);
     drop(state);
 
     if let Some(webview) = app.webviews().get("ads-window") {
@@ -211,21 +217,36 @@ fn sync_webview_visibility_for_main_window<R: Runtime>(
     let is_minimized = main_window.is_minimized().unwrap_or(false);
     let was = was_minimized.load(Ordering::SeqCst);
 
+    let ads_state = if is_minimized {
+        None
+    } else {
+        match app.state::<RwLock<AdsState>>().try_read() {
+            Ok(state) => Some((
+                state.shown
+                    && (!state.modal_shown || state.consent_overlay_shown)
+                    && (!state.occluded || state.consent_overlay_shown),
+                state.consent_overlay_shown,
+            )),
+            Err(_) => None,
+        }
+    };
+    let ads_visible = ads_state.map(|state| state.0).unwrap_or(false);
+
+    if ads_state.map(|state| state.1).unwrap_or(false)
+        && let Some(webview) = app.webviews().get("ads-window")
+        && let Ok((position, size)) =
+            get_overlay_webview_position_for_window(main_window)
+    {
+        webview.set_position(position).ok();
+        webview.set_size(size).ok();
+    }
+
     if is_minimized == was {
         return;
     }
 
     was_minimized.store(is_minimized, Ordering::SeqCst);
 
-    let ads_visible = if is_minimized {
-        false
-    } else {
-        match app.state::<RwLock<AdsState>>().try_read() {
-            Ok(state) => state.shown && !state.modal_shown && !state.occluded,
-            Err(_) => false,
-        }
-    };
-
     let mut webviews = Vec::new();
     let mut seen_webviews = HashSet::new();
 
@@ -254,6 +275,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
             app.manage(RwLock::new(AdsState {
                 shown: true,
                 modal_shown: false,
+                consent_overlay_shown: false,
                 occluded: false,
                 last_click: None,
                 malicious_origins: HashSet::new(),
@@ -269,7 +291,10 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
                         .state::<RwLock<AdsState>>()
                         .try_read()
                         .map(|state| {
-                            state.shown && !state.modal_shown && !state.occluded
+                            state.shown
+                                && !state.modal_shown
+                                && !state.consent_overlay_shown
+                                && !state.occluded
                         })
                         .unwrap_or(false);
 
@@ -332,6 +357,8 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
             init_ads_window,
             hide_ads_window,
             show_ads_window,
+            show_ads_consent_overlay,
+            hide_ads_consent_overlay,
             record_ads_click,
             open_link,
             get_ads_personalization,
@@ -358,6 +385,42 @@ fn get_webview_position<R: Runtime>(
     ))
 }
 
+fn get_overlay_webview_position_for_window<R: Runtime>(
+    main_window: &tauri::Window<R>,
+) -> crate::api::Result<(PhysicalPosition<f32>, PhysicalSize<f32>)> {
+    let main_window_size = main_window.outer_size()?;
+    let title_bar_height =
+        APP_TITLE_BAR_HEIGHT * main_window.scale_factor()? as f32;
+
+    Ok((
+        PhysicalPosition::new(0.0, title_bar_height),
+        PhysicalSize::new(
+            main_window_size.width as f32,
+            (main_window_size.height as f32 - title_bar_height).max(0.0),
+        ),
+    ))
+}
+
+fn get_overlay_webview_position<R: Runtime>(
+    app: &tauri::AppHandle<R>,
+) -> crate::api::Result<(PhysicalPosition<f32>, PhysicalSize<f32>)> {
+    let main_window = app.get_window("main").unwrap();
+
+    get_overlay_webview_position_for_window(&main_window)
+}
+
+fn get_device_pixel_ratio<R: Runtime>(
+    app: &tauri::AppHandle<R>,
+    dpr: Option<f32>,
+) -> f32 {
+    dpr.unwrap_or_else(|| {
+        app.get_window("main")
+            .and_then(|window| window.scale_factor().ok())
+            .map(|scale_factor| scale_factor as f32)
+            .unwrap_or(1.0)
+    })
+}
+
 #[tauri::command]
 #[cfg(not(target_os = "linux"))]
 pub async fn init_ads_window<R: Runtime>(
@@ -374,11 +437,17 @@ pub async fn init_ads_window<R: Runtime>(
         state.shown = true;
     }
 
-    if state.modal_shown {
+    if state.modal_shown && !state.consent_overlay_shown {
         return Ok(());
     }
 
-    if let Ok((position, size)) = get_webview_position(&app, dpr) {
+    let layout = if state.consent_overlay_shown {
+        get_overlay_webview_position(&app)
+    } else {
+        get_webview_position(&app, dpr)
+    };
+
+    if let Ok((position, size)) = layout {
         let webview = if let Some(webview) = app.webviews().get("ads-window") {
             // set both the `hide`/`show` state and `position`,
             // to ensure that the webview is actually shown/hidden
@@ -586,7 +655,11 @@ pub async fn show_ads_window<R: Runtime>(
         state.modal_shown = false;
 
         if state.shown {
-            let (position, size) = get_webview_position(&app, dpr)?;
+            let (position, size) = if state.consent_overlay_shown {
+                get_overlay_webview_position(&app)?
+            } else {
+                get_webview_position(&app, dpr)?
+            };
             // set both the `hide`/`show` state and `position`,
             // to ensure that the webview is actually shown/hidden
             webview.set_size(size).ok();
@@ -610,8 +683,19 @@ pub async fn hide_ads_window<R: Runtime>(
 
         if reset.unwrap_or(false) {
             state.shown = false;
+            state.consent_overlay_shown = false;
         } else {
             state.modal_shown = true;
+
+            if state.consent_overlay_shown {
+                let (position, size) = get_overlay_webview_position(&app)?;
+                webview.set_size(size).ok();
+                webview.set_position(position).ok();
+                webview.show().ok();
+                set_webview_visible_for_window(&app, webview, true);
+
+                return Ok(());
+            }
         }
 
         // set both the `hide`/`show` state and `position`,
@@ -625,6 +709,61 @@ pub async fn hide_ads_window<R: Runtime>(
     Ok(())
 }
 
+#[tauri::command]
+pub async fn show_ads_consent_overlay<R: Runtime>(
+    app: tauri::AppHandle<R>,
+) -> crate::api::Result<()> {
+    if let Some(webview) = app.webviews().get("ads-window") {
+        let state = app.state::<RwLock<AdsState>>();
+        let mut state = state.write().await;
+
+        // dont show for hidden ads so consent events cannot re-enable the webview.
+        if !state.shown {
+            return Ok(());
+        }
+
+        state.consent_overlay_shown = true;
+
+        let (position, size) = get_overlay_webview_position(&app)?;
+        webview.set_size(size).ok();
+        webview.set_position(position).ok();
+        webview.show().ok();
+        set_webview_visible_for_window(&app, webview, true);
+    }
+
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn hide_ads_consent_overlay<R: Runtime>(
+    app: tauri::AppHandle<R>,
+    dpr: Option<f32>,
+) -> crate::api::Result<()> {
+    if let Some(webview) = app.webviews().get("ads-window") {
+        let state = app.state::<RwLock<AdsState>>();
+        let mut state = state.write().await;
+
+        state.consent_overlay_shown = false;
+
+        if state.shown && !state.modal_shown {
+            let dpr = get_device_pixel_ratio(&app, dpr);
+            let (position, size) = get_webview_position(&app, dpr)?;
+
+            webview.set_size(size).ok();
+            webview.set_position(position).ok();
+            webview.show().ok();
+            set_webview_visible_for_window(&app, webview, true);
+        } else {
+            webview
+                .set_position(PhysicalPosition::new(-1000, -1000))
+                .ok();
+            webview.hide().ok();
+        }
+    }
+
+    Ok(())
+}
+
 #[tauri::command]
 pub async fn record_ads_click<R: Runtime>(
     app: tauri::AppHandle<R>,
diff --git a/apps/daedalus_client/src/error.rs b/apps/daedalus_client/src/error.rs
index 6765341381..6afb321df4 100644
--- a/apps/daedalus_client/src/error.rs
+++ b/apps/daedalus_client/src/error.rs
@@ -27,6 +27,8 @@ pub enum ErrorKind {
         inner: Box<s3::error::S3Error>,
         file: String,
     },
+    #[error("I/O error: {0}")]
+    Io(#[from] std::io::Error),
     #[error("Error acquiring semaphore: {0}")]
     Acquire(#[from] tokio::sync::AcquireError),
     #[error("Tracing error: {0}")]
diff --git a/apps/daedalus_client/src/fabric.rs b/apps/daedalus_client/src/fabric.rs
index 3d6f1eeb0c..8d9362bb73 100644
--- a/apps/daedalus_client/src/fabric.rs
+++ b/apps/daedalus_client/src/fabric.rs
@@ -1,3 +1,19 @@
+//! Fetches Fabric-compatible loader metadata.
+//!
+//! Fabric and Quilt both expose loader profiles for a concrete Minecraft
+//! version, but Daedalus publishes templated profiles using
+//! `${modrinth.gameVersion}`. A group is a set of Minecraft versions whose
+//! upstream loader profiles have the same structure after the concrete
+//! Minecraft version is replaced with `${modrinth.gameVersion}`. Fabric uses
+//! one universal group, so its public profile paths stay as
+//! `versions/{loader}.json`. Quilt has more than one group: versions before
+//! 26.x include hashed/intermediary libraries, while 26.x versions do not. For
+//! Quilt, Daedalus writes one templated profile per group at
+//! `version-group/{group}/loader-version/{loader}`.
+
+use crate::metadata_groups::{
+    UNIVERSAL_METADATA_GROUP, metadata_group_for_game_version, metadata_groups,
+};
 use crate::util::{download_file, fetch_json, format_url};
 use crate::{
     Error, FetchResult, MirrorArtifact, UploadFile, insert_mirrored_artifact,
@@ -64,7 +80,112 @@ async fn fetch(
         &semaphore,
     )
     .await?;
+    let all_loader_versions = fabric_manifest.loader.clone();
+    let all_game_versions = fabric_manifest.game.clone();
+    let metadata_groups = metadata_groups(
+        mod_loader,
+        all_game_versions.iter().map(|x| x.version.as_str()),
+    );
 
+    if metadata_groups
+        .iter()
+        .any(|group| group.id != UNIVERSAL_METADATA_GROUP)
+    {
+        let loaders = all_loader_versions
+            .iter()
+            .filter(|x| !skip_versions.contains(&&*x.version))
+            .collect::<Vec<_>>();
+
+        let profile_requests = metadata_groups
+            .iter()
+            .flat_map(|group| {
+                loaders.iter().map(move |loader| ProfileRequest {
+                    group: group.id.to_string(),
+                    loader_profile_template_game_version: group
+                        .loader_profile_template_game_version
+                        .clone(),
+                    game_versions: group.game_versions.clone(),
+                    loader_version: loader.version.clone(),
+                    url: format!(
+                        "{}/versions/loader/{}/{}/profile/json",
+                        meta_url,
+                        group.loader_profile_template_game_version,
+                        loader.version
+                    ),
+                })
+            })
+            .collect::<Vec<_>>();
+
+        fetch_metadata_profiles(
+            mod_loader,
+            format_version,
+            maven_url,
+            profile_requests,
+            &upload_files,
+            &mirror_artifacts,
+            &semaphore,
+        )
+        .await?;
+
+        let version_groups = metadata_groups
+            .iter()
+            .map(|group| daedalus::modded::VersionGroup {
+                id: group.id.to_string(),
+                loaders: loaders
+                    .iter()
+                    .map(|loader| {
+                        let version_path = metadata_version_path(
+                            mod_loader,
+                            format_version,
+                            &loader.version,
+                            group.id,
+                        );
+
+                        daedalus::modded::LoaderVersion {
+                            id: loader.version.clone(),
+                            url: format_url(&version_path),
+                            stable: loader.stable,
+                        }
+                    })
+                    .collect(),
+            })
+            .collect();
+
+        let manifest = daedalus::modded::Manifest {
+            game_versions: all_game_versions
+                .into_iter()
+                .map(|game_version| {
+                    let group = metadata_group_for_game_version(
+                        &metadata_groups,
+                        mod_loader,
+                        &game_version.version,
+                    )
+                    .expect("game version should have a metadata group");
+
+                    daedalus::modded::Version {
+                        id: game_version.version.clone(),
+                        stable: game_version.stable,
+                        version_group: Some(group.id.to_string()),
+                        loaders: Vec::new(),
+                    }
+                })
+                .collect(),
+            version_groups,
+        };
+
+        upload_files.insert(
+            format!("{mod_loader}/v{format_version}/manifest.json"),
+            UploadFile {
+                file: bytes::Bytes::from(serde_json::to_vec(&manifest)?),
+                content_type: Some("application/json".to_string()),
+            },
+        );
+
+        return Ok(FetchResult {
+            upload_files,
+            mirror_artifacts,
+        });
+    }
     // We check Modrinth's manifest to find newly added loader versions,
     // intermediary/mapping artifacts, and game versions.
     let (
@@ -125,8 +246,6 @@ async fn fetch(
         )
     };
 
-    const DUMMY_GAME_VERSION: &str = "1.21";
-
     if !fetch_intermediary_versions.is_empty() {
         for x in &fetch_intermediary_versions {
             insert_mirrored_artifact(
@@ -140,94 +259,38 @@ async fn fetch(
     }
 
     if !fetch_fabric_versions.is_empty() {
-        let fabric_version_manifest_urls = fetch_fabric_versions
+        let universal_group = metadata_groups
             .iter()
-            .map(|x| {
-                format!(
+            .find(|group| group.id == UNIVERSAL_METADATA_GROUP)
+            .expect("fabric metadata should have a universal group");
+        let profile_requests = fetch_fabric_versions
+            .iter()
+            .map(|loader| ProfileRequest {
+                group: universal_group.id.to_string(),
+                loader_profile_template_game_version: universal_group
+                    .loader_profile_template_game_version
+                    .clone(),
+                game_versions: universal_group.game_versions.clone(),
+                loader_version: loader.version.clone(),
+                url: format!(
                     "{}/versions/loader/{}/{}/profile/json",
-                    meta_url, DUMMY_GAME_VERSION, x.version
-                )
+                    meta_url,
+                    universal_group.loader_profile_template_game_version,
+                    loader.version
+                ),
             })
             .collect::<Vec<_>>();
-        let fabric_version_manifests = futures::future::try_join_all(
-            fabric_version_manifest_urls
-                .iter()
-                .map(|x| download_file(x, None, &semaphore)),
+
+        fetch_metadata_profiles(
+            mod_loader,
+            format_version,
+            maven_url,
+            profile_requests,
+            &upload_files,
+            &mirror_artifacts,
+            &semaphore,
         )
-        .await?
-        .into_iter()
-        .map(|x| serde_json::from_slice(&x))
-        .collect::<Result<Vec<PartialVersionInfo>, serde_json::Error>>()?;
-
-        let patched_version_manifests = fabric_version_manifests
-            .into_iter()
-            .map(|mut version_info| {
-                for lib in &mut version_info.libraries {
-                    let new_name = lib
-                        .name
-                        .replace(DUMMY_GAME_VERSION, DUMMY_REPLACE_STRING);
-
-                    // Hard-code: This library is not present on fabric's maven, so we fetch it from MC libraries
-                    if &*lib.name == "net.minecraft:launchwrapper:1.12" {
-                        lib.url = Some(
-                            "https://libraries.minecraft.net/".to_string(),
-                        );
-                    }
-
-                    // If a library is not intermediary, we add it to mirror artifacts to be mirrored
-                    if lib.name == new_name {
-                        insert_mirrored_artifact(
-                            &new_name,
-                            None,
-                            vec![
-                                lib.url
-                                    .clone()
-                                    .unwrap_or_else(|| maven_url.to_string()),
-                            ],
-                            false,
-                            &mirror_artifacts,
-                        )?;
-                    } else {
-                        lib.name = new_name;
-                    }
-
-                    lib.url = Some(format_url("maven/"));
-                }
-
-                version_info.id = version_info
-                    .id
-                    .replace(DUMMY_GAME_VERSION, DUMMY_REPLACE_STRING);
-                version_info.inherits_from = version_info
-                    .inherits_from
-                    .replace(DUMMY_GAME_VERSION, DUMMY_REPLACE_STRING);
-
-                Ok(version_info)
-            })
-            .collect::<Result<Vec<_>, Error>>()?;
-        let serialized_version_manifests = patched_version_manifests
-            .iter()
-            .map(|x| serde_json::to_vec(x).map(bytes::Bytes::from))
-            .collect::<Result<Vec<_>, serde_json::Error>>()?;
-
-        serialized_version_manifests
-            .into_iter()
-            .enumerate()
-            .for_each(|(index, bytes)| {
-                let loader = fetch_fabric_versions[index];
-
-                let version_path = format!(
-                    "{mod_loader}/v{format_version}/versions/{}.json",
-                    loader.version
-                );
-
-                upload_files.insert(
-                    version_path,
-                    UploadFile {
-                        file: bytes,
-                        content_type: Some("application/json".to_string()),
-                    },
-                );
-            });
+        .await?;
     }
 
     if !fetch_fabric_versions.is_empty()
@@ -240,17 +303,20 @@ async fn fetch(
         let loader_versions = daedalus::modded::Version {
             id: DUMMY_REPLACE_STRING.to_string(),
             stable: true,
-            loaders: fabric_manifest
-                .loader
-                .into_iter()
+            version_group: None,
+            loaders: all_loader_versions
+                .iter()
+                .filter(|x| !skip_versions.contains(&&*x.version))
                 .map(|x| {
-                    let version_path = format!(
-                        "{mod_loader}/v{format_version}/versions/{}.json",
-                        x.version,
+                    let version_path = metadata_version_path(
+                        mod_loader,
+                        format_version,
+                        &x.version,
+                        UNIVERSAL_METADATA_GROUP,
                     );
 
                     daedalus::modded::LoaderVersion {
-                        id: x.version,
+                        id: x.version.clone(),
                         url: format_url(&version_path),
                         stable: x.stable,
                     }
@@ -260,14 +326,16 @@ async fn fetch(
 
         let manifest = daedalus::modded::Manifest {
             game_versions: std::iter::once(loader_versions)
-                .chain(fabric_manifest.game.into_iter().map(|x| {
+                .chain(all_game_versions.into_iter().map(|x| {
                     daedalus::modded::Version {
                         id: x.version,
                         stable: x.stable,
+                        version_group: None,
                         loaders: vec![],
                     }
                 }))
                 .collect(),
+            version_groups: Vec::new(),
         };
 
         upload_files.insert(
@@ -285,6 +353,145 @@ async fn fetch(
     })
 }
 
+struct ProfileRequest {
+    group: String,
+    loader_profile_template_game_version: String,
+    game_versions: Vec<String>,
+    loader_version: String,
+    url: String,
+}
+
+fn metadata_version_path(
+    mod_loader: &str,
+    format_version: usize,
+    loader_version: &str,
+    group: &str,
+) -> String {
+    if group == UNIVERSAL_METADATA_GROUP {
+        format!("{mod_loader}/v{format_version}/versions/{loader_version}.json")
+    } else {
+        format!(
+            "{mod_loader}/v{format_version}/version-group/{group}/loader-version/{loader_version}"
+        )
+    }
+}
+
+async fn fetch_metadata_profiles(
+    mod_loader: &str,
+    format_version: usize,
+    maven_url: &str,
+    profile_requests: Vec<ProfileRequest>,
+    upload_files: &DashMap<String, UploadFile>,
+    mirror_artifacts: &DashMap<String, MirrorArtifact>,
+    semaphore: &Arc<Semaphore>,
+) -> Result<(), Error> {
+    let version_manifests = futures::future::try_join_all(
+        profile_requests
+            .iter()
+            .map(|x| download_file(&x.url, None, semaphore)),
+    )
+    .await?
+    .into_iter()
+    .map(|x| serde_json::from_slice(&x))
+    .collect::<Result<Vec<PartialVersionInfo>, serde_json::Error>>()?;
+
+    let patched_version_manifests = version_manifests
+        .into_iter()
+        .zip(profile_requests.iter())
+        .map(|(mut version_info, request)| {
+            patch_version_info(
+                &mut version_info,
+                &request.loader_profile_template_game_version,
+                &request.game_versions,
+                maven_url,
+                mirror_artifacts,
+            )?;
+
+            Ok(version_info)
+        })
+        .collect::<Result<Vec<_>, Error>>()?;
+    let serialized_version_manifests = patched_version_manifests
+        .iter()
+        .map(|x| serde_json::to_vec(x).map(bytes::Bytes::from))
+        .collect::<Result<Vec<_>, serde_json::Error>>()?;
+
+    serialized_version_manifests
+        .into_iter()
+        .zip(profile_requests)
+        .for_each(|(bytes, request)| {
+            let version_path = metadata_version_path(
+                mod_loader,
+                format_version,
+                &request.loader_version,
+                &request.group,
+            );
+
+            upload_files.insert(
+                version_path,
+                UploadFile {
+                    file: bytes,
+                    content_type: Some("application/json".to_string()),
+                },
+            );
+        });
+
+    Ok(())
+}
+
+fn patch_version_info(
+    version_info: &mut PartialVersionInfo,
+    game_version: &str,
+    game_versions: &[String],
+    maven_url: &str,
+    mirror_artifacts: &DashMap<String, MirrorArtifact>,
+) -> Result<(), Error> {
+    for lib in &mut version_info.libraries {
+        let new_name = lib.name.replace(game_version, DUMMY_REPLACE_STRING);
+
+        // Hard-code: This library is not present on fabric's maven, so we fetch it from MC libraries
+        if &*lib.name == "net.minecraft:launchwrapper:1.12" {
+            lib.url = Some("https://libraries.minecraft.net/".to_string());
+        }
+        let source_url =
+            lib.url.clone().unwrap_or_else(|| maven_url.to_string());
+
+        if lib.name == new_name {
+            insert_mirrored_artifact(
+                &new_name,
+                None,
+                vec![source_url],
+                false,
+                mirror_artifacts,
+            )?;
+        } else {
+            for concrete_game_version in game_versions {
+                let concrete_name =
+                    lib.name.replace(game_version, concrete_game_version);
+
+                insert_mirrored_artifact(
+                    &concrete_name,
+                    None,
+                    vec![source_url.clone()],
+                    false,
+                    mirror_artifacts,
+                )?;
+            }
+
+            lib.name = new_name;
+        }
+
+        lib.url = Some(format_url("maven/"));
+    }
+
+    version_info.id =
+        version_info.id.replace(game_version, DUMMY_REPLACE_STRING);
+    version_info.inherits_from = version_info
+        .inherits_from
+        .replace(game_version, DUMMY_REPLACE_STRING);
+
+    Ok(())
+}
+
 #[derive(Deserialize, Debug, Clone)]
 struct FabricVersions {
     pub loader: Vec<FabricLoaderVersion>,
diff --git a/apps/daedalus_client/src/forge.rs b/apps/daedalus_client/src/forge.rs
index 3e9293281f..3ebdd6f428 100644
--- a/apps/daedalus_client/src/forge.rs
+++ b/apps/daedalus_client/src/forge.rs
@@ -12,7 +12,10 @@ use itertools::Itertools;
 use serde::Deserialize;
 use serde::de::DeserializeOwned;
 use std::collections::HashMap;
-use std::sync::Arc;
+use std::sync::{
+    Arc,
+    atomic::{AtomicUsize, Ordering},
+};
 use tokio::sync::Semaphore;
 
 #[tracing::instrument(skip(semaphore))]
@@ -243,12 +246,45 @@ async fn fetch(
     };
 
     if !fetch_versions.is_empty() {
-        let forge_installers = futures::future::try_join_all(
-            fetch_versions
-                .iter()
-                .map(|x| download_file(&x.installer_url, None, &semaphore)),
-        )
-        .await?;
+        let total_installers = fetch_versions.len();
+        let downloaded_installers = Arc::new(AtomicUsize::new(0));
+
+        tracing::info!(
+            mod_loader,
+            total_files = total_installers,
+            "Downloading loader installers"
+        );
+
+        let forge_installers =
+            futures::future::try_join_all(fetch_versions.iter().map(|x| {
+                let downloaded_installers = downloaded_installers.clone();
+                let semaphore = semaphore.clone();
+
+                async move {
+                    let installer =
+                        download_file(&x.installer_url, None, &semaphore)
+                            .await?;
+                    let downloaded = downloaded_installers
+                        .fetch_add(1, Ordering::Relaxed)
+                        + 1;
+
+                    if downloaded.is_multiple_of(100)
+                        || downloaded == total_installers
+                    {
+                        tracing::info!(
+                            mod_loader,
+                            downloaded_files = downloaded,
+                            remaining_files =
+                                total_installers.saturating_sub(downloaded),
+                            total_files = total_installers,
+                            "Downloaded loader installers"
+                        );
+                    }
+
+                    Ok::<_, Error>(installer)
+                }
+            }))
+            .await?;
 
         #[tracing::instrument(skip(raw, upload_files, mirror_artifacts))]
         async fn read_forge_installer(
@@ -761,21 +797,23 @@ async fn fetch(
                 .into_iter()
                 .map(|(game_version, loaders)| {
                     daedalus::modded::Version {
-                    id: game_version,
-                    stable: true,
-                    loaders: loaders
-                        .map(|x| daedalus::modded::LoaderVersion {
-                            url: format_url(&format!(
-                        "{mod_loader}/v{format_version}/versions/{}.json",
-                        x.loader_version
-                    )),
-                            id: x.loader_version,
-                            stable: false,
-                        })
-                        .collect(),
-                }
+                        id: game_version,
+                        stable: true,
+                        version_group: None,
+                        loaders: loaders
+                            .map(|x| daedalus::modded::LoaderVersion {
+                                url: format_url(&format!(
+                                    "{mod_loader}/v{format_version}/versions/{}.json",
+                                    x.loader_version
+                                )),
+                                id: x.loader_version,
+                                stable: false,
+                            })
+                            .collect(),
+                    }
                 })
                 .collect(),
+            version_groups: Vec::new(),
         };
 
         upload_files.insert(
diff --git a/apps/daedalus_client/src/main.rs b/apps/daedalus_client/src/main.rs
index 8b132a0c11..f9bda189ee 100644
--- a/apps/daedalus_client/src/main.rs
+++ b/apps/daedalus_client/src/main.rs
@@ -1,10 +1,14 @@
 use crate::util::{
     REQWEST_CLIENT, format_url, upload_file_to_bucket,
-    upload_url_to_bucket_mirrors,
+    upload_url_to_bucket_mirrors, write_file_to_local_output,
+    write_url_to_local_output_mirrors,
 };
 use daedalus::get_path_from_artifact;
 use dashmap::{DashMap, DashSet};
-use std::sync::Arc;
+use std::sync::{
+    Arc,
+    atomic::{AtomicUsize, Ordering},
+};
 use tokio::sync::Semaphore;
 use tracing_error::ErrorLayer;
 use tracing_subscriber::{EnvFilter, fmt, prelude::*};
@@ -12,6 +16,7 @@ use tracing_subscriber::{EnvFilter, fmt, prelude::*};
 mod error;
 mod fabric;
 mod forge;
+mod metadata_groups;
 mod minecraft;
 pub mod util;
 
@@ -44,51 +49,92 @@ async fn main() -> Result<()> {
     ));
 
     let mut fetch_result = FetchResult::default();
+    let only_loader = dotenvy::var("DAEDALUS_ONLY").ok();
 
-    match minecraft::fetch(semaphore.clone()).await {
-        Ok(fetched) => merge_fetch_result(&mut fetch_result, fetched),
-        Err(err) => tracing::warn!(error = %err, "Minecraft fetch failed"),
+    if should_fetch(only_loader.as_deref(), "minecraft") {
+        match minecraft::fetch(semaphore.clone()).await {
+            Ok(fetched) => merge_fetch_result(&mut fetch_result, fetched),
+            Err(err) => tracing::warn!(error = %err, "Minecraft fetch failed"),
+        }
     }
 
-    match fabric::fetch_fabric(semaphore.clone()).await {
-        Ok(fetched) => merge_fetch_result(&mut fetch_result, fetched),
-        Err(err) => tracing::warn!(error = %err, "Fabric fetch failed"),
+    if should_fetch(only_loader.as_deref(), "fabric") {
+        match fabric::fetch_fabric(semaphore.clone()).await {
+            Ok(fetched) => merge_fetch_result(&mut fetch_result, fetched),
+            Err(err) => tracing::warn!(error = %err, "Fabric fetch failed"),
+        }
     }
 
-    match fabric::fetch_quilt(semaphore.clone()).await {
-        Ok(fetched) => merge_fetch_result(&mut fetch_result, fetched),
-        Err(err) => tracing::warn!(error = %err, "Quilt fetch failed"),
+    if should_fetch(only_loader.as_deref(), "quilt") {
+        match fabric::fetch_quilt(semaphore.clone()).await {
+            Ok(fetched) => merge_fetch_result(&mut fetch_result, fetched),
+            Err(err) => tracing::warn!(error = %err, "Quilt fetch failed"),
+        }
     }
 
-    match forge::fetch_neo(semaphore.clone()).await {
-        Ok(fetched) => merge_fetch_result(&mut fetch_result, fetched),
-        Err(err) => tracing::warn!(error = %err, "NeoForge fetch failed"),
+    if should_fetch(only_loader.as_deref(), "neo") {
+        match forge::fetch_neo(semaphore.clone()).await {
+            Ok(fetched) => merge_fetch_result(&mut fetch_result, fetched),
+            Err(err) => tracing::warn!(error = %err, "NeoForge fetch failed"),
+        }
     }
 
-    match forge::fetch_forge(semaphore.clone()).await {
-        Ok(fetched) => merge_fetch_result(&mut fetch_result, fetched),
-        Err(err) => tracing::warn!(error = %err, "Forge fetch failed"),
+    if should_fetch(only_loader.as_deref(), "forge") {
+        match forge::fetch_forge(semaphore.clone()).await {
+            Ok(fetched) => merge_fetch_result(&mut fetch_result, fetched),
+            Err(err) => tracing::warn!(error = %err, "Forge fetch failed"),
+        }
     }
 
     let FetchResult {
         upload_files,
         mirror_artifacts,
     } = fetch_result;
+    let upload_file_total = upload_files.len();
+    let mirror_file_total = mirror_artifacts.len();
 
-    futures::future::try_join_all(upload_files.iter().map(|entry| {
-        upload_file_to_bucket(
-            entry.key().clone(),
-            entry.value().file.clone(),
-            entry.value().content_type.clone(),
-            &semaphore,
-        )
-    }))
-    .await?;
+    if dotenvy::var("LOCAL_OUTPUT_DIR").is_ok() {
+        let written_files = Arc::new(AtomicUsize::new(0));
 
-    futures::future::try_join_all(mirror_artifacts.iter().map(|entry| {
-        upload_url_to_bucket_mirrors(
-            format!("maven/{}", entry.key()),
-            entry
+        tracing::info!(
+            total_files = upload_file_total,
+            "Writing local metadata files"
+        );
+
+        futures::future::try_join_all(upload_files.iter().map(|entry| {
+            let path = entry.key().clone();
+            let file = entry.value().file.clone();
+            let written_files = written_files.clone();
+
+            async move {
+                write_file_to_local_output(&path, file).await?;
+                let written = written_files.fetch_add(1, Ordering::Relaxed) + 1;
+
+                if written.is_multiple_of(100) || written == upload_file_total {
+                    tracing::info!(
+                        written_files = written,
+                        remaining_files =
+                            upload_file_total.saturating_sub(written),
+                        total_files = upload_file_total,
+                        "Wrote local metadata files"
+                    );
+                }
+
+                Ok::<_, Error>(())
+            }
+        }))
+        .await?;
+
+        let written_mirror_files = Arc::new(AtomicUsize::new(0));
+
+        tracing::info!(
+            total_files = mirror_file_total,
+            "Writing local mirror files"
+        );
+
+        futures::future::try_join_all(mirror_artifacts.iter().map(|entry| {
+            let path = format!("maven/{}", entry.key());
+            let mirrors = entry
                 .value()
                 .mirrors
                 .iter()
@@ -99,12 +145,117 @@ async fn main() -> Result<()> {
                         format!("{}{}", mirror.path, entry.key())
                     }
                 })
-                .collect(),
-            entry.value().sha1.clone(),
-            &semaphore,
-        )
-    }))
-    .await?;
+                .collect();
+            let sha1 = entry.value().sha1.clone();
+            let written_mirror_files = written_mirror_files.clone();
+            let semaphore = semaphore.clone();
+
+            async move {
+                write_url_to_local_output_mirrors(
+                    path, mirrors, sha1, &semaphore,
+                )
+                .await?;
+                let written =
+                    written_mirror_files.fetch_add(1, Ordering::Relaxed) + 1;
+
+                if written.is_multiple_of(100) || written == mirror_file_total {
+                    tracing::info!(
+                        written_files = written,
+                        remaining_files =
+                            mirror_file_total.saturating_sub(written),
+                        total_files = mirror_file_total,
+                        "Wrote local mirror files"
+                    );
+                }
+
+                Ok::<_, Error>(())
+            }
+        }))
+        .await?;
+    } else {
+        let uploaded_files = Arc::new(AtomicUsize::new(0));
+
+        tracing::info!(
+            total_files = upload_file_total,
+            "Uploading metadata files"
+        );
+
+        futures::future::try_join_all(upload_files.iter().map(|entry| {
+            let path = entry.key().clone();
+            let file = entry.value().file.clone();
+            let content_type = entry.value().content_type.clone();
+            let uploaded_files = uploaded_files.clone();
+            let semaphore = semaphore.clone();
+
+            async move {
+                upload_file_to_bucket(path, file, content_type, &semaphore)
+                    .await?;
+                let uploaded =
+                    uploaded_files.fetch_add(1, Ordering::Relaxed) + 1;
+
+                if uploaded.is_multiple_of(100) || uploaded == upload_file_total
+                {
+                    tracing::info!(
+                        uploaded_files = uploaded,
+                        remaining_files =
+                            upload_file_total.saturating_sub(uploaded),
+                        total_files = upload_file_total,
+                        "Uploaded metadata files"
+                    );
+                }
+
+                Ok::<_, Error>(())
+            }
+        }))
+        .await?;
+
+        let uploaded_mirror_files = Arc::new(AtomicUsize::new(0));
+
+        tracing::info!(
+            total_files = mirror_file_total,
+            "Uploading mirror files"
+        );
+
+        futures::future::try_join_all(mirror_artifacts.iter().map(|entry| {
+            let path = format!("maven/{}", entry.key());
+            let mirrors = entry
+                .value()
+                .mirrors
+                .iter()
+                .map(|mirror| {
+                    if mirror.entire_url {
+                        mirror.path.clone()
+                    } else {
+                        format!("{}{}", mirror.path, entry.key())
+                    }
+                })
+                .collect();
+            let sha1 = entry.value().sha1.clone();
+            let uploaded_mirror_files = uploaded_mirror_files.clone();
+            let semaphore = semaphore.clone();
+
+            async move {
+                upload_url_to_bucket_mirrors(path, mirrors, sha1, &semaphore)
+                    .await?;
+                let uploaded =
+                    uploaded_mirror_files.fetch_add(1, Ordering::Relaxed) + 1;
+
+                if uploaded.is_multiple_of(100) || uploaded == mirror_file_total
+                {
+                    tracing::info!(
+                        uploaded_files = uploaded,
+                        remaining_files =
+                            mirror_file_total.saturating_sub(uploaded),
+                        total_files = mirror_file_total,
+                        "Uploaded mirror files"
+                    );
+                }
+
+                Ok::<_, Error>(())
+            }
+        }))
+        .await?;
+    }
 
     if dotenvy::var("CLOUDFLARE_INTEGRATION")
         .ok()
@@ -151,6 +302,20 @@ async fn main() -> Result<()> {
     Ok(())
 }
 
+fn should_fetch(only_loader: Option<&str>, loader: &str) -> bool {
+    let Some(only_loader) = only_loader else {
+        return true;
+    };
+
+    only_loader.split(',').any(|entry| {
+        let entry = entry.trim();
+
+        entry.eq_ignore_ascii_case("all")
+            || entry.eq_ignore_ascii_case(loader)
+            || (loader == "neo" && entry.eq_ignore_ascii_case("neoforge"))
+    })
+}
+
 pub struct UploadFile {
     file: bytes::Bytes,
     content_type: Option<String>,
@@ -248,11 +413,13 @@ fn check_env_vars() -> bool {
 
     failed |= check_var::<String>("BASE_URL");
 
-    failed |= check_var::<String>("S3_ACCESS_TOKEN");
-    failed |= check_var::<String>("S3_SECRET");
-    failed |= check_var::<String>("S3_URL");
-    failed |= check_var::<String>("S3_REGION");
-    failed |= check_var::<String>("S3_BUCKET_NAME");
+    if dotenvy::var("LOCAL_OUTPUT_DIR").is_err() {
+        failed |= check_var::<String>("S3_ACCESS_TOKEN");
+        failed |= check_var::<String>("S3_SECRET");
+        failed |= check_var::<String>("S3_URL");
+        failed |= check_var::<String>("S3_REGION");
+        failed |= check_var::<String>("S3_BUCKET_NAME");
+    }
 
     if dotenvy::var("CLOUDFLARE_INTEGRATION")
         .ok()
diff --git a/apps/daedalus_client/src/metadata_groups.rs b/apps/daedalus_client/src/metadata_groups.rs
new file mode 100644
index 0000000000..45b2c01b59
--- /dev/null
+++ b/apps/daedalus_client/src/metadata_groups.rs
@@ -0,0 +1,145 @@
+//! Determines how version info is generated for pairs of game and loader
+//! versions.
+//!
+//! When a user installs a version of the game, they install two things: the
+//! game (of some specific version), and a loader (of some other specific
+//! version). Each combination of game and loader version requires a specific
+//! configuration, like a specific set of libraries that must be downloaded and
+//! run along with the game. However, some versions of the game or loader may
+//! change configuration requirements without the other version being affected.
+//! For example, pre-26.x game versions with Quilt require the Quilt `hashed`
+//! libraries to also be downloaded. However, 26.x and later don't require the
+//! `hashed` libraries, and don't even have a download for them. The problem is
+//! that Quilt loader 0.30.0 can be used for both pre-26.x and 26.x - but our v0
+//! manifest files can't differentiate the two. The result is that you either
+//! break compatibility for 0.30.0 game versions pre-26.x, or break 0.30.0
+//! on 26.x and later.
+//!
+//! To fix this, v1 introduces the concept of *version groups*: game versions
+//! before 26.x are version group v1, and 26.x and later are v2. Then, we
+//! parameterize our version info on both version group and loader version,
+//! letting us specify the right configuration based on both game version and
+//! loader version.
+//!
+//! Why not parameterize on game version and loader version directly? Most game
+//! versions have the same configuration as their surrounding game versions, so
+//! we'd end up with many duplicate configurations: the number of game versions
+//! multiplied by the number of loader versions.
+//!
+//! This file lets you configure what game versions are grouped together.
+//!
+//! Each version group is templated from a specific game version - e.g. game
+//! version 1.21 is used as the template file for 1.20, 1.19, etc.
+
+pub const UNIVERSAL_METADATA_GROUP: &str = "universal";
+pub const QUILT_LEGACY_METADATA_GROUP: &str = "v1";
+pub const QUILT_MODERN_METADATA_GROUP: &str = "v2";
+
+pub struct MetadataGroup {
+    pub id: &'static str,
+    /// Minecraft version used to fetch and template this group's loader profiles.
+    pub loader_profile_template_game_version: String,
+    pub game_versions: Vec<String>,
+}
+
+pub fn metadata_groups<'a>(
+    mod_loader: &str,
+    game_versions: impl IntoIterator<Item = &'a str>,
+) -> Vec<MetadataGroup> {
+    // Non-Quilt loaders don't need the concept of version groups, so we just
+    // make one "universal" group, and template it on 1.21.
+    if mod_loader != "quilt" {
+        return vec![MetadataGroup {
+            id: UNIVERSAL_METADATA_GROUP,
+            loader_profile_template_game_version: "1.21".to_string(),
+            game_versions: game_versions
+                .into_iter()
+                .map(|x| x.to_string())
+                .collect(),
+        }];
+    }
+
+    let game_versions = game_versions.into_iter().collect::<Vec<_>>();
+    let legacy_game_versions = game_versions
+        .iter()
+        .copied()
+        .filter(|game_version| {
+            metadata_group_id_for_game_version(mod_loader, game_version)
+                == QUILT_LEGACY_METADATA_GROUP
+        })
+        .collect::<Vec<_>>();
+    let modern_game_versions = game_versions
+        .iter()
+        .copied()
+        .filter(|game_version| {
+            metadata_group_id_for_game_version(mod_loader, game_version)
+                == QUILT_MODERN_METADATA_GROUP
+        })
+        .collect::<Vec<_>>();
+
+    let mut groups = Vec::new();
+
+    if !legacy_game_versions.is_empty() {
+        groups.push(MetadataGroup {
+            id: QUILT_LEGACY_METADATA_GROUP,
+            loader_profile_template_game_version: legacy_game_versions
+                .iter()
+                .find(|x| **x == "1.21")
+                .copied()
+                .unwrap_or(legacy_game_versions[0])
+                .to_string(),
+            game_versions: legacy_game_versions
+                .iter()
+                .map(|x| x.to_string())
+                .collect(),
+        });
+    }
+
+    if !modern_game_versions.is_empty() {
+        groups.push(MetadataGroup {
+            id: QUILT_MODERN_METADATA_GROUP,
+            loader_profile_template_game_version: modern_game_versions[0]
+                .to_string(),
+            game_versions: modern_game_versions
+                .iter()
+                .map(|x| x.to_string())
+                .collect(),
+        });
+    }
+
+    groups
+}
+
+pub fn metadata_group_for_game_version<'a>(
+    groups: &'a [MetadataGroup],
+    mod_loader: &str,
+    game_version: &str,
+) -> Option<&'a MetadataGroup> {
+    let group_id = metadata_group_id_for_game_version(mod_loader, game_version);
+
+    groups.iter().find(|group| group.id == group_id)
+}
+
+fn metadata_group_id_for_game_version(
+    mod_loader: &str,
+    game_version: &str,
+) -> &'static str {
+    if mod_loader == "quilt" && is_modern_quilt_game_version(game_version) {
+        QUILT_MODERN_METADATA_GROUP
+    } else if mod_loader == "quilt" {
+        QUILT_LEGACY_METADATA_GROUP
+    } else {
+        UNIVERSAL_METADATA_GROUP
+    }
+}
+
+// Update these Quilt group boundaries if upstream loader profiles gain another
+// structural incompatibility between Minecraft versions.
+fn is_modern_quilt_game_version(game_version: &str) -> bool {
+    let major = game_version
+        .split(['.', 'w'])
+        .next()
+        .and_then(|x| x.parse::<usize>().ok());
+
+    major.is_some_and(|x| x >= 26)
+}
diff --git a/apps/daedalus_client/src/util.rs b/apps/daedalus_client/src/util.rs
index 6d331d839e..0303e02bde 100644
--- a/apps/daedalus_client/src/util.rs
+++ b/apps/daedalus_client/src/util.rs
@@ -3,7 +3,11 @@ use bytes::Bytes;
 use s3::creds::Credentials;
 use s3::{Bucket, Region};
 use serde::de::DeserializeOwned;
-use std::sync::{Arc, LazyLock};
+use std::path::PathBuf;
+use std::sync::{
+    Arc, LazyLock,
+    atomic::{AtomicUsize, Ordering},
+};
 use tokio::sync::Semaphore;
 
 static BUCKET: LazyLock<Bucket> = LazyLock::new(|| {
@@ -55,6 +59,8 @@ pub static REQWEST_CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| {
         .unwrap()
 });
 
+static DOWNLOADED_FILE_COUNT: AtomicUsize = AtomicUsize::new(0);
+
 #[tracing::instrument(skip(bytes, semaphore))]
 pub async fn upload_file_to_bucket(
     path: String,
@@ -135,6 +141,74 @@ pub async fn upload_url_to_bucket(
     Ok(())
 }
 
+pub async fn write_file_to_local_output(
+    path: &str,
+    bytes: Bytes,
+) -> Result<(), Error> {
+    let output_path = local_output_path(path)?;
+
+    if let Some(parent) = output_path.parent() {
+        tokio::fs::create_dir_all(parent).await?;
+    }
+
+    tokio::fs::write(output_path, bytes).await?;
+
+    Ok(())
+}
+
+pub async fn write_url_to_local_output_mirrors(
+    output_path: String,
+    mirrors: Vec<String>,
+    sha1: Option<String>,
+    semaphore: &Arc<Semaphore>,
+) -> Result<(), Error> {
+    if mirrors.is_empty() {
+        return Err(ErrorKind::InvalidInput(
+            "No mirrors provided!".to_string(),
+        )
+        .into());
+    }
+
+    for (index, mirror) in mirrors.iter().enumerate() {
+        let result = write_url_to_local_output(
+            output_path.clone(),
+            mirror.clone(),
+            sha1.clone(),
+            semaphore,
+        )
+        .await;
+
+        if result.is_ok() || (result.is_err() && index == (mirrors.len() - 1)) {
+            return result;
+        }
+    }
+
+    unreachable!()
+}
+
+async fn write_url_to_local_output(
+    path: String,
+    url: String,
+    sha1: Option<String>,
+    semaphore: &Arc<Semaphore>,
+) -> Result<(), Error> {
+    let data = download_file(&url, sha1.as_deref(), semaphore).await?;
+
+    write_file_to_local_output(&path, data).await?;
+
+    Ok(())
+}
+
+fn local_output_path(path: &str) -> Result<PathBuf, Error> {
+    let output_dir = dotenvy::var("LOCAL_OUTPUT_DIR").map_err(|_| {
+        ErrorKind::InvalidInput(
+            "LOCAL_OUTPUT_DIR is required for local output".to_string(),
+        )
+    })?;
+
+    Ok(PathBuf::from(output_dir).join(path))
+}
+
 #[tracing::instrument(skip(bytes))]
 pub async fn sha1_async(bytes: Bytes) -> Result<String, Error> {
     let hash = tokio::task::spawn_blocking(move || {
@@ -182,6 +256,16 @@ pub async fn download_file(
                         }
                     }
 
+                    let downloaded = DOWNLOADED_FILE_COUNT
+                        .fetch_add(1, Ordering::Relaxed)
+                        + 1;
+                    if downloaded.is_multiple_of(100) {
+                        tracing::info!(
+                            downloaded_files = downloaded,
+                            "Downloaded metadata files"
+                        );
+                    }
+
                     return Ok(bytes);
                 } else if attempt <= RETRIES {
                     continue;
diff --git a/apps/docs/public/openapi.yaml b/apps/docs/public/openapi.yaml
index b49357c030..110db62e58 100644
--- a/apps/docs/public/openapi.yaml
+++ b/apps/docs/public/openapi.yaml
@@ -692,6 +692,12 @@ components:
               type: string
               description: The ID of the project
               example: AABBCCDD
+            all_project_types:
+              type: array
+              items:
+                type: string
+              description: All project types across every version of the project, unlike `project_type` which only reflects a version-specific type
+              example: [mod, plugin, datapack]
             author:
               type: string
               description: The username of the project's author
@@ -748,6 +754,7 @@ components:
             - client_side
             - server_side
             - project_id
+            - all_project_types
             - author
             - versions
             - follows
@@ -1948,6 +1955,7 @@ paths:
 
             These are the most commonly used facet types:
             - `project_type`
+            - `all_project_types` (matches against every project type across all of the project's versions, not just the primary/version-specific type)
             - `categories` (loaders are lumped in with categories in search)
             - `versions`
             - `client_side`
diff --git a/apps/frontend/src/assets/styles/global.scss b/apps/frontend/src/assets/styles/global.scss
index 97142a7228..7013d7b54a 100644
--- a/apps/frontend/src/assets/styles/global.scss
+++ b/apps/frontend/src/assets/styles/global.scss
@@ -482,3 +482,8 @@ input {
 .button-transparent {
 	box-shadow: none;
 }
+
+.qc-cmp2-close-tooltip {
+	background-color: transparent;
+	color: hsl(145, 78%, 28%);
+}
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/CompatibleVersionCard.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/CompatibleVersionCard.vue
new file mode 100644
index 0000000000..c8b5bf66c8
--- /dev/null
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/CompatibleVersionCard.vue
@@ -0,0 +1,184 @@
+<template>
+	<div
+		:role="selectable ? 'radio' : undefined"
+		:aria-checked="selectable ? selected : undefined"
+		:tabindex="selectable ? 0 : undefined"
+		class="grid items-center gap-3 rounded-2xl border border-solid px-3 py-3 transition-all"
+		:class="{
+			'grid-cols-[min-content_minmax(0,1fr)_min-content]': selectable,
+			'grid-cols-[minmax(0,1fr)_min-content]': !selectable,
+			'cursor-pointer border-brand bg-surface-4 text-contrast': selectable && selected,
+			'cursor-pointer border-surface-5 bg-surface-4 hover:brightness-[115%]':
+				selectable && !selected,
+			'border-transparent bg-surface-2': !selectable,
+		}"
+		@click="select"
+		@keydown.enter.self.prevent="select"
+		@keydown.space.self.prevent="select"
+	>
+		<template v-if="selectable">
+			<RadioButtonCheckedIcon v-if="selected" aria-hidden="true" class="size-5 text-brand" />
+			<RadioButtonIcon v-else aria-hidden="true" class="size-5 text-secondary" />
+		</template>
+		<div class="flex min-w-0 flex-col gap-1">
+			<div class="flex min-w-0 items-center gap-2">
+				<nuxt-link
+					v-tooltip="truncatedTooltip(versionNumberRef, version.version_number)"
+					:to="`/${project.project_type}/${project.slug || project.id}/version/${version.id}`"
+					target="_blank"
+					rel="noopener noreferrer"
+					class="block min-w-0 text-contrast no-underline hover:underline"
+				>
+					<span ref="versionNumberRef" class="block truncate font-semibold">
+						{{ version.version_number }}
+					</span>
+				</nuxt-link>
+				<VersionChannelTag :channel="version.version_type" class="relative -top-px !py-1" />
+			</div>
+			<div class="flex min-w-0 items-center gap-1.5 text-sm text-secondary">
+				<span v-tooltip="publishedTooltip" class="min-w-0 truncate">
+					{{ publishedLabel }}
+				</span>
+				<div
+					v-if="primaryFile"
+					class="h-1.5 w-1.5 flex-shrink-0 rounded-full bg-primary opacity-30"
+				></div>
+				<span v-if="primaryFile" class="flex-shrink-0">
+					{{ primaryFileSizeLabel }}
+				</span>
+			</div>
+		</div>
+		<ButtonStyled
+			v-if="primaryFile && showDownload"
+			:color="color"
+			:type="type"
+			:circular="circular"
+		>
+			<a
+				v-tooltip="circular ? formatMessage(messages.download) : null"
+				:href="primaryFileDownloadUrl"
+				:download="primaryFile.filename"
+				:aria-label="
+					formatMessage(messages.downloadVersion, {
+						version: version.version_number,
+					})
+				"
+				@click="emit('download')"
+			>
+				<DownloadIcon aria-hidden="true" />
+				<template v-if="!circular">
+					{{ formatMessage(messages.download) }}
+				</template>
+			</a>
+		</ButtonStyled>
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import { DownloadIcon, RadioButtonCheckedIcon, RadioButtonIcon } from '@modrinth/assets'
+import {
+	ButtonStyled,
+	type CdnDownloadReason,
+	defineMessages,
+	truncatedTooltip,
+	useFormatBytes,
+	useFormatDateTime,
+	useRelativeTime,
+	useVIntl,
+} from '@modrinth/ui'
+import VersionChannelTag from '@modrinth/ui/src/components/version/VersionChannelTag.vue'
+import { capitalizeString, type DisplayProjectType } from '@modrinth/utils'
+import { computed, ref } from 'vue'
+
+defineOptions({
+	name: 'CompatibleVersionCard',
+})
+
+type DownloadModalProject = Omit<Labrinth.Projects.v2.Project, 'project_type'> & {
+	project_type: DisplayProjectType
+	actualProjectType: Labrinth.Projects.v2.ProjectType
+}
+
+const props = withDefaults(
+	defineProps<{
+		project: DownloadModalProject
+		version: Labrinth.Versions.v3.Version
+		downloadReason?: CdnDownloadReason
+		currentGameVersion?: string | null
+		currentPlatform?: string | null
+		color?: 'brand' | 'standard'
+		type?: 'standard' | 'transparent'
+		circular?: boolean
+		selectable?: boolean
+		selected?: boolean
+		showDownload?: boolean
+	}>(),
+	{
+		downloadReason: 'standalone',
+		currentGameVersion: null,
+		currentPlatform: null,
+		color: 'brand',
+		type: 'standard',
+		circular: false,
+		selectable: false,
+		selected: false,
+		showDownload: true,
+	},
+)
+
+const emit = defineEmits<{
+	download: []
+	select: []
+}>()
+
+const { createProjectDownloadUrl } = useCdnDownloadContext()
+const { formatMessage } = useVIntl()
+const formatBytes = useFormatBytes()
+const formatDateTime = useFormatDateTime({
+	timeStyle: 'short',
+	dateStyle: 'long',
+})
+const formatRelativeTime = useRelativeTime()
+
+const versionNumberRef = ref<HTMLElement | null>(null)
+
+const primaryFile = computed<Labrinth.Versions.v3.VersionFile | null>(() => {
+	return props.version.files?.find((file) => file.primary) || props.version.files?.[0] || null
+})
+
+const primaryFileDownloadUrl = computed(() => {
+	if (!primaryFile.value) return '#'
+
+	return createProjectDownloadUrl(primaryFile.value.url, {
+		reason: props.downloadReason,
+		gameVersion: props.currentGameVersion ?? undefined,
+		loader: props.currentPlatform ?? undefined,
+	})
+})
+
+const publishedLabel = computed(() =>
+	capitalizeString(formatRelativeTime(props.version.date_published)),
+)
+const publishedTooltip = computed(() => formatDateTime(props.version.date_published))
+const primaryFileSizeLabel = computed(() => {
+	if (!primaryFile.value) return ''
+	return formatBytes(primaryFile.value.size)
+})
+
+function select() {
+	if (!props.selectable) return
+	emit('select')
+}
+
+const messages = defineMessages({
+	downloadVersion: {
+		id: 'project.download.download-version',
+		defaultMessage: 'Download {version}',
+	},
+	download: {
+		id: 'project.download.download',
+		defaultMessage: 'Download',
+	},
+})
+</script>
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependencies.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependencies.vue
index d70ae48c27..bf40f0ae9f 100644
--- a/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependencies.vue
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependencies.vue
@@ -1,494 +1,111 @@
 <template>
-	<div v-if="downloadRows.length > 0" class="flex flex-col gap-1">
-		<div v-if="showTitle" class="flex flex-wrap items-center justify-between gap-2">
-			<h3 class="m-0 flex items-center gap-1.5 text-base font-semibold text-contrast">
-				{{ sectionTitle }}
-				<InfoIcon
-					v-if="duplicateDependencyRowsHidden"
-					v-tooltip="formatMessage(messages.duplicateDependenciesHidden)"
-					aria-hidden="true"
-					class="size-4 text-secondary"
+	<div v-if="downloadRows.length > 0 || recommendedRows.length > 0" class="flex flex-col gap-4">
+		<div v-if="downloadRows.length > 0" class="flex flex-col gap-2.5">
+			<div v-if="showTitle" class="flex flex-wrap items-center justify-between gap-2">
+				<h3 class="m-0 flex items-center gap-1.5 text-base font-semibold text-contrast">
+					{{ formatMessage(messages.dependenciesTitle) }}
+					<InfoIcon
+						v-if="duplicateDependencyRowsHidden"
+						v-tooltip="formatMessage(messages.duplicateDependenciesHidden)"
+						aria-hidden="true"
+						class="size-4 text-secondary"
+					/>
+				</h3>
+			</div>
+			<Admonition v-if="requiredResourcePackAdmonitionVisible" type="info">
+				<IntlFormatted :message-id="messages.requiredResourcePackAdmonition">
+					<template #folder>
+						<code class="text-sm">resourcepacks</code>
+					</template>
+				</IntlFormatted>
+			</Admonition>
+			<Admonition v-if="dependencyResourcePackAdmonitionVisible" type="info">
+				<IntlFormatted :message-id="messages.dependencyResourcePackAdmonition">
+					<template #folder>
+						<code class="text-sm">resourcepacks</code>
+					</template>
+				</IntlFormatted>
+			</Admonition>
+			<div class="rounded-2xl bg-surface-2 p-2 pl-4 pr-3">
+				<DownloadDependency
+					v-for="dependency in downloadRows"
+					:key="dependency.key"
+					:dependency="dependency"
+					@download="emit('download')"
 				/>
-			</h3>
+			</div>
 		</div>
-		<div class="flex flex-col gap-2">
-			<DownloadDependency
-				v-for="dependency in downloadRows"
-				:key="dependency.key"
-				:dependency="dependency"
-				@download="emit('download')"
-			/>
+
+		<div v-if="recommendedRows.length > 0" class="flex flex-col gap-2.5">
+			<h3 class="m-0 text-base font-semibold text-contrast">
+				{{ formatMessage(messages.recommendedTitle) }}
+			</h3>
+			<div class="rounded-2xl bg-surface-2 p-2 pl-4 pr-3">
+				<DownloadDependency
+					v-for="dependency in recommendedRows"
+					:key="dependency.key"
+					:dependency="dependency"
+					@download="emit('download')"
+				/>
+			</div>
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
-import type { Labrinth } from '@modrinth/api-client'
-import { FileIcon, InfoIcon } from '@modrinth/assets'
-import {
-	type CdnDownloadReason,
-	defineMessages,
-	fileTypeMessages,
-	injectModrinthClient,
-	useVIntl,
-} from '@modrinth/ui'
-import type { DisplayProjectType } from '@modrinth/utils'
-import { useQuery } from '@tanstack/vue-query'
-import { type Component, computed, watch } from 'vue'
+import { InfoIcon } from '@modrinth/assets'
+import { Admonition, defineMessages, IntlFormatted, useVIntl } from '@modrinth/ui'
 
+import { injectDownloadModalProvider } from './download-modal-provider'
 import DownloadDependency from './DownloadDependency.vue'
 
 defineOptions({
 	name: 'DownloadDependencies',
 })
 
-type DownloadModalProject = Omit<Labrinth.Projects.v2.Project, 'project_type'> & {
-	project_type: DisplayProjectType
-	actualProjectType: Labrinth.Projects.v2.ProjectType
-}
-
-type ResolvedContent = Labrinth.Content.v3.ResolvedContent | Labrinth.Content.v3.SkippedContent
-
-interface DownloadDependencyRow {
-	key: string
-	name: string
-	icon?: string
-	fallbackIcon?: Component
-	projectHref?: string
-	downloadHref?: string
-	filename?: string
-	fileSize?: number
-	typeLabel: string
-	unavailableTooltip: string
-	dependencies: DownloadDependencyRow[]
-}
-
-interface DownloadableDependencyFile {
-	href: string
-	filename: string
-	name: string
-}
-
-const props = withDefaults(
+withDefaults(
 	defineProps<{
-		dependencies?: DownloadDependencyRow[] | null
-		project?: DownloadModalProject | null
-		selectedVersion?: Labrinth.Versions.v3.Version | null
-		currentGameVersion?: string | null
-		currentPlatform?: string | null
-		downloadReason?: CdnDownloadReason
-		additionalFiles?: Labrinth.Versions.v3.VersionFile[]
 		showTitle?: boolean
 	}>(),
 	{
-		dependencies: null,
-		project: null,
-		selectedVersion: null,
-		currentGameVersion: null,
-		currentPlatform: null,
-		downloadReason: 'standalone',
-		additionalFiles: () => [],
 		showTitle: true,
 	},
 )
 
 const emit = defineEmits<{
 	download: []
-	'update:downloadable-files': [files: DownloadableDependencyFile[]]
 }>()
-const client = injectModrinthClient()
-const { createProjectDownloadUrl } = useCdnDownloadContext()
 const { formatMessage } = useVIntl()
-
-const shouldResolveDependencies = computed(
-	() => !props.dependencies && !!props.project && !!props.selectedVersion,
-)
-
-const dependencyResolutionPreferences = computed<Labrinth.Content.v3.ResolutionPreferences>(() => ({
-	game_versions: props.selectedVersion?.game_versions || [],
-	loaders: props.currentPlatform ? [props.currentPlatform] : props.selectedVersion?.loaders || [],
-}))
-
-const { data: dependencyResolution } = useQuery({
-	queryKey: computed(() => [
-		'project-download-modal',
-		'content-resolve',
-		props.project?.id,
-		props.selectedVersion?.id,
-		props.project?.project_type,
-		dependencyResolutionPreferences.value,
-	]),
-	queryFn: () =>
-		client.labrinth.content_v3.resolve({
-			project_id: props.project!.id,
-			version_id: props.selectedVersion!.id,
-			content_type: resolveContentType(props.project!.project_type),
-			selected: dependencyResolutionPreferences.value,
-			target: dependencyResolutionPreferences.value,
-		}),
-	enabled: shouldResolveDependencies,
-})
-
-const visibleResolvedDependencies = computed<ResolvedContent[]>(() => {
-	return [
-		...(dependencyResolution.value?.dependencies || []),
-		...(dependencyResolution.value?.skipped || []),
-	].filter(shouldShowDependency)
-})
-
-const dependencyVersionIds = computed<string[]>(() => {
-	return [
-		...new Set(
-			visibleResolvedDependencies.value
-				.filter((dependency) => !('reason' in dependency))
-				.map((dependency) => dependency.version_id)
-				.filter((versionId): versionId is string => !!versionId),
-		),
-	]
-})
-
-const { data: dependencyVersions } = useQuery({
-	queryKey: computed(() => [
-		'project-download-modal',
-		'resolved-versions',
-		dependencyVersionIds.value,
-	]),
-	queryFn: () => client.labrinth.versions_v3.getVersions(dependencyVersionIds.value),
-	enabled: computed(() => shouldResolveDependencies.value && dependencyVersionIds.value.length > 0),
-})
-
-const dependencyVersionById = computed(() => {
-	const map = new Map<string, Labrinth.Versions.v3.Version>()
-	for (const version of dependencyVersions.value || []) {
-		if (!version) continue
-		map.set(version.id, version)
-	}
-	return map
-})
-
-const dependencyProjectIds = computed<string[]>(() => {
-	return [
-		...new Set(
-			visibleResolvedDependencies.value
-				.map((dependency) => dependency.project_id)
-				.filter((projectId): projectId is string => !!projectId),
-		),
-	]
-})
-
-const { data: dependencyProjects } = useQuery({
-	queryKey: computed(() => [
-		'project-download-modal',
-		'resolved-projects',
-		dependencyProjectIds.value,
-	]),
-	queryFn: () => client.labrinth.projects_v2.getMultiple(dependencyProjectIds.value),
-	enabled: computed(() => shouldResolveDependencies.value && dependencyProjectIds.value.length > 0),
-})
-
-const dependencyProjectById = computed(() => {
-	const map = new Map<string, Labrinth.Projects.v2.Project>()
-	for (const project of dependencyProjects.value || []) {
-		map.set(project.id, project)
-	}
-	return map
-})
-
-const dependenciesByParentVersionId = computed(() => {
-	const map = new Map<string, ResolvedContent[]>()
-
-	for (const dependency of visibleResolvedDependencies.value) {
-		if (!dependency.dependent_on_version_id) continue
-
-		const dependencies = map.get(dependency.dependent_on_version_id) || []
-		dependencies.push(dependency)
-		map.set(dependency.dependent_on_version_id, dependencies)
-	}
-
-	return map
-})
-
-const dependenciesLoaded = computed(() => {
-	if (!shouldResolveDependencies.value) return false
-	if (!dependencyResolution.value) return false
-	if (
-		dependencyResolution.value.primary.version_id &&
-		dependencyResolution.value.primary.version_id !== props.selectedVersion?.id
-	) {
-		return false
-	}
-	if (
-		!dependencyVersionIds.value.every((versionId) => dependencyVersionById.value.has(versionId))
-	) {
-		return false
-	}
-	if (
-		!dependencyProjectIds.value.every((projectId) => dependencyProjectById.value.has(projectId))
-	) {
-		return false
-	}
-	return true
-})
-
-const resolvedDependencyRows = computed<DownloadDependencyRow[]>(() => {
-	if (!dependenciesLoaded.value) return []
-
-	const primaryVersionId =
-		dependencyResolution.value?.primary.version_id || props.selectedVersion?.id
-	if (!primaryVersionId) return []
-
-	const dependencies = dependenciesByParentVersionId.value.get(primaryVersionId) || []
-
-	return dependencies.flatMap((dependency) => {
-		const row = createDependencyRow(dependency)
-		return row ? [row] : []
-	})
-})
-
-const dependencyRows = computed<DownloadDependencyRow[]>(
-	() => props.dependencies || resolvedDependencyRows.value,
-)
-
-const visibleDependencyRows = computed<DownloadDependencyRow[]>(() =>
-	dedupeDependencyRows(dependencyRows.value),
-)
-
-const duplicateDependencyRowsHidden = computed(() =>
-	hasDuplicateDependencyRows(dependencyRows.value),
-)
-
-const additionalFileRows = computed<DownloadDependencyRow[]>(() =>
-	props.additionalFiles.map((file) => ({
-		key: `additional-file-${additionalFileKey(file)}`,
-		name: file.filename,
-		fallbackIcon: FileIcon,
-		downloadHref: getDownloadUrl(file.url),
-		filename: file.filename,
-		fileSize: file.size,
-		typeLabel: fileTypeLabel(file.file_type),
-		unavailableTooltip: formatMessage(messages.unavailableFile),
-		dependencies: [],
-	})),
-)
-
-const downloadRows = computed<DownloadDependencyRow[]>(() => [
-	...visibleDependencyRows.value,
-	...additionalFileRows.value,
-])
-
-const sectionTitle = computed(() =>
-	formatMessage(
-		visibleDependencyRows.value.length > 0
-			? messages.dependenciesTitle
-			: messages.additionalFilesTitle,
-	),
-)
-
-const downloadableDependencyFiles = computed<DownloadableDependencyFile[]>(() =>
-	collectDownloadableDependencyFiles(visibleDependencyRows.value),
-)
-
-watch(
-	downloadableDependencyFiles,
-	(files) => {
-		emit('update:downloadable-files', files)
-	},
-	{ immediate: true },
-)
-
-function primaryFileForVersion(version?: Labrinth.Versions.v3.Version) {
-	return version?.files?.find((file) => file.primary) || version?.files?.[0]
-}
-
-function shouldShowDependency(dependency: ResolvedContent) {
-	return !(
-		'reason' in dependency && ['duplicate_project', 'quilt_fabric_api'].includes(dependency.reason)
-	)
-}
-
-function createDependencyRow(dependency: ResolvedContent): DownloadDependencyRow | null {
-	const versionId = dependency.version_id ?? undefined
-	const version = versionId ? dependencyVersionById.value.get(versionId) : undefined
-	const project = dependencyProjectById.value.get(dependency.project_id)
-	if (!project) return null
-
-	const primaryFile = primaryFileForVersion(version)
-	const unavailableTooltip =
-		'reason' in dependency && dependency.reason
-			? skippedReasonLabel(dependency.reason)
-			: formatMessage(messages.unavailableDependency)
-	const name = project.title
-
-	return {
-		key: `${dependency.project_id}-${versionId ?? 'unresolved'}-${
-			'reason' in dependency ? dependency.reason : 'resolved'
-		}`,
-		name,
-		icon: project.icon_url ?? undefined,
-		projectHref: `/${project.project_type}/${project.slug || project.id}`,
-		downloadHref:
-			'reason' in dependency || !primaryFile ? undefined : getDownloadUrl(primaryFile.url),
-		filename: primaryFile?.filename,
-		fileSize: primaryFile?.size,
-		typeLabel: 'Required',
-		unavailableTooltip,
-		dependencies: (versionId && dependenciesByParentVersionId.value.get(versionId)
-			? dependenciesByParentVersionId.value.get(versionId)!
-			: []
-		).flatMap((subDependency) => {
-			const row = createDependencyRow(subDependency)
-			return row ? [row] : []
-		}),
-	}
-}
-
-function skippedReasonLabel(reason: Labrinth.Content.v3.SkippedContent['reason']) {
-	return (
-		{
-			already_installed: formatMessage(messages.alreadyInstalledDependency),
-			duplicate_project: formatMessage(messages.duplicateDependency),
-			conflicting_dependency: formatMessage(messages.conflictingDependency),
-			no_compatible_version: formatMessage(messages.noCompatibleDependency),
-			missing_version: formatMessage(messages.missingDependencyVersion),
-			quilt_fabric_api: formatMessage(messages.quiltFabricApiDependency),
-		}[reason] || formatMessage(messages.unavailableDependency)
-	)
-}
-
-function resolveContentType(projectType: DisplayProjectType): Labrinth.Content.v3.ContentType {
-	return ['mod', 'plugin', 'datapack', 'resourcepack', 'shader', 'modpack'].includes(projectType)
-		? (projectType as Labrinth.Content.v3.ContentType)
-		: 'mod'
-}
-
-function getDownloadUrl(url: string) {
-	return createProjectDownloadUrl(url, {
-		reason: props.downloadReason,
-		gameVersion: props.currentGameVersion ?? undefined,
-		loader: props.currentPlatform ?? undefined,
-	})
-}
-
-function fileTypeLabel(type?: Labrinth.Versions.v3.FileType | null) {
-	return formatMessage(fileTypeMessages[type ?? 'unknown'] ?? fileTypeMessages.unknown)
-}
-
-function additionalFileKey(file: Labrinth.Versions.v3.VersionFile) {
-	return file.hashes?.sha1 ?? file.filename
-}
-
-function dedupeDependencyRows(
-	rows: DownloadDependencyRow[],
-	seenDependencies = new Set<string>(),
-): DownloadDependencyRow[] {
-	return rows.flatMap((row) => {
-		const identity = dependencyRowIdentity(row)
-		if (seenDependencies.has(identity)) return []
-
-		seenDependencies.add(identity)
-
-		return [
-			{
-				...row,
-				dependencies: dedupeDependencyRows(row.dependencies, seenDependencies),
-			},
-		]
-	})
-}
-
-function dependencyRowIdentity(row: DownloadDependencyRow) {
-	return row.projectHref ?? row.downloadHref ?? row.key
-}
-
-function hasDuplicateDependencyRows(
-	rows: DownloadDependencyRow[],
-	seenDependencies = new Set<string>(),
-): boolean {
-	for (const row of rows) {
-		const rowId = dependencyRowIdentity(row)
-		if (seenDependencies.has(rowId)) return true
-		seenDependencies.add(rowId)
-		if (hasDuplicateDependencyRows(row.dependencies, seenDependencies)) return true
-	}
-
-	return false
-}
-
-function collectDownloadableDependencyFiles(
-	rows: DownloadDependencyRow[],
-	seenHrefs = new Set<string>(),
-): DownloadableDependencyFile[] {
-	const files: DownloadableDependencyFile[] = []
-
-	for (const row of rows) {
-		if (row.downloadHref && !seenHrefs.has(row.downloadHref)) {
-			seenHrefs.add(row.downloadHref)
-			files.push({
-				href: row.downloadHref,
-				filename: row.filename || filenameFromUrl(row.downloadHref),
-				name: row.name,
-			})
-		}
-
-		files.push(...collectDownloadableDependencyFiles(row.dependencies, seenHrefs))
-	}
-
-	return files
-}
-
-function filenameFromUrl(url: string) {
-	try {
-		const filename = new URL(url).pathname.split('/').pop()
-		return filename ? decodeURIComponent(filename) : 'dependency.jar'
-	} catch {
-		return 'dependency.jar'
-	}
-}
+const {
+	dependencyResourcePackAdmonitionVisible,
+	duplicateDependencyRowsHidden,
+	downloadRows,
+	recommendedRows,
+	requiredResourcePackAdmonitionVisible,
+} = injectDownloadModalProvider()
 
 const messages = defineMessages({
 	dependenciesTitle: {
 		id: 'project.download.dependencies-title',
 		defaultMessage: 'Dependencies',
 	},
+	recommendedTitle: {
+		id: 'project.download.recommended-title',
+		defaultMessage: 'Recommended',
+	},
 	duplicateDependenciesHidden: {
 		id: 'project.download.duplicate-dependencies-hidden',
 		defaultMessage: 'Duplicate dependencies are hidden',
 	},
-	additionalFilesTitle: {
-		id: 'project.download.additional-files-title',
-		defaultMessage: 'Additional files',
+	requiredResourcePackAdmonition: {
+		id: 'project.download.required-resource-pack-admonition',
+		defaultMessage:
+			'This data pack also requires a resource pack. Download it and place it in your {folder} folder.',
 	},
-	alreadyInstalledDependency: {
-		id: 'project.download.dependency-already-installed',
-		defaultMessage: 'This dependency is already installed',
-	},
-	conflictingDependency: {
-		id: 'project.download.dependency-conflicting',
-		defaultMessage: 'This dependency conflicts with another dependency',
-	},
-	duplicateDependency: {
-		id: 'project.download.dependency-duplicate',
-		defaultMessage: 'This dependency is already included',
-	},
-	missingDependencyVersion: {
-		id: 'project.download.dependency-missing-version',
-		defaultMessage: 'This dependency version is unavailable',
-	},
-	noCompatibleDependency: {
-		id: 'project.download.dependency-no-compatible-version',
-		defaultMessage: 'No compatible version is available for this dependency',
-	},
-	quiltFabricApiDependency: {
-		id: 'project.download.dependency-quilt-fabric-api',
-		defaultMessage: 'Fabric API is skipped for Quilt',
-	},
-	unavailableDependency: {
-		id: 'project.download.dependency-unavailable',
-		defaultMessage: 'This dependency cannot be downloaded',
-	},
-	unavailableFile: {
-		id: 'project.download.file-unavailable',
-		defaultMessage: 'This file cannot be downloaded',
+	dependencyResourcePackAdmonition: {
+		id: 'project.download.dependency-resource-pack-admonition',
+		defaultMessage:
+			'This project has a dependency with a required resource pack. Download it and place it in your {folder} folder.',
 	},
 })
 </script>
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependency.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependency.vue
index 6863a0536e..e1959994ea 100644
--- a/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependency.vue
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependency.vue
@@ -1,24 +1,24 @@
 <template>
-	<div class="flex min-w-0 flex-col gap-2">
+	<div class="flex min-w-0 flex-col">
 		<div
-			class="grid min-h-10 grid-cols-[minmax(0,1fr)_min-content] items-center gap-3 rounded-xl bg-button-bg py-0 pl-3.5 pr-2 text-primary"
+			class="z-10 grid h-11 grid-cols-[minmax(0,1fr)_min-content] items-center gap-1 text-primary"
 		>
-			<span class="flex min-w-0 items-center gap-3">
+			<span class="flex min-w-0 items-center gap-2">
 				<Avatar
-					v-if="dependency.icon"
+					v-if="dependency.icon && !dependency.hideIcon"
 					:src="dependency.icon"
 					:alt="dependency.name"
 					size="24px"
 					class="!rounded-lg !shadow-none"
 				/>
 				<span
-					v-else
-					class="flex size-4 flex-shrink-0 items-center justify-center rounded-lg border border-solid border-surface-5 text-secondary"
+					v-else-if="!dependency.hideIcon"
+					class="flex size-6 flex-shrink-0 items-center justify-center rounded-lg border border-solid border-surface-5 text-secondary"
 				>
 					<component
 						:is="dependency.fallbackIcon ?? PackageIcon"
 						aria-hidden="true"
-						class="size-5"
+						class="size-4"
 					/>
 				</span>
 				<a
@@ -28,7 +28,7 @@
 					:href="dependency.projectHref"
 					target="_blank"
 					rel="noopener noreferrer"
-					class="min-w-0 truncate text-base font-semibold text-contrast no-underline hover:underline"
+					class="min-w-0 truncate bg-surface-2 text-base font-semibold text-contrast hover:underline"
 				>
 					{{ dependency.name }}
 				</a>
@@ -36,13 +36,25 @@
 					v-else
 					ref="dependencyNameRef"
 					v-tooltip="truncatedTooltip(dependencyNameRef, dependency.name)"
-					class="min-w-0 truncate text-base font-semibold text-contrast"
+					class="min-w-0 truncate bg-surface-2 text-base text-contrast"
+					:class="dependency.isAdditionalFile ? 'font-medium' : 'font-semibold'"
 				>
 					{{ dependency.name }}
 				</span>
-				<TagItem class="shrink-0 border !border-solid border-surface-5 !px-3 !py-1 text-base">
-					{{ dependency.typeLabel }}
+				<TagItem
+					v-if="dependency.isAdditionalFile"
+					v-tooltip="metadataTooltip"
+					class="min-w-0 max-w-[50%] shrink-0 truncate border !border-solid border-surface-5"
+				>
+					{{ metadataLabel }}
 				</TagItem>
+				<span
+					v-else
+					v-tooltip="metadataTooltip"
+					class="min-w-0 max-w-[50%] truncate text-sm text-secondary"
+				>
+					{{ metadataLabel }}
+				</span>
 			</span>
 			<ButtonStyled v-if="dependency.downloadHref" circular type="transparent">
 				<a
@@ -68,14 +80,18 @@
 		<div
 			v-for="childDependency in dependency.dependencies"
 			:key="childDependency.key"
-			class="group/dependency relative pl-10"
+			class="group/dependency relative pl-8"
 		>
-			<DownloadDependency :dependency="childDependency" class="z-1" @download="emit('download')" />
+			<DownloadDependency
+				:dependency="childDependency"
+				class="relative z-10"
+				@download="emit('download')"
+			/>
 			<div
 				aria-hidden="true"
-				class="absolute -top-2 left-6 z-0 h-[calc(100%+1rem)] w-0.5 bg-surface-5 group-first/dependency:-top-2 group-first/dependency:h-20 group-last/dependency:h-7"
+				class="absolute -top-2.5 left-3 z-0 h-full w-0.5 bg-surface-5 group-last/dependency:h-8"
 			/>
-			<div aria-hidden="true" class="absolute left-6 top-5 z-0 h-0.5 w-4 bg-surface-5" />
+			<div aria-hidden="true" class="absolute left-3 top-[21px] z-0 h-0.5 w-7 bg-surface-5" />
 		</div>
 	</div>
 </template>
@@ -102,10 +118,13 @@ interface DownloadDependencyRow {
 	name: string
 	icon?: string
 	fallbackIcon?: Component
+	hideIcon?: boolean
+	isAdditionalFile?: boolean
 	projectHref?: string
 	downloadHref?: string
 	filename?: string
 	fileSize?: number
+	metadataLabel?: string
 	typeLabel: string
 	unavailableTooltip: string
 	dependencies: DownloadDependencyRow[]
@@ -123,6 +142,13 @@ const { formatMessage } = useVIntl()
 const formatBytes = useFormatBytes()
 const dependencyNameRef = ref<HTMLElement | null>(null)
 
+const metadataLabel = computed(() => props.dependency.metadataLabel ?? props.dependency.typeLabel)
+const metadataTooltip = computed(() => {
+	if (props.dependency.isAdditionalFile) return null
+	if (metadataLabel.value === props.dependency.typeLabel) return null
+	return metadataLabel.value
+})
+
 const downloadTooltip = computed(() => {
 	const filename = props.dependency.filename || props.dependency.name
 
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadProject.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadProject.vue
index 60d00a0f5c..0f610f51b7 100644
--- a/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadProject.vue
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadProject.vue
@@ -80,107 +80,73 @@
 		</Combobox>
 	</div>
 
-	<div v-if="selectedVersion" class="flex flex-col gap-1">
-		<div class="flex flex-wrap items-center justify-between gap-2">
-			<h3 class="relative top-0.5 m-0 text-base font-semibold text-contrast">
-				{{ formatMessage(messages.compatibleVersionTitle) }}
-			</h3>
-			<ButtonStyled v-if="downloadAllFiles.length > 1" type="transparent">
-				<button :disabled="downloadingSelectedVersion" @click="downloadSelectedVersionFiles">
-					<SpinnerIcon v-if="downloadingSelectedVersion" aria-hidden="true" class="animate-spin" />
-					<DownloadIcon v-else aria-hidden="true" />
-					{{
-						formatMessage(
-							downloadingSelectedVersion
-								? messages.downloadingSelectedVersion
-								: messages.downloadAllSelectedVersion,
-							{
-								current: selectedVersionDownloadProgress.current,
-								total: selectedVersionDownloadProgress.total,
-							},
-						)
-					}}
-				</button>
-			</ButtonStyled>
-		</div>
-		<div
-			class="grid grid-cols-[1fr_min-content] items-center gap-3 rounded-2xl bg-surface-2 px-3 py-3"
+	<div
+		v-if="selectedVersion && downloadDataLoaded"
+		:role="compatibleVersions.length > 1 ? 'radiogroup' : undefined"
+		:aria-label="
+			compatibleVersions.length > 1 ? formatMessage(messages.compatibleVersionTitle) : undefined
+		"
+		class="flex flex-col gap-2.5"
+	>
+		<h3
+			v-if="compatibleVersions.length > 1"
+			class="relative top-0.5 m-0 text-base font-semibold text-contrast"
 		>
-			<div class="flex min-w-0 flex-col gap-1">
-				<div class="flex min-w-0 items-center gap-2">
-					<nuxt-link
-						v-tooltip="truncatedTooltip(versionNumberRef, selectedVersion.version_number)"
-						:to="`/${project.project_type}/${project.slug || project.id}/version/${selectedVersion.id}`"
-						target="_blank"
-						rel="noopener noreferrer"
-						class="block min-w-0 text-contrast no-underline hover:underline"
-					>
-						<span ref="versionNumberRef" class="block truncate font-semibold">
-							{{ selectedVersion.version_number }}
-						</span>
-					</nuxt-link>
-					<VersionChannelTag
-						:channel="selectedVersion.version_type"
-						class="relative -top-px !py-0.5"
-					/>
-				</div>
-				<p
-					ref="versionNameRef"
-					v-tooltip="truncatedTooltip(versionNameRef, selectedVersion.name)"
-					class="m-0 w-fit max-w-full truncate text-sm text-secondary"
-				>
-					{{ selectedVersion.name }}
-				</p>
-			</div>
-			<ButtonStyled v-if="selectedPrimaryFile" color="brand" circular>
-				<a
-					v-tooltip="'Download'"
-					:href="selectedPrimaryFileDownloadUrl"
-					:download="selectedPrimaryFile.filename"
-					:aria-label="
-						formatMessage(messages.downloadVersion, {
-							version: selectedVersion.version_number,
-						})
-					"
-					@click="emit('download')"
-				>
-					<DownloadIcon aria-hidden="true" />
-				</a>
-			</ButtonStyled>
-		</div>
+			{{ formatMessage(messages.compatibleVersionTitle) }}
+		</h3>
+		<CompatibleVersionCard
+			v-for="compatibleVersion in compatibleVersions"
+			:key="compatibleVersion.id"
+			:project="project"
+			:version="compatibleVersion"
+			:download-reason="downloadReason"
+			:current-game-version="currentGameVersion"
+			:current-platform="currentPlatform"
+			:selectable="compatibleVersions.length > 1"
+			:selected="compatibleVersion.id === selectedVersion.id"
+			:show-download="
+				compatibleVersions.length === 1 || compatibleVersion.id === selectedVersion.id
+			"
+			:color="
+				compatibleVersion.id === selectedVersion.id &&
+				compatibleVersions.length === 1 &&
+				!hasAdditionalDownloads
+					? 'brand'
+					: 'standard'
+			"
+			:type="
+				compatibleVersion.id === selectedVersion.id &&
+				compatibleVersions.length === 1 &&
+				!hasAdditionalDownloads
+					? 'standard'
+					: 'transparent'
+			"
+			:circular="hasAdditionalDownloads || compatibleVersions.length > 1"
+			@select="selectCompatibleVersion(compatibleVersion)"
+			@download="emit('download')"
+		/>
 	</div>
-	<p v-else-if="currentPlatform && currentGameVersion && versions.length > 0">
-		{{
-			formatMessage(messages.noVersionsAvailable, {
-				gameVersion: currentGameVersion,
-				platform: currentPlatformText,
-			})
-		}}
-	</p>
 </template>
 
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
-import { DownloadIcon, SpinnerIcon, TriangleAlertIcon } from '@modrinth/assets'
+import { TriangleAlertIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
 	type CdnDownloadReason,
 	Checkbox,
 	Combobox,
 	type ComboboxOption,
 	defineMessages,
 	getTagMessage,
-	injectNotificationManager,
-	truncatedTooltip,
 	useDebugLogger,
 	useVIntl,
 } from '@modrinth/ui'
-import VersionChannelTag from '@modrinth/ui/src/components/version/VersionChannelTag.vue'
 import type { DisplayProjectType } from '@modrinth/utils'
 import dayjs from 'dayjs'
-import JSZip from 'jszip'
 import { computed, ref, watch } from 'vue'
 
+import CompatibleVersionCard from './CompatibleVersionCard.vue'
+
 defineOptions({
 	name: 'DownloadProject',
 })
@@ -207,6 +173,7 @@ const props = withDefaults(
 		project: DownloadModalProject
 		versions?: Labrinth.Versions.v3.Version[]
 		dependencyDownloadFiles?: DownloadableFile[]
+		downloadDataLoaded?: boolean
 		downloadReason?: CdnDownloadReason
 		initialGameVersion?: string | null
 		initialPlatform?: string | null
@@ -217,6 +184,7 @@ const props = withDefaults(
 	{
 		versions: () => [],
 		dependencyDownloadFiles: () => [],
+		downloadDataLoaded: false,
 		downloadReason: 'standalone',
 		initialGameVersion: null,
 		initialPlatform: null,
@@ -233,22 +201,19 @@ const emit = defineEmits<{
 	'update:selection': [selection: ProjectDownloadSelection]
 }>()
 const { formatMessage } = useVIntl()
-const { createProjectDownloadUrl } = useCdnDownloadContext()
-const { addNotification } = injectNotificationManager()
 const debug = useDebugLogger('DownloadProject')
 const tags = useGeneratedState()
 
 const userSelectedGameVersion = ref<string | null>(props.initialGameVersion)
 const userSelectedPlatform = ref<string | null>(props.initialPlatform)
+const userSelectedCompatibleVersionId = ref<string | null>(null)
 const showAllVersions = ref(defaultShowAllVersions())
 const versionFilter = ref('')
-const versionNumberRef = ref<HTMLElement | null>(null)
-const versionNameRef = ref<HTMLElement | null>(null)
-const downloadingSelectedVersion = ref(false)
-const selectedVersionDownloadProgress = ref({
-	current: 0,
-	total: 0,
-})
+const preferredPlatformRanks = new Map([
+	['fabric', 0],
+	['forge', 1],
+	['neoforge', 2],
+])
 
 const incompatibleGameVersionsSet = computed(() => new Set(props.incompatibleGameVersions))
 const incompatibleLoadersSet = computed(() => new Set(props.incompatibleLoaders))
@@ -376,13 +341,12 @@ const gameVersionOptions = computed<ComboboxOption<string>[]>(() => {
 
 const platformOptions = computed<ComboboxOption<string>[]>(() => {
 	return props.project.loaders
-		.slice()
-		.reverse()
 		.map((platform) => ({
 			value: platform,
 			label: loaderLabel(platform),
 			class: '!px-0 !py-1',
 		}))
+		.sort(comparePlatformOptions)
 })
 
 const filteredVersions = computed<Labrinth.Versions.v3.Version[]>(() => {
@@ -407,31 +371,52 @@ const filteredVersions = computed<Labrinth.Versions.v3.Version[]>(() => {
 })
 
 const filteredRelease = computed<Labrinth.Versions.v3.Version | undefined>(() => {
-	return filteredVersions.value.find((x) => x.version_type === 'release')
+	return latestVersionByType('release')
 })
 
 const filteredBeta = computed<Labrinth.Versions.v3.Version | undefined>(() => {
-	return filteredVersions.value.find(
-		(x) =>
-			x.version_type === 'beta' &&
-			(!filteredRelease.value ||
-				dayjs(x.date_published).isAfter(dayjs(filteredRelease.value.date_published))),
-	)
+	return latestVersionByType('beta')
 })
 
 const filteredAlpha = computed<Labrinth.Versions.v3.Version | undefined>(() => {
-	return filteredVersions.value.find(
-		(x) =>
-			x.version_type === 'alpha' &&
-			(!filteredRelease.value ||
-				dayjs(x.date_published).isAfter(dayjs(filteredRelease.value.date_published))) &&
-			(!filteredBeta.value ||
-				dayjs(x.date_published).isAfter(dayjs(filteredBeta.value.date_published))),
-	)
+	return latestVersionByType('alpha')
+})
+
+const defaultSelectedVersion = computed<Labrinth.Versions.v3.Version | null>(() => {
+	return filteredRelease.value || filteredBeta.value || filteredAlpha.value || null
+})
+
+const suggestedPreReleaseVersions = computed<Labrinth.Versions.v3.Version[]>(() => {
+	if (!defaultSelectedVersion.value || defaultSelectedVersion.value.version_type !== 'release')
+		return []
+
+	const versions: Labrinth.Versions.v3.Version[] = []
+	const beta = filteredBeta.value
+	if (beta && isNewerThan(beta, defaultSelectedVersion.value)) {
+		versions.push(beta)
+	}
+
+	const alpha = filteredAlpha.value
+	if (alpha && isNewerThan(alpha, defaultSelectedVersion.value)) {
+		versions.push(alpha)
+	}
+
+	return versions
+})
+
+const compatibleVersions = computed<Labrinth.Versions.v3.Version[]>(() => {
+	if (!defaultSelectedVersion.value) return []
+	return [defaultSelectedVersion.value, ...suggestedPreReleaseVersions.value]
 })
 
 const selectedVersion = computed<Labrinth.Versions.v3.Version | null>(() => {
-	return filteredRelease.value || filteredBeta.value || filteredAlpha.value || null
+	return (
+		compatibleVersions.value.find(
+			(version) => version.id === userSelectedCompatibleVersionId.value,
+		) ||
+		defaultSelectedVersion.value ||
+		null
+	)
 })
 
 const selectedPrimaryFile = computed<Labrinth.Versions.v3.VersionFile | null>(() => {
@@ -442,39 +427,47 @@ const selectedPrimaryFile = computed<Labrinth.Versions.v3.VersionFile | null>(()
 	)
 })
 
-const selectedPrimaryFileDownloadUrl = computed(() => {
-	if (!selectedPrimaryFile.value) return '#'
-	return getDownloadUrl(selectedPrimaryFile.value.url)
+const requiredResourcePackFile = computed<Labrinth.Versions.v3.VersionFile | null>(() => {
+	if (props.project.project_type !== 'datapack') return null
+
+	return (
+		selectedVersion.value?.files?.find(
+			(file) => file !== selectedPrimaryFile.value && file.file_type === 'required-resource-pack',
+		) || null
+	)
 })
 
-const selectedVersionDownloadFiles = computed(() => {
-	if (!selectedVersion.value) return []
+const recommendedResourcePackFiles = computed<Labrinth.Versions.v3.VersionFile[]>(() => {
+	if (props.project.project_type !== 'datapack') return []
 
-	return selectedVersion.value.files.map((file) => ({
-		href: getDownloadUrl(file.url),
-		filename: file.filename,
-	}))
+	return (
+		selectedVersion.value?.files?.filter(
+			(file) => file !== selectedPrimaryFile.value && file.file_type === 'optional-resource-pack',
+		) || []
+	)
 })
 
-const downloadAllFiles = computed(() => {
-	const files: DownloadableFile[] = []
+const hasAdditionalDownloads = computed(() => {
 	const hrefs = new Set<string>()
 
-	for (const file of [...selectedVersionDownloadFiles.value, ...props.dependencyDownloadFiles]) {
-		if (hrefs.has(file.href)) continue
-		hrefs.add(file.href)
-		files.push(file)
+	if (selectedPrimaryFile.value) {
+		hrefs.add(selectedPrimaryFile.value.url)
 	}
 
-	return files
-})
+	if (requiredResourcePackFile.value) {
+		hrefs.add(requiredResourcePackFile.value.url)
+	}
 
-const selectedVersionZipFilename = computed(() => {
-	if (!selectedVersion.value) return `${sanitizeFilename(props.project.title)}.zip`
+	for (const file of recommendedResourcePackFiles.value) {
+		hrefs.add(file.url)
+	}
 
-	return `${sanitizeFilename(props.project.title)} ${sanitizeFilename(
-		selectedVersion.value.version_number,
-	)}.zip`
+	for (const file of props.dependencyDownloadFiles) {
+		if (hrefs.has(file.href)) continue
+		hrefs.add(file.href)
+	}
+
+	return hrefs.size > 1
 })
 
 watch(
@@ -490,11 +483,16 @@ watch(
 	{ immediate: true },
 )
 
+watch([currentGameVersion, currentPlatform], () => {
+	userSelectedCompatibleVersionId.value = null
+})
+
 watch(
 	() => props.resetKey,
 	() => {
 		userSelectedGameVersion.value = props.initialGameVersion
 		userSelectedPlatform.value = props.initialPlatform
+		userSelectedCompatibleVersionId.value = null
 		showAllVersions.value = defaultShowAllVersions()
 		versionFilter.value = ''
 	},
@@ -513,115 +511,39 @@ function selectPlatform(platform?: string) {
 	emit('selectPlatform', platform)
 }
 
-function getDownloadUrl(url: string) {
-	return createProjectDownloadUrl(url, {
-		reason: props.downloadReason,
-		gameVersion: currentGameVersion.value ?? undefined,
-		loader: currentPlatform.value ?? undefined,
-	})
+function selectCompatibleVersion(version: Labrinth.Versions.v3.Version) {
+	userSelectedCompatibleVersionId.value = version.id
 }
 
-async function downloadSelectedVersionFiles() {
-	if (downloadingSelectedVersion.value || downloadAllFiles.value.length <= 1) return
-
-	downloadingSelectedVersion.value = true
-	const files = [...downloadAllFiles.value]
-	selectedVersionDownloadProgress.value = {
-		current: 0,
-		total: files.length,
-	}
-
-	try {
-		const zip = new JSZip()
-		const usedFilenames = new Set<string>()
-
-		for (const [index, file] of files.entries()) {
-			selectedVersionDownloadProgress.value = {
-				current: index + 1,
-				total: files.length,
-			}
-			const response = await fetch(file.href)
-
-			if (!response.ok) {
-				throw new Error(`Failed to download ${file.filename}`)
-			}
-
-			zip.file(uniqueFilename(file.filename, usedFilenames), await response.blob())
-		}
-
-		downloadBlob(
-			await zip.generateAsync({
-				type: 'blob',
-				mimeType: 'application/zip',
-			}),
-			selectedVersionZipFilename.value,
-		)
-		emit('download')
-	} catch (error) {
-		console.error('Failed to download selected version files:', error)
-		addNotification({
-			title: formatMessage(messages.downloadSelectedVersionFailedTitle),
-			text: formatMessage(messages.downloadSelectedVersionFailedText),
-			type: 'error',
-		})
-	} finally {
-		downloadingSelectedVersion.value = false
-		selectedVersionDownloadProgress.value = {
-			current: 0,
-			total: 0,
-		}
-	}
+function latestVersionByType(type: Labrinth.Versions.v3.VersionChannel) {
+	return filteredVersions.value
+		.filter((version) => version.version_type === type)
+		.reduce<Labrinth.Versions.v3.Version | undefined>((latest, version) => {
+			if (!latest || isNewerThan(version, latest)) return version
+			return latest
+		}, undefined)
 }
 
-function downloadBlob(blob: Blob, filename: string) {
-	const url = URL.createObjectURL(blob)
-	const link = document.createElement('a')
-
-	link.href = url
-	link.download = filename
-	document.body.appendChild(link)
-	link.click()
-	link.remove()
-	window.setTimeout(() => URL.revokeObjectURL(url), 0)
-}
-
-function sanitizeFilename(value: string) {
-	const sanitized = value
-		.replace(/[<>:"/\\|?*]/g, '')
-		.replace(/\s+/g, ' ')
-		.trim()
-
-	return sanitized || 'download'
-}
-
-function uniqueFilename(filename: string, usedFilenames: Set<string>) {
-	const sanitizedFilename = sanitizeFilename(filename)
-
-	if (!usedFilenames.has(sanitizedFilename)) {
-		usedFilenames.add(sanitizedFilename)
-		return sanitizedFilename
-	}
-
-	const extensionIndex = sanitizedFilename.lastIndexOf('.')
-	const basename =
-		extensionIndex > 0 ? sanitizedFilename.slice(0, extensionIndex) : sanitizedFilename
-	const extension = extensionIndex > 0 ? sanitizedFilename.slice(extensionIndex) : ''
-	let index = 2
-	let candidate = `${basename} (${index})${extension}`
-
-	while (usedFilenames.has(candidate)) {
-		index += 1
-		candidate = `${basename} (${index})${extension}`
-	}
-
-	usedFilenames.add(candidate)
-	return candidate
+function isNewerThan(
+	version: Labrinth.Versions.v3.Version,
+	comparison: Labrinth.Versions.v3.Version,
+) {
+	return dayjs(version.date_published).isAfter(dayjs(comparison.date_published))
 }
 
 function loaderLabel(loader: string) {
 	return formatMessage(getTagMessage(loader, 'loader') ?? messages.unknownLoader)
 }
 
+function comparePlatformOptions(a: ComboboxOption<string>, b: ComboboxOption<string>) {
+	const aRank = preferredPlatformRanks.get(a.value) ?? Number.MAX_SAFE_INTEGER
+	const bRank = preferredPlatformRanks.get(b.value) ?? Number.MAX_SAFE_INTEGER
+
+	if (aRank !== bRank) return aRank - bRank
+
+	return a.label.localeCompare(b.label)
+}
+
 function isReleaseGameVersion(version: string) {
 	if (releaseVersions.value.has(version)) return true
 	if (nonReleaseVersions.value.has(version)) return false
@@ -706,38 +628,14 @@ const messages = defineMessages({
 		id: 'project.download.game-version-unsupported-tooltip',
 		defaultMessage: '{title} does not support {gameVersion} for {platform}',
 	},
-	downloadVersion: {
-		id: 'project.download.download-version',
-		defaultMessage: 'Download {version}',
-	},
 	compatibleVersionTitle: {
 		id: 'project.download.compatible-version-title',
-		defaultMessage: 'Compatible version',
-	},
-	downloadAllSelectedVersion: {
-		id: 'project.download.selected-version-download-all',
-		defaultMessage: 'Download all (.zip)',
-	},
-	downloadingSelectedVersion: {
-		id: 'project.download.selected-version-downloading',
-		defaultMessage: 'Downloading... ({current}/{total})',
-	},
-	downloadSelectedVersionFailedTitle: {
-		id: 'project.download.selected-version-failed-title',
-		defaultMessage: 'Could not download version',
-	},
-	downloadSelectedVersionFailedText: {
-		id: 'project.download.selected-version-failed-text',
-		defaultMessage: 'One or more version files could not be downloaded. Please try again.',
+		defaultMessage: 'Compatible versions',
 	},
 	noGameVersionsFound: {
 		id: 'project.download.no-game-versions-found',
 		defaultMessage: 'No game versions found',
 	},
-	noVersionsAvailable: {
-		id: 'project.download.no-versions-available',
-		defaultMessage: 'No versions available for {gameVersion} and {platform}.',
-	},
 	platformUnsupportedTooltip: {
 		id: 'project.download.platform-unsupported-tooltip',
 		defaultMessage: '{title} does not support {platform} for {gameVersion}',
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/InstallWithModrinthApp.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/InstallWithModrinthApp.vue
index ba32eecce2..41480b0a67 100644
--- a/apps/frontend/src/components/ui/ProjectDownloadModal/InstallWithModrinthApp.vue
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/InstallWithModrinthApp.vue
@@ -6,29 +6,19 @@
 		"
 		class="modrinth-app-section contents"
 	>
-		<div class="flex flex-col">
-			<a
-				class="modrinth-app-install-card flex items-center justify-between gap-3 rounded-2xl border border-solid border-brand-highlight bg-surface-1 px-4 py-3 text-primary no-underline transition-[filter] hover:brightness-110"
-				:href="`modrinth://mod/${project.slug}`"
-				@click="installWithApp"
-			>
-				<span class="flex w-full min-w-0 flex-col gap-1">
-					<div class="flex items-center justify-between">
-						<span class="flex min-w-0 items-center gap-1.5 font-medium text-contrast">
-							Install with
-							<span class="text-brand">Modrinth App</span>
-							<ModrinthIcon aria-hidden="true" class="size-4 flex-shrink-0 text-brand" />
-						</span>
-						<ExternalIcon
-							aria-hidden="true"
-							class="size-4 flex-shrink-0 text-contrast transition-colors"
-						/>
-					</div>
-					<span class="truncate text-base text-contrast opacity-80">
-						{{ formatMessage(messages.installWithModrinthAppDescription) }}
+		<div class="flex flex-col items-center">
+			<ButtonStyled color="brand">
+				<a
+					class="!min-h-10 w-fit no-underline"
+					:href="`modrinth://mod/${project.slug}`"
+					@click="installWithApp"
+				>
+					<ModrinthIcon aria-hidden="true" />
+					<span class="min-w-0 text-center">
+						{{ formatMessage(messages.installWithModrinthApp) }}
 					</span>
-				</span>
-			</a>
+				</a>
+			</ButtonStyled>
 			<Accordion ref="getModrinthAppAccordion">
 				<nuxt-link class="mt-2 flex justify-center text-brand-blue hover:underline" to="/app">
 					{{ formatMessage(messages.dontHaveModrinthApp) }}
@@ -48,8 +38,8 @@
 
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
-import { ExternalIcon, ModrinthIcon } from '@modrinth/assets'
-import { defineMessages, useVIntl } from '@modrinth/ui'
+import { ModrinthIcon } from '@modrinth/assets'
+import { ButtonStyled, defineMessages, useVIntl } from '@modrinth/ui'
 import type { DisplayProjectType } from '@modrinth/utils'
 import { ref } from 'vue'
 
@@ -73,6 +63,10 @@ const tags = useGeneratedState()
 const getModrinthAppAccordion = ref<InstanceType<typeof Accordion> | null>(null)
 
 const messages = defineMessages({
+	installWithModrinthApp: {
+		id: 'project.download.install-with-app',
+		defaultMessage: 'Install with Modrinth App',
+	},
 	dontHaveModrinthApp: {
 		id: 'project.download.no-app',
 		defaultMessage: "Don't have Modrinth App?",
@@ -81,10 +75,6 @@ const messages = defineMessages({
 		id: 'project.download.manually',
 		defaultMessage: 'Download manually',
 	},
-	installWithModrinthAppDescription: {
-		id: 'project.download.install-with-app-description',
-		defaultMessage: 'Automatically install the correct version and dependencies.',
-	},
 })
 
 function installWithApp() {
@@ -95,14 +85,6 @@ function installWithApp() {
 </script>
 
 <style lang="scss" scoped>
-.modrinth-app-install-card {
-	background: radial-gradient(
-		ellipse 90% 250% at 50% 200%,
-		color-mix(in srgb, var(--color-brand-shadow) 50%, var(--surface-1)) -30%,
-		var(--surface-1) 72%
-	);
-}
-
 @media (hover: none) and (max-width: 767px) {
 	.modrinth-app-section {
 		display: none;
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/download-modal-provider.ts b/apps/frontend/src/components/ui/ProjectDownloadModal/download-modal-provider.ts
new file mode 100644
index 0000000000..6266005c2e
--- /dev/null
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/download-modal-provider.ts
@@ -0,0 +1,728 @@
+import type { AbstractModrinthClient, Labrinth } from '@modrinth/api-client'
+import {
+	type CdnDownloadReason,
+	createContext,
+	defineMessages,
+	fileTypeMessages,
+	injectModrinthClient,
+	useVIntl,
+} from '@modrinth/ui'
+import type { DisplayProjectType } from '@modrinth/utils'
+import { useQuery, useQueryClient } from '@tanstack/vue-query'
+import { type Component, computed, type ComputedRef } from 'vue'
+
+import { STALE_TIME } from '~/composables/queries/project'
+
+type DownloadModalProject = Omit<Labrinth.Projects.v2.Project, 'project_type'> & {
+	project_type: DisplayProjectType
+	actualProjectType: Labrinth.Projects.v2.ProjectType
+}
+
+type ResolvedContent = Labrinth.Content.v3.ResolvedContent | Labrinth.Content.v3.SkippedContent
+
+export interface DownloadDependencyRow {
+	key: string
+	name: string
+	icon?: string
+	fallbackIcon?: Component
+	hideIcon?: boolean
+	isAdditionalFile?: boolean
+	projectHref?: string
+	downloadHref?: string
+	filename?: string
+	fileSize?: number
+	metadataLabel?: string
+	typeLabel: string
+	unavailableTooltip: string
+	dependencies: DownloadDependencyRow[]
+}
+
+export interface DownloadableDependencyFile {
+	href: string
+	filename: string
+	name: string
+}
+
+export interface ProjectDownloadSelection {
+	currentGameVersion: string | null
+	currentPlatform: string | null
+	selectedVersion: Labrinth.Versions.v3.Version | null
+	selectedPrimaryFile: Labrinth.Versions.v3.VersionFile | null
+}
+
+interface DownloadModalProviderOptions {
+	project: ComputedRef<DownloadModalProject | null>
+	selectedVersion: ComputedRef<Labrinth.Versions.v3.Version | null>
+	selectedPrimaryFile: ComputedRef<Labrinth.Versions.v3.VersionFile | null>
+	currentGameVersion: ComputedRef<string | null>
+	currentPlatform: ComputedRef<string | null>
+	downloadReason: ComputedRef<CdnDownloadReason>
+	additionalFiles: ComputedRef<Labrinth.Versions.v3.VersionFile[]>
+}
+
+export interface DownloadModalProvider {
+	visibleDependencyRows: ComputedRef<DownloadDependencyRow[]>
+	duplicateDependencyRowsHidden: ComputedRef<boolean>
+	downloadRows: ComputedRef<DownloadDependencyRow[]>
+	recommendedRows: ComputedRef<DownloadDependencyRow[]>
+	downloadRowsLoaded: ComputedRef<boolean>
+	requiredResourcePackAdmonitionVisible: ComputedRef<boolean>
+	dependencyResourcePackAdmonitionVisible: ComputedRef<boolean>
+	downloadableDependencyFiles: ComputedRef<DownloadableDependencyFile[]>
+	downloadableDependencyFilesLoaded: ComputedRef<boolean>
+	preloadDependenciesForSelection: (selection: ProjectDownloadSelection) => Promise<void>
+}
+
+export const [injectDownloadModalProvider, provideDownloadModalContext] =
+	createContext<DownloadModalProvider>('DownloadModal')
+
+export function provideDownloadModalProvider(
+	options: DownloadModalProviderOptions,
+): DownloadModalProvider {
+	const client = injectModrinthClient()
+	const queryClient = useQueryClient()
+	const { createProjectDownloadUrl } = useCdnDownloadContext()
+	const { formatMessage } = useVIntl()
+	const tags = useGeneratedState()
+
+	const shouldResolveDependencies = computed(
+		() => !!options.project.value && !!options.selectedVersion.value,
+	)
+	const dependencyResolutionPreferences = computed(() =>
+		createResolutionPreferences(options.selectedVersion.value, options.currentPlatform.value),
+	)
+
+	const { data: dependencyResolution, isFetching: dependencyResolutionFetching } = useQuery({
+		...dependencyResolutionQueryOptions(
+			client,
+			options.project,
+			options.selectedVersion,
+			dependencyResolutionPreferences,
+		),
+		enabled: shouldResolveDependencies,
+	})
+
+	const visibleResolvedDependencies = computed<ResolvedContent[]>(() =>
+		visibleDependencies(dependencyResolution.value),
+	)
+
+	const dependencyVersionIds = computed(() =>
+		sortedUnique(
+			visibleResolvedDependencies.value
+				.filter((dependency) => !('reason' in dependency))
+				.map((dependency) => dependency.version_id)
+				.filter((versionId): versionId is string => !!versionId),
+		),
+	)
+
+	const { data: dependencyVersions, isFetching: dependencyVersionsFetching } = useQuery({
+		...dependencyVersionsQueryOptions(client, dependencyVersionIds),
+		enabled: computed(
+			() => shouldResolveDependencies.value && dependencyVersionIds.value.length > 0,
+		),
+	})
+
+	const dependencyVersionById = computed(() => {
+		const map = new Map<string, Labrinth.Versions.v3.Version>()
+		for (const version of dependencyVersions.value || []) {
+			if (!version) continue
+			map.set(version.id, version)
+		}
+		return map
+	})
+
+	const dependencyProjectIds = computed(() =>
+		sortedUnique(
+			visibleResolvedDependencies.value
+				.map((dependency) => dependency.project_id)
+				.filter((projectId): projectId is string => !!projectId),
+		),
+	)
+
+	const { data: dependencyProjects, isFetching: dependencyProjectsFetching } = useQuery({
+		...dependencyProjectsQueryOptions(client, dependencyProjectIds),
+		enabled: computed(
+			() => shouldResolveDependencies.value && dependencyProjectIds.value.length > 0,
+		),
+	})
+
+	const dependencyProjectById = computed(() => {
+		const map = new Map<string, Labrinth.Projects.v2.Project>()
+		for (const project of dependencyProjects.value || []) {
+			map.set(project.id, project)
+		}
+		return map
+	})
+
+	const dependenciesByParentVersionId = computed(() => {
+		const map = new Map<string, ResolvedContent[]>()
+
+		for (const dependency of visibleResolvedDependencies.value) {
+			if (!dependency.dependent_on_version_id) continue
+
+			const dependencies = map.get(dependency.dependent_on_version_id) || []
+			dependencies.push(dependency)
+			map.set(dependency.dependent_on_version_id, dependencies)
+		}
+
+		return map
+	})
+
+	const dependenciesLoaded = computed(() => {
+		if (!shouldResolveDependencies.value) return false
+		if (dependencyResolutionFetching.value) return false
+		if (!dependencyResolution.value) return false
+		if (
+			dependencyResolution.value.primary.version_id &&
+			dependencyResolution.value.primary.version_id !== options.selectedVersion.value?.id
+		) {
+			return false
+		}
+		if (
+			dependencyVersionsFetching.value ||
+			!dependencyVersionIds.value.every((versionId) => dependencyVersionById.value.has(versionId))
+		) {
+			return false
+		}
+		if (
+			dependencyProjectsFetching.value ||
+			!dependencyProjectIds.value.every((projectId) => dependencyProjectById.value.has(projectId))
+		) {
+			return false
+		}
+		return true
+	})
+
+	const selectedDownloadRowsLoaded = computed(() => {
+		if (!options.selectedPrimaryFile.value) return false
+		return dependenciesLoaded.value
+	})
+	const keepPreviousDownloadRows = computed(
+		() => shouldResolveDependencies.value && !!options.selectedPrimaryFile.value,
+	)
+
+	const resolvedDependencyRows = computed<DownloadDependencyRow[]>(() => {
+		if (!selectedDownloadRowsLoaded.value) return []
+
+		const primaryVersionId =
+			dependencyResolution.value?.primary.version_id || options.selectedVersion.value?.id
+		if (!primaryVersionId) return []
+
+		const dependencies = dependenciesByParentVersionId.value.get(primaryVersionId) || []
+
+		return dependencies.flatMap((dependency) => {
+			const row = createDependencyRow(dependency)
+			return row ? [row] : []
+		})
+	})
+
+	const visibleDependencyRows = computed<DownloadDependencyRow[]>((previous) => {
+		if (selectedDownloadRowsLoaded.value) {
+			return dedupeDependencyRows(resolvedDependencyRows.value)
+		}
+
+		return keepPreviousDownloadRows.value ? (previous ?? []) : []
+	})
+
+	const duplicateDependencyRowsHidden = computed<boolean>((previous) => {
+		if (selectedDownloadRowsLoaded.value) {
+			return (
+				hasSkippedDuplicateDependency(dependencyResolution.value) ||
+				hasDuplicateDependencyRows(resolvedDependencyRows.value)
+			)
+		}
+
+		return keepPreviousDownloadRows.value ? (previous ?? false) : false
+	})
+
+	const visibleRequiredResourcePackFiles = computed(() => {
+		if (options.project.value?.project_type !== 'datapack') return []
+
+		return options.additionalFiles.value.filter(
+			(file) => file.file_type === 'required-resource-pack',
+		)
+	})
+
+	const visibleRecommendedResourcePackFiles = computed(() => {
+		if (options.project.value?.project_type !== 'datapack') return []
+
+		return options.additionalFiles.value.filter(
+			(file) => file.file_type === 'optional-resource-pack',
+		)
+	})
+
+	const additionalFileRows = computed<DownloadDependencyRow[]>(() =>
+		selectedDownloadRowsLoaded.value
+			? visibleRequiredResourcePackFiles.value.map(createAdditionalFileRow)
+			: [],
+	)
+
+	const recommendedRows = computed<DownloadDependencyRow[]>(() =>
+		selectedDownloadRowsLoaded.value
+			? visibleRecommendedResourcePackFiles.value.map(createAdditionalFileRow)
+			: [],
+	)
+
+	function createAdditionalFileRow(file: Labrinth.Versions.v3.VersionFile): DownloadDependencyRow {
+		return {
+			key: `additional-file-${additionalFileKey(file)}`,
+			name: file.filename,
+			hideIcon: true,
+			isAdditionalFile: true,
+			downloadHref: getDownloadUrl(file.url),
+			filename: file.filename,
+			fileSize: file.size,
+			metadataLabel: fileTypeDisplayLabel(file.file_type),
+			typeLabel: fileTypeLabel(file.file_type),
+			unavailableTooltip: formatMessage(messages.unavailableFile),
+			dependencies: [],
+		}
+	}
+
+	const downloadRows = computed<DownloadDependencyRow[]>((previous) => {
+		if (selectedDownloadRowsLoaded.value) {
+			return [...visibleDependencyRows.value, ...additionalFileRows.value]
+		}
+
+		return keepPreviousDownloadRows.value ? (previous ?? []) : []
+	})
+
+	const downloadRowsLoaded = computed<boolean>((previous) => {
+		if (selectedDownloadRowsLoaded.value) return true
+		return keepPreviousDownloadRows.value ? (previous ?? false) : false
+	})
+
+	const requiredResourcePackAdmonitionVisible = computed(() => {
+		return selectedDownloadRowsLoaded.value && visibleRequiredResourcePackFiles.value.length > 0
+	})
+
+	const dependencyResourcePackAdmonitionVisible = computed(() => {
+		return selectedDownloadRowsLoaded.value && hasAdditionalFileRows(visibleDependencyRows.value)
+	})
+
+	const downloadableDependencyFiles = computed<DownloadableDependencyFile[]>(() =>
+		collectDownloadableDependencyFiles(visibleDependencyRows.value),
+	)
+
+	const downloadableDependencyFilesLoaded = computed(() => {
+		return selectedDownloadRowsLoaded.value
+	})
+
+	async function preloadDependenciesForSelection(selection: ProjectDownloadSelection) {
+		if (!options.project.value || !selection.selectedVersion) return
+
+		const preferences = createResolutionPreferences(
+			selection.selectedVersion,
+			selection.currentPlatform,
+		)
+
+		const resolution = await queryClient.ensureQueryData({
+			queryKey: [
+				'project-download-modal',
+				'content-resolve',
+				options.project.value.id,
+				selection.selectedVersion.id,
+				options.project.value.project_type,
+				preferences,
+			],
+			queryFn: () =>
+				client.labrinth.content_v3.resolve({
+					project_id: options.project.value!.id,
+					version_id: selection.selectedVersion!.id,
+					content_type: resolveContentType(options.project.value!.project_type),
+					selected: preferences,
+					target: preferences,
+				}),
+			staleTime: STALE_TIME,
+		})
+		const visible = visibleDependencies(resolution)
+		const versionIds = getDependencyVersionIds(visible)
+		const projectIds = getDependencyProjectIds(visible)
+
+		await Promise.all([
+			versionIds.length > 0
+				? queryClient.ensureQueryData({
+						queryKey: ['project-download-modal', 'resolved-versions', versionIds],
+						queryFn: () => client.labrinth.versions_v3.getVersions(versionIds),
+						staleTime: STALE_TIME,
+					})
+				: Promise.resolve(),
+			projectIds.length > 0
+				? queryClient.ensureQueryData({
+						queryKey: ['project-download-modal', 'resolved-projects', projectIds],
+						queryFn: () => client.labrinth.projects_v2.getMultiple(projectIds),
+						staleTime: STALE_TIME,
+					})
+				: Promise.resolve(),
+		])
+	}
+
+	function createDependencyRow(dependency: ResolvedContent): DownloadDependencyRow | null {
+		const versionId = dependency.version_id ?? undefined
+		const version = versionId ? dependencyVersionById.value.get(versionId) : undefined
+		const project = dependencyProjectById.value.get(dependency.project_id)
+		if (!project) return null
+
+		const primaryFile = primaryFileForVersion(version)
+		const unavailableTooltip =
+			'reason' in dependency && dependency.reason
+				? skippedReasonLabel(dependency.reason)
+				: formatMessage(messages.unavailableDependency)
+		const name = project.title
+		const metadataLabel = isProjectOnlyDependencyReference(dependency)
+			? formatMessage(messages.anyCompatibleDependency)
+			: (version?.version_number ?? formatMessage(messages.anyCompatibleDependency))
+		const childDependencies = (
+			versionId && dependenciesByParentVersionId.value.get(versionId)
+				? dependenciesByParentVersionId.value.get(versionId)!
+				: []
+		).flatMap((subDependency) => {
+			const row = createDependencyRow(subDependency)
+			return row ? [row] : []
+		})
+
+		return {
+			key: `${dependency.project_id}-${versionId ?? 'unresolved'}-${
+				'reason' in dependency ? dependency.reason : 'resolved'
+			}`,
+			name,
+			icon: project.icon_url ?? undefined,
+			projectHref: `/${project.project_type}/${project.slug || project.id}`,
+			downloadHref:
+				'reason' in dependency || !primaryFile ? undefined : getDownloadUrl(primaryFile.url),
+			filename: primaryFile?.filename,
+			fileSize: primaryFile?.size,
+			metadataLabel,
+			typeLabel: 'Required',
+			unavailableTooltip,
+			dependencies: [
+				...childDependencies,
+				...createRequiredResourcePackRowsForDependency(project, version, primaryFile),
+			],
+		}
+	}
+
+	function createRequiredResourcePackRowsForDependency(
+		project: Labrinth.Projects.v2.Project,
+		version: Labrinth.Versions.v3.Version | undefined,
+		primaryFile: Labrinth.Versions.v3.VersionFile | undefined,
+	): DownloadDependencyRow[] {
+		if (!version || !isDataPackProject(project)) return []
+
+		return version.files
+			.filter((file) => file !== primaryFile && file.file_type === 'required-resource-pack')
+			.map((file) => ({
+				key: `dependency-resource-pack-${version.id}-${additionalFileKey(file)}`,
+				name: file.filename,
+				hideIcon: true,
+				isAdditionalFile: true,
+				downloadHref: getDownloadUrl(file.url),
+				filename: file.filename,
+				fileSize: file.size,
+				metadataLabel: fileTypeDisplayLabel(file.file_type),
+				typeLabel: fileTypeLabel(file.file_type),
+				unavailableTooltip: formatMessage(messages.unavailableFile),
+				dependencies: [],
+			}))
+	}
+
+	function isDataPackProject(project: Labrinth.Projects.v2.Project) {
+		return (
+			project.project_type === 'datapack' ||
+			project.loaders.some((loader) => tags.value.loaderData.dataPackLoaders.includes(loader))
+		)
+	}
+
+	function isProjectOnlyDependencyReference(dependency: ResolvedContent) {
+		const parentVersionId = dependency.dependent_on_version_id
+		const parentVersion =
+			parentVersionId === options.selectedVersion.value?.id
+				? options.selectedVersion.value
+				: parentVersionId
+					? dependencyVersionById.value.get(parentVersionId)
+					: undefined
+
+		return !!parentVersion?.dependencies?.some(
+			(parentDependency) =>
+				parentDependency.project_id === dependency.project_id && !parentDependency.version_id,
+		)
+	}
+
+	function skippedReasonLabel(reason: Labrinth.Content.v3.SkippedContent['reason']) {
+		return (
+			{
+				already_installed: formatMessage(messages.alreadyInstalledDependency),
+				duplicate_project: formatMessage(messages.duplicateDependency),
+				conflicting_dependency: formatMessage(messages.conflictingDependency),
+				no_compatible_version: formatMessage(messages.noCompatibleDependency),
+				missing_version: formatMessage(messages.missingDependencyVersion),
+				quilt_fabric_api: formatMessage(messages.quiltFabricApiDependency),
+			}[reason] || formatMessage(messages.unavailableDependency)
+		)
+	}
+
+	function getDownloadUrl(url: string) {
+		return createProjectDownloadUrl(url, {
+			reason: options.downloadReason.value,
+			gameVersion: options.currentGameVersion.value ?? undefined,
+			loader: options.currentPlatform.value ?? undefined,
+		})
+	}
+
+	function fileTypeLabel(type?: Labrinth.Versions.v3.FileType | null) {
+		return formatMessage(fileTypeMessages[type ?? 'unknown'] ?? fileTypeMessages.unknown)
+	}
+
+	function fileTypeDisplayLabel(type?: Labrinth.Versions.v3.FileType | null) {
+		if (type === 'required-resource-pack') return formatMessage(messages.requiredResourcePackShort)
+
+		return fileTypeLabel(type)
+	}
+
+	const provider = {
+		visibleDependencyRows,
+		duplicateDependencyRowsHidden,
+		downloadRows,
+		recommendedRows,
+		downloadRowsLoaded,
+		requiredResourcePackAdmonitionVisible,
+		dependencyResourcePackAdmonitionVisible,
+		downloadableDependencyFiles,
+		downloadableDependencyFilesLoaded,
+		preloadDependenciesForSelection,
+	}
+
+	provideDownloadModalContext(provider)
+
+	return provider
+}
+
+function dependencyResolutionQueryOptions(
+	client: AbstractModrinthClient,
+	project: ComputedRef<DownloadModalProject | null>,
+	selectedVersion: ComputedRef<Labrinth.Versions.v3.Version | null>,
+	preferences: ComputedRef<Labrinth.Content.v3.ResolutionPreferences>,
+) {
+	return {
+		queryKey: computed(() => [
+			'project-download-modal',
+			'content-resolve',
+			project.value?.id,
+			selectedVersion.value?.id,
+			project.value?.project_type,
+			preferences.value,
+		]),
+		queryFn: () =>
+			client.labrinth.content_v3.resolve({
+				project_id: project.value!.id,
+				version_id: selectedVersion.value!.id,
+				content_type: resolveContentType(project.value!.project_type),
+				selected: preferences.value,
+				target: preferences.value,
+			}),
+		staleTime: STALE_TIME,
+	}
+}
+
+function dependencyVersionsQueryOptions(
+	client: AbstractModrinthClient,
+	versionIds: ComputedRef<string[]>,
+) {
+	return {
+		queryKey: computed(() => ['project-download-modal', 'resolved-versions', versionIds.value]),
+		queryFn: () => client.labrinth.versions_v3.getVersions(versionIds.value),
+		staleTime: STALE_TIME,
+	}
+}
+
+function dependencyProjectsQueryOptions(
+	client: AbstractModrinthClient,
+	projectIds: ComputedRef<string[]>,
+) {
+	return {
+		queryKey: computed(() => ['project-download-modal', 'resolved-projects', projectIds.value]),
+		queryFn: () => client.labrinth.projects_v2.getMultiple(projectIds.value),
+		staleTime: STALE_TIME,
+	}
+}
+
+function createResolutionPreferences(
+	version: Labrinth.Versions.v3.Version | null,
+	currentPlatform: string | null,
+): Labrinth.Content.v3.ResolutionPreferences {
+	return {
+		game_versions: version?.game_versions || [],
+		loaders: currentPlatform ? [currentPlatform] : version?.loaders || [],
+	}
+}
+
+function visibleDependencies(resolution?: Labrinth.Content.v3.ResolveContentPlan) {
+	return [...(resolution?.dependencies || []), ...(resolution?.skipped || [])].filter(
+		shouldShowDependency,
+	)
+}
+
+function getDependencyVersionIds(dependencies: ResolvedContent[]) {
+	return sortedUnique(
+		dependencies
+			.filter((dependency) => !('reason' in dependency))
+			.map((dependency) => dependency.version_id)
+			.filter((versionId): versionId is string => !!versionId),
+	)
+}
+
+function getDependencyProjectIds(dependencies: ResolvedContent[]) {
+	return sortedUnique(
+		dependencies
+			.map((dependency) => dependency.project_id)
+			.filter((projectId): projectId is string => !!projectId),
+	)
+}
+
+function primaryFileForVersion(version?: Labrinth.Versions.v3.Version) {
+	return version?.files?.find((file) => file.primary) || version?.files?.[0]
+}
+
+function shouldShowDependency(dependency: ResolvedContent) {
+	return !(
+		'reason' in dependency && ['duplicate_project', 'quilt_fabric_api'].includes(dependency.reason)
+	)
+}
+
+function hasSkippedDuplicateDependency(resolution?: Labrinth.Content.v3.ResolveContentPlan) {
+	return (resolution?.skipped || []).some((dependency) => dependency.reason === 'duplicate_project')
+}
+
+function resolveContentType(projectType: DisplayProjectType): Labrinth.Content.v3.ContentType {
+	return ['mod', 'plugin', 'datapack', 'resourcepack', 'shader', 'modpack'].includes(projectType)
+		? (projectType as Labrinth.Content.v3.ContentType)
+		: 'mod'
+}
+
+function additionalFileKey(file: Labrinth.Versions.v3.VersionFile) {
+	return file.hashes?.sha1 ?? file.filename
+}
+
+function dedupeDependencyRows(
+	rows: DownloadDependencyRow[],
+	seenDependencies = new Set<string>(),
+): DownloadDependencyRow[] {
+	return rows.flatMap((row) => {
+		const identity = dependencyRowIdentity(row)
+		if (seenDependencies.has(identity)) return []
+
+		seenDependencies.add(identity)
+
+		return [
+			{
+				...row,
+				dependencies: dedupeDependencyRows(row.dependencies, seenDependencies),
+			},
+		]
+	})
+}
+
+function dependencyRowIdentity(row: DownloadDependencyRow) {
+	return row.projectHref ?? row.downloadHref ?? row.key
+}
+
+function hasDuplicateDependencyRows(
+	rows: DownloadDependencyRow[],
+	seenDependencies = new Set<string>(),
+): boolean {
+	for (const row of rows) {
+		const rowId = dependencyRowIdentity(row)
+		if (seenDependencies.has(rowId)) return true
+		seenDependencies.add(rowId)
+		if (hasDuplicateDependencyRows(row.dependencies, seenDependencies)) return true
+	}
+
+	return false
+}
+
+function hasAdditionalFileRows(rows: DownloadDependencyRow[]): boolean {
+	for (const row of rows) {
+		if (row.isAdditionalFile) return true
+		if (hasAdditionalFileRows(row.dependencies)) return true
+	}
+
+	return false
+}
+
+function collectDownloadableDependencyFiles(
+	rows: DownloadDependencyRow[],
+	seenHrefs = new Set<string>(),
+): DownloadableDependencyFile[] {
+	const files: DownloadableDependencyFile[] = []
+
+	for (const row of rows) {
+		if (row.downloadHref && !seenHrefs.has(row.downloadHref)) {
+			seenHrefs.add(row.downloadHref)
+			files.push({
+				href: row.downloadHref,
+				filename: row.filename || filenameFromUrl(row.downloadHref),
+				name: row.name,
+			})
+		}
+
+		files.push(...collectDownloadableDependencyFiles(row.dependencies, seenHrefs))
+	}
+
+	return files
+}
+
+function filenameFromUrl(url: string) {
+	try {
+		const filename = new URL(url).pathname.split('/').pop()
+		return filename ? decodeURIComponent(filename) : 'dependency.jar'
+	} catch {
+		return 'dependency.jar'
+	}
+}
+
+function sortedUnique(values: string[]) {
+	return [...new Set(values)].sort()
+}
+
+const messages = defineMessages({
+	anyCompatibleDependency: {
+		id: 'project.download.dependency-any-compatible',
+		defaultMessage: 'Any compatible',
+	},
+	alreadyInstalledDependency: {
+		id: 'project.download.dependency-already-installed',
+		defaultMessage: 'This dependency is already installed',
+	},
+	conflictingDependency: {
+		id: 'project.download.dependency-conflicting',
+		defaultMessage: 'This dependency conflicts with another dependency',
+	},
+	duplicateDependency: {
+		id: 'project.download.dependency-duplicate',
+		defaultMessage: 'This dependency is already included',
+	},
+	missingDependencyVersion: {
+		id: 'project.download.dependency-missing-version',
+		defaultMessage: 'This dependency version is unavailable',
+	},
+	noCompatibleDependency: {
+		id: 'project.download.dependency-no-compatible-version',
+		defaultMessage: 'No compatible version is available for this dependency',
+	},
+	quiltFabricApiDependency: {
+		id: 'project.download.dependency-quilt-fabric-api',
+		defaultMessage: 'Fabric API is skipped for Quilt',
+	},
+	unavailableDependency: {
+		id: 'project.download.dependency-unavailable',
+		defaultMessage: 'This dependency cannot be downloaded',
+	},
+	unavailableFile: {
+		id: 'project.download.file-unavailable',
+		defaultMessage: 'This file cannot be downloaded',
+	},
+	requiredResourcePackShort: {
+		id: 'project.download.required-resource-pack-short',
+		defaultMessage: 'Resource pack',
+	},
+})
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/index.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/index.vue
index 27df2cd9e9..fd806fa9ad 100644
--- a/apps/frontend/src/components/ui/ProjectDownloadModal/index.vue
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<NewModal ref="modal" :on-show="onShow" :on-hide="onHide" width="544px">
+	<NewModal ref="modal" :on-show="onShow" :on-hide="onHide" width="544px" actions-divider>
 		<template #title>
 			<template v-if="project">
 				<Avatar :src="project.icon_url" :alt="project.title" class="icon" size="32px" />
@@ -19,6 +19,7 @@
 					:project="project"
 					:versions="versions"
 					:dependency-download-files="dependencyDownloadFiles"
+					:download-data-loaded="downloadRowsLoaded"
 					:download-reason="downloadReason"
 					:initial-game-version="initialGameVersion"
 					:initial-platform="initialPlatform"
@@ -27,20 +28,11 @@
 					:reset-key="downloadProjectResetKey"
 					@select-game-version="selectGameVersion"
 					@select-platform="selectPlatform"
-					@update:selection="projectDownloadSelection = $event"
+					@update:selection="updateProjectDownloadSelection"
 					@download="onDownload"
 				/>
 				<div class="flex flex-col gap-4">
-					<DownloadDependencies
-						:project="project"
-						:selected-version="selectedVersion"
-						:current-game-version="currentGameVersion"
-						:current-platform="currentPlatform"
-						:download-reason="downloadReason"
-						:additional-files="additionalFiles"
-						@update:downloadable-files="dependencyDownloadFiles = $event"
-						@download="onDownload"
-					/>
+					<DownloadDependencies @download="onDownload" />
 				</div>
 				<ServersPromo
 					v-if="flags.showProjectPageDownloadModalServersPromo"
@@ -54,16 +46,61 @@
 				/>
 			</div>
 		</template>
+		<template v-if="showDependencyDownloadActions" #actions>
+			<div class="flex flex-wrap justify-end gap-2 p-2">
+				<ButtonStyled>
+					<button
+						class="!shadow-none"
+						:disabled="!!downloadingActionType || !dependencyDownloadFilesLoaded"
+						@click="downloadSelectedVersionZip"
+					>
+						<SpinnerIcon
+							v-if="downloadingActionType === 'zip'"
+							aria-hidden="true"
+							class="animate-spin"
+						/>
+						<DownloadIcon v-else aria-hidden="true" />
+						{{ formatMessage(messages.downloadAsZip) }}
+					</button>
+				</ButtonStyled>
+				<JoinedButtons
+					v-if="hasRecommendedDownloadFiles"
+					color="brand"
+					:actions="downloadWithRecommendedActions"
+					:disabled="!!downloadingActionType || !dependencyDownloadFilesLoaded"
+				/>
+				<ButtonStyled v-else color="brand">
+					<button
+						class="!shadow-none"
+						:disabled="!!downloadingActionType || !dependencyDownloadFilesLoaded"
+						@click="downloadFilesWithDependencies"
+					>
+						<SpinnerIcon
+							v-if="downloadingActionType === 'dependencies'"
+							aria-hidden="true"
+							class="animate-spin"
+						/>
+						<DownloadIcon v-else aria-hidden="true" />
+						{{ formatMessage(messages.downloadWithDependencies) }}
+					</button>
+				</ButtonStyled>
+			</div>
+		</template>
 	</NewModal>
 </template>
 
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
+import { DownloadIcon, SpinnerIcon } from '@modrinth/assets'
 import {
 	Avatar,
+	ButtonStyled,
 	type CdnDownloadReason,
 	defineMessages,
 	injectModrinthClient,
+	injectNotificationManager,
+	type JoinedButtonAction,
+	JoinedButtons,
 	NewModal,
 	ServersPromo,
 	truncatedTooltip,
@@ -71,13 +108,16 @@ import {
 	useVIntl,
 } from '@modrinth/ui'
 import type { DisplayProjectType } from '@modrinth/utils'
-import { useQuery } from '@tanstack/vue-query'
+import { useQuery, useQueryClient } from '@tanstack/vue-query'
+import dayjs from 'dayjs'
+import JSZip from 'jszip'
 import { computed, nextTick, onUnmounted, ref, watch } from 'vue'
 
 import { navigateTo } from '#app'
 import { saveFeatureFlags } from '~/composables/featureFlags.ts'
 import { STALE_TIME, STALE_TIME_LONG } from '~/composables/queries/project'
 
+import { provideDownloadModalProvider } from './download-modal-provider'
 import DownloadDependencies from './DownloadDependencies.vue'
 import DownloadProject from './DownloadProject.vue'
 import InstallWithModrinthApp from './InstallWithModrinthApp.vue'
@@ -99,6 +139,12 @@ type DownloadableFile = {
 	filename: string
 }
 
+type DownloadedFile = DownloadableFile & {
+	blob: Blob
+}
+
+type DownloadActionType = 'zip' | 'dependencies' | 'recommended'
+
 type NewModalRef = {
 	show: (event?: MouseEvent) => void
 	hide: () => void
@@ -138,19 +184,31 @@ const route = useRoute()
 const flags = useFeatureFlags()
 const tags = useGeneratedState()
 const client = injectModrinthClient()
+const queryClient = useQueryClient()
+const { createProjectDownloadUrl } = useCdnDownloadContext()
+const { addNotification } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 const debug = useDebugLogger('DownloadModal')
 
 const modal = ref<NewModalRef | null>(null)
 const downloadTitleRef = ref<HTMLElement | null>(null)
+const modalOpening = ref(false)
 const modalOpen = ref(false)
 const showProjectId = ref<string | null>(null)
 const showOptions = ref<ResolvedProjectDownloadModalShowOptions>(getDefaultShowOptions())
 const downloadProjectResetKey = ref(0)
 const projectDownloadSelection = ref<ProjectDownloadSelection>(getDefaultProjectDownloadSelection())
-const dependencyDownloadFiles = ref<DownloadableFile[]>([])
+const pendingRouteSelection = ref({
+	gameVersion: getStringQueryValue(route.query.version),
+	platform: getStringQueryValue(route.query.loader),
+})
+const downloadingActionType = ref<DownloadActionType | null>(null)
 const MODAL_CLOSE_STATE_RESET_MS = 350
+const DOWNLOAD_URL_REVOKE_MS = 60000
+const DOWNLOAD_STAGGER_MS = 500
 let closeStateResetTimeout: ReturnType<typeof setTimeout> | null = null
+let modalShowRequestId = 0
+let unmounted = false
 
 const routeProjectId = computed(() => showProjectId.value ?? props.projectId ?? null)
 
@@ -183,11 +241,7 @@ const downloadTitle = computed(() => {
 })
 
 const versionsEnabled = ref(false)
-const {
-	data: versionsV3,
-	error: _versionsV3Error,
-	isFetching: versionsV3Loading,
-} = useQuery({
+const { data: versionsV3, isFetching: versionsV3Loading } = useQuery({
 	queryKey: computed(() => ['project', resolvedProjectId.value, 'versions', 'v3']),
 	queryFn: () =>
 		client.labrinth.versions_v3.getProjectVersions(resolvedProjectId.value!, {
@@ -198,24 +252,9 @@ const {
 	enabled: computed(() => !!resolvedProjectId.value && versionsEnabled.value),
 })
 
-const versions = computed<Labrinth.Versions.v3.Version[]>(() => {
-	const isModpack =
-		project.value?.actualProjectType === 'modpack' || project.value?.project_type === 'modpack'
-
-	return (versionsV3.value ?? []).map((version) => {
-		const files = Array.isArray(version.files) ? version.files : []
-		const gameVersions = Array.isArray(version.game_versions) ? version.game_versions : []
-		const loaders = Array.isArray(version.loaders) ? version.loaders : []
-		const mrpackLoaders = Array.isArray(version.mrpack_loaders) ? version.mrpack_loaders : []
-
-		return {
-			...version,
-			files,
-			game_versions: gameVersions,
-			loaders: isModpack && mrpackLoaders.length ? mrpackLoaders : loaders,
-		}
-	})
-})
+const versions = computed<Labrinth.Versions.v3.Version[]>(() =>
+	normalizeVersionsForDownload(versionsV3.value ?? []),
+)
 
 const initialGameVersion = computed(() => {
 	const version = route.query.version
@@ -238,6 +277,88 @@ const additionalFiles = computed(() => {
 	return selectedVersion.value.files.filter((file) => file !== selectedPrimaryFile.value)
 })
 
+const hasRequiredResourcePackAdditionalFile = computed(() =>
+	additionalFiles.value.some((file) => file.file_type === 'required-resource-pack'),
+)
+
+const downloadModalProvider = provideDownloadModalProvider({
+	project,
+	selectedVersion,
+	selectedPrimaryFile,
+	currentGameVersion,
+	currentPlatform,
+	downloadReason: computed(() => props.downloadReason),
+	additionalFiles,
+})
+const dependencyDownloadFiles = downloadModalProvider.downloadableDependencyFiles
+const dependencyDownloadFilesLoaded = downloadModalProvider.downloadableDependencyFilesLoaded
+const downloadRowsLoaded = downloadModalProvider.downloadRowsLoaded
+
+const selectedVersionDownloadFiles = computed<DownloadableFile[]>(() => {
+	if (!selectedVersion.value) return []
+
+	return selectedVersion.value.files
+		.filter(
+			(file) => file === selectedPrimaryFile.value || file.file_type === 'required-resource-pack',
+		)
+		.map((file) => ({
+			href: createProjectDownloadUrl(file.url, {
+				reason: props.downloadReason,
+				gameVersion: currentGameVersion.value ?? undefined,
+				loader: currentPlatform.value ?? undefined,
+			}),
+			filename: file.filename,
+		}))
+})
+
+const recommendedDownloadFiles = computed<DownloadableFile[]>(() => {
+	if (project.value?.project_type !== 'datapack' || !selectedVersion.value) return []
+
+	return selectedVersion.value.files
+		.filter(
+			(file) => file !== selectedPrimaryFile.value && file.file_type === 'optional-resource-pack',
+		)
+		.map((file) => ({
+			href: createProjectDownloadUrl(file.url, {
+				reason: props.downloadReason,
+				gameVersion: currentGameVersion.value ?? undefined,
+				loader: currentPlatform.value ?? undefined,
+			}),
+			filename: file.filename,
+		}))
+})
+
+const hasRecommendedDownloadFiles = computed(() => recommendedDownloadFiles.value.length > 0)
+
+const showDependencyDownloadActions = computed(
+	() =>
+		selectedVersionDownloadFiles.value.length > 0 &&
+		(dependencyDownloadFiles.value.length > 0 ||
+			hasRequiredResourcePackAdditionalFile.value ||
+			hasRecommendedDownloadFiles.value),
+)
+
+const downloadWithRecommendedActions = computed<JoinedButtonAction[]>(() => [
+	{
+		id: 'download-with-dependencies',
+		label: formatMessage(messages.downloadWithDependencies),
+		icon: downloadingActionType.value === 'dependencies' ? SpinnerIcon : DownloadIcon,
+		action: () => void downloadFilesWithDependencies(),
+	},
+	{
+		id: 'download-with-recommended',
+		label: formatMessage(messages.downloadWithRecommended),
+		icon: DownloadIcon,
+		action: () => void downloadFilesWithRecommended(),
+	},
+	{
+		id: 'download-with-recommended-zip',
+		label: formatMessage(messages.downloadWithRecommendedAsZip),
+		icon: DownloadIcon,
+		action: () => void downloadSelectedVersionZip(),
+	},
+])
+
 watch(projectV2Error, (error) => {
 	if (error) {
 		debug('project query failed', error)
@@ -249,6 +370,30 @@ const messages = defineMessages({
 		id: 'project.download.title',
 		defaultMessage: 'Download {title}',
 	},
+	downloadAsZip: {
+		id: 'project.download.download-as-zip',
+		defaultMessage: 'Download as .zip',
+	},
+	downloadWithDependencies: {
+		id: 'project.download.download-with-dependencies',
+		defaultMessage: 'Download with deps',
+	},
+	downloadWithRecommended: {
+		id: 'project.download.download-with-recommended',
+		defaultMessage: 'Download with recommended',
+	},
+	downloadWithRecommendedAsZip: {
+		id: 'project.download.download-with-recommended-as-zip',
+		defaultMessage: 'Download with recommended as .zip',
+	},
+	downloadZipFailedTitle: {
+		id: 'project.download.zip-failed-title',
+		defaultMessage: 'Could not download files',
+	},
+	downloadZipFailedText: {
+		id: 'project.download.zip-failed-text',
+		defaultMessage: 'One or more files could not be downloaded. Please try again.',
+	},
 })
 
 function getProjectTypeForUrl(
@@ -278,15 +423,27 @@ function updateDownloadQuery({
 	platform: string | null
 }) {
 	if (!props.updateRouteSelection) return
+	const nextGameVersion =
+		gameVersion ??
+		pendingRouteSelection.value.gameVersion ??
+		getStringQueryValue(route.query.version)
+	const nextPlatform =
+		platform ?? pendingRouteSelection.value.platform ?? getStringQueryValue(route.query.loader)
+
+	pendingRouteSelection.value = {
+		gameVersion: nextGameVersion,
+		platform: nextPlatform,
+	}
+
 	navigateTo(
 		{
 			query: {
 				...route.query,
-				...(gameVersion && {
-					version: gameVersion,
+				...(nextGameVersion && {
+					version: nextGameVersion,
 				}),
-				...(platform && {
-					loader: platform,
+				...(nextPlatform && {
+					loader: nextPlatform,
 				}),
 			},
 			hash: route.hash,
@@ -298,17 +455,25 @@ function updateDownloadQuery({
 function selectGameVersion(gameVersion: string) {
 	updateDownloadQuery({
 		gameVersion,
-		platform: currentPlatform.value,
+		platform: null,
 	})
 }
 
 function selectPlatform(platform: string) {
 	updateDownloadQuery({
-		gameVersion: currentGameVersion.value,
+		gameVersion: null,
 		platform,
 	})
 }
 
+function updateProjectDownloadSelection(selection: ProjectDownloadSelection) {
+	projectDownloadSelection.value = selection
+	pendingRouteSelection.value = {
+		gameVersion: selection.currentGameVersion,
+		platform: selection.currentPlatform,
+	}
+}
+
 function onShow() {
 	clearCloseStateResetTimeout()
 	modalOpen.value = true
@@ -337,22 +502,37 @@ async function show(
 	event?: MouseEvent,
 	options: ProjectDownloadModalShowOptions = {},
 ): Promise<void> {
-	if (!modal.value || modalOpen.value) return
-	await waitForCloseStateReset()
-	if (!modal.value || modalOpen.value) return
-	showOptions.value = {
-		...getDefaultShowOptions(),
-		...options,
+	if (!modal.value || modalOpening.value || modalOpen.value) return
+	const showRequestId = ++modalShowRequestId
+	modalOpening.value = true
+
+	try {
+		await waitForCloseStateReset()
+		if (!isActiveShowRequest(showRequestId)) return
+		showOptions.value = {
+			...getDefaultShowOptions(),
+			...options,
+		}
+		showProjectId.value = showOptions.value.projectId ?? null
+		await nextTick()
+		if (!isActiveShowRequest(showRequestId)) return
+		if (!(await loadProjectForModal(!!showOptions.value.projectId))) return
+		if (!isActiveShowRequest(showRequestId)) return
+		resetDownloadState()
+		await preloadRouteSelectedDownload()
+		if (!isActiveShowRequest(showRequestId)) return
+		modalOpen.value = true
+		modal.value.show(event)
+	} finally {
+		if (modalShowRequestId === showRequestId) {
+			modalOpening.value = false
+		}
 	}
-	showProjectId.value = showOptions.value.projectId ?? null
-	await nextTick()
-	if (!(await loadProjectForModal(!!showOptions.value.projectId))) return
-	resetDownloadState()
-	modalOpen.value = true
-	modal.value.show(event)
 }
 
 function hide() {
+	modalShowRequestId += 1
+	modalOpening.value = false
 	if (!modal.value || !modalOpen.value) return
 	modal.value?.hide()
 }
@@ -361,6 +541,199 @@ function onDownload() {
 	emit('download')
 }
 
+async function downloadSelectedVersionZip() {
+	if (downloadingActionType.value || !dependencyDownloadFilesLoaded.value) return
+
+	downloadingActionType.value = 'zip'
+	const files = dedupeDownloadFiles([
+		...selectedVersionDownloadFiles.value,
+		...dependencyDownloadFiles.value,
+		...recommendedDownloadFiles.value,
+	])
+
+	try {
+		const zip = new JSZip()
+		const usedFilenames = new Set<string>()
+		const downloadedFiles = await downloadFileBlobs(files)
+
+		for (const file of downloadedFiles) {
+			zip.file(uniqueFilename(file.filename, usedFilenames), file.blob)
+		}
+
+		downloadBlob(
+			await zip.generateAsync({
+				type: 'blob',
+				mimeType: 'application/zip',
+			}),
+			selectedVersionZipFilename(),
+		)
+		emit('download')
+	} catch (error) {
+		console.error('Failed to download selected version files:', error)
+		addNotification({
+			title: formatMessage(messages.downloadZipFailedTitle),
+			text: formatMessage(messages.downloadZipFailedText),
+			type: 'error',
+		})
+	} finally {
+		downloadingActionType.value = null
+	}
+}
+
+async function downloadFilesWithDependencies() {
+	if (downloadingActionType.value || !dependencyDownloadFilesLoaded.value) return
+
+	downloadingActionType.value = 'dependencies'
+
+	try {
+		const files = dedupeDownloadFiles([
+			...selectedVersionDownloadFiles.value,
+			...dependencyDownloadFiles.value,
+		])
+
+		await downloadFiles(files)
+
+		emit('download')
+	} catch (error) {
+		console.error('Failed to download selected version files:', error)
+		addNotification({
+			title: formatMessage(messages.downloadZipFailedTitle),
+			text: formatMessage(messages.downloadZipFailedText),
+			type: 'error',
+		})
+	} finally {
+		downloadingActionType.value = null
+	}
+}
+
+async function downloadFilesWithRecommended() {
+	if (downloadingActionType.value || !dependencyDownloadFilesLoaded.value) return
+
+	downloadingActionType.value = 'recommended'
+
+	try {
+		const files = dedupeDownloadFiles([
+			...selectedVersionDownloadFiles.value,
+			...dependencyDownloadFiles.value,
+			...recommendedDownloadFiles.value,
+		])
+
+		await downloadFiles(files)
+
+		emit('download')
+	} catch (error) {
+		console.error('Failed to download selected version files:', error)
+		addNotification({
+			title: formatMessage(messages.downloadZipFailedTitle),
+			text: formatMessage(messages.downloadZipFailedText),
+			type: 'error',
+		})
+	} finally {
+		downloadingActionType.value = null
+	}
+}
+
+async function downloadFileBlobs(files: DownloadableFile[]): Promise<DownloadedFile[]> {
+	return Promise.all(files.map((file) => downloadFileBlob(file)))
+}
+
+async function downloadFileBlob(file: DownloadableFile): Promise<DownloadedFile> {
+	const response = await fetch(file.href)
+
+	if (!response.ok) {
+		throw new Error(`Failed to download ${file.filename}`)
+	}
+
+	return {
+		...file,
+		blob: await response.blob(),
+	}
+}
+
+async function downloadFiles(files: DownloadableFile[]) {
+	await Promise.all(
+		files.map(async (file, index) => {
+			await delay(DOWNLOAD_STAGGER_MS * index)
+			downloadFileLink(file)
+		}),
+	)
+}
+
+function dedupeDownloadFiles(files: DownloadableFile[]) {
+	const result: DownloadableFile[] = []
+	const hrefs = new Set<string>()
+
+	for (const file of files) {
+		if (hrefs.has(file.href)) continue
+		hrefs.add(file.href)
+		result.push(file)
+	}
+
+	return result
+}
+
+function downloadBlob(blob: Blob, filename: string) {
+	const url = URL.createObjectURL(blob)
+	const link = document.createElement('a')
+
+	link.href = url
+	link.download = filename
+	document.body.appendChild(link)
+	link.click()
+	link.remove()
+	window.setTimeout(() => URL.revokeObjectURL(url), DOWNLOAD_URL_REVOKE_MS)
+}
+
+function downloadFileLink(file: DownloadableFile) {
+	const link = document.createElement('a')
+	link.href = file.href
+	link.download = file.filename
+	document.body.appendChild(link)
+	link.click()
+	link.remove()
+}
+
+function selectedVersionZipFilename() {
+	if (!project.value || !selectedVersion.value) return 'download.zip'
+
+	return `${sanitizeFilename(project.value.title)} ${sanitizeFilename(
+		selectedVersion.value.version_number,
+	)}-EXTRACT_ME.zip`
+}
+
+function sanitizeFilename(value: string) {
+	const sanitized = value
+		.replace(/[<>:"/\\|?*]/g, '')
+		.replace(/\s+/g, ' ')
+		.trim()
+
+	return sanitized || 'download'
+}
+
+function uniqueFilename(filename: string, usedFilenames: Set<string>) {
+	const sanitizedFilename = sanitizeFilename(filename)
+
+	if (!usedFilenames.has(sanitizedFilename)) {
+		usedFilenames.add(sanitizedFilename)
+		return sanitizedFilename
+	}
+
+	const extensionIndex = sanitizedFilename.lastIndexOf('.')
+	const basename =
+		extensionIndex > 0 ? sanitizedFilename.slice(0, extensionIndex) : sanitizedFilename
+	const extension = extensionIndex > 0 ? sanitizedFilename.slice(extensionIndex) : ''
+	let index = 2
+	let candidate = `${basename} (${index})${extension}`
+
+	while (usedFilenames.has(candidate)) {
+		index += 1
+		candidate = `${basename} (${index})${extension}`
+	}
+
+	usedFilenames.add(candidate)
+	return candidate
+}
+
 function getDefaultProjectDownloadSelection(): ProjectDownloadSelection {
 	return {
 		currentGameVersion: null,
@@ -378,6 +751,19 @@ function getDefaultShowOptions(): ResolvedProjectDownloadModalShowOptions {
 	}
 }
 
+function getStringQueryValue(value: unknown) {
+	return typeof value === 'string' ? value : null
+}
+
+function shouldPreloadRouteSelectedDownload() {
+	return (
+		props.useRouteHash &&
+		!showOptions.value.projectId &&
+		!!getStringQueryValue(route.query.version) &&
+		!!getStringQueryValue(route.query.loader)
+	)
+}
+
 function clearCloseStateResetTimeout() {
 	if (!closeStateResetTimeout) return
 	clearTimeout(closeStateResetTimeout)
@@ -386,7 +772,11 @@ function clearCloseStateResetTimeout() {
 
 async function waitForCloseStateReset() {
 	if (!closeStateResetTimeout) return
-	await new Promise((resolve) => setTimeout(resolve, MODAL_CLOSE_STATE_RESET_MS))
+	await delay(MODAL_CLOSE_STATE_RESET_MS)
+}
+
+async function delay(ms: number) {
+	await new Promise((resolve) => setTimeout(resolve, ms))
 }
 
 async function loadProjectForModal(forceRefetch: boolean) {
@@ -397,9 +787,127 @@ async function loadProjectForModal(forceRefetch: boolean) {
 	return !!data
 }
 
+async function loadVersionsForModal() {
+	if (!resolvedProjectId.value) return null
+	versionsEnabled.value = true
+	if (versionsV3.value) return versions.value
+
+	const data = await queryClient.ensureQueryData({
+		queryKey: ['project', resolvedProjectId.value, 'versions', 'v3'],
+		queryFn: () =>
+			client.labrinth.versions_v3.getProjectVersions(resolvedProjectId.value!, {
+				include_changelog: false,
+				apiVersion: 3,
+			}),
+		staleTime: STALE_TIME_LONG,
+	})
+
+	return Array.isArray(data) ? normalizeVersionsForDownload(data) : null
+}
+
+async function preloadRouteSelectedDownload() {
+	if (!shouldPreloadRouteSelectedDownload()) return
+
+	try {
+		const routeVersions = await loadVersionsForModal()
+		if (!routeVersions) return
+
+		const selection = getRouteSelectedDownloadSelection(routeVersions)
+		if (!selection) return
+
+		await preloadDependenciesForSelection(selection)
+	} catch (error) {
+		debug('failed to preload selected route download', error)
+	}
+}
+
+function getRouteSelectedDownloadSelection(
+	versionList: Labrinth.Versions.v3.Version[] = versions.value,
+): ProjectDownloadSelection | null {
+	const gameVersion = initialGameVersion.value
+	const platform = initialPlatform.value
+	const version = getSelectedRouteVersion(gameVersion, platform, versionList)
+	const primaryFile = version?.files?.find((file) => file.primary) || version?.files?.[0] || null
+
+	if (!gameVersion || !platform || !version || !primaryFile) return null
+
+	return {
+		currentGameVersion: gameVersion,
+		currentPlatform: platform,
+		selectedVersion: version,
+		selectedPrimaryFile: primaryFile,
+	}
+}
+
+function getSelectedRouteVersion(
+	gameVersion: string | null,
+	platform: string | null,
+	versionList: Labrinth.Versions.v3.Version[],
+) {
+	if (!gameVersion || !platform || !project.value) return null
+
+	const filteredVersions = versionList.filter((version) => {
+		const matchesPlatform =
+			project.value?.project_type === 'resourcepack' ||
+			(!!platform && version.loaders.includes(platform))
+
+		return version.game_versions.includes(gameVersion) && matchesPlatform
+	})
+
+	return (
+		latestVersionByType(filteredVersions, 'release') ||
+		latestVersionByType(filteredVersions, 'beta') ||
+		latestVersionByType(filteredVersions, 'alpha') ||
+		null
+	)
+}
+
+function normalizeVersionsForDownload(
+	versionList: Labrinth.Versions.v3.Version[],
+): Labrinth.Versions.v3.Version[] {
+	const isModpack =
+		project.value?.actualProjectType === 'modpack' || project.value?.project_type === 'modpack'
+
+	return versionList.map((version) => {
+		const files = Array.isArray(version.files) ? version.files : []
+		const gameVersions = Array.isArray(version.game_versions) ? version.game_versions : []
+		const loaders = Array.isArray(version.loaders) ? version.loaders : []
+		const mrpackLoaders = Array.isArray(version.mrpack_loaders) ? version.mrpack_loaders : []
+
+		return {
+			...version,
+			files,
+			game_versions: gameVersions,
+			loaders: isModpack && mrpackLoaders.length ? mrpackLoaders : loaders,
+		}
+	})
+}
+
+function latestVersionByType(
+	versionList: Labrinth.Versions.v3.Version[],
+	type: Labrinth.Versions.v3.VersionChannel,
+) {
+	return versionList
+		.filter((version) => version.version_type === type)
+		.reduce<Labrinth.Versions.v3.Version | undefined>((latest, version) => {
+			if (!latest || dayjs(version.date_published).isAfter(dayjs(latest.date_published))) {
+				return version
+			}
+
+			return latest
+		}, undefined)
+}
+
+async function preloadDependenciesForSelection(selection: ProjectDownloadSelection) {
+	await downloadModalProvider.preloadDependenciesForSelection(selection)
+}
+
+function isActiveShowRequest(showRequestId: number) {
+	return !unmounted && modalShowRequestId === showRequestId && !!modal.value && !modalOpen.value
+}
+
 function resetDownloadState() {
 	projectDownloadSelection.value = getDefaultProjectDownloadSelection()
-	dependencyDownloadFiles.value = []
 	downloadProjectResetKey.value += 1
 }
 
@@ -407,6 +915,7 @@ function openFromHash() {
 	if (
 		!props.useRouteHash ||
 		!modal.value ||
+		modalOpening.value ||
 		modalOpen.value ||
 		showProjectId.value ||
 		route.hash !== '#download'
@@ -437,11 +946,14 @@ watch(modal, openFromHash)
 watch(() => route.hash, openFromHash)
 watch(routeProjectId, () => {
 	projectDownloadSelection.value = getDefaultProjectDownloadSelection()
-	dependencyDownloadFiles.value = []
 	downloadProjectResetKey.value += 1
 })
 
-onUnmounted(clearCloseStateResetTimeout)
+onUnmounted(() => {
+	unmounted = true
+	modalShowRequestId += 1
+	clearCloseStateResetTimeout()
+})
 
 defineExpose({ show, hide })
 </script>
diff --git a/apps/frontend/src/components/ui/auth/PasskeySettings.vue b/apps/frontend/src/components/ui/auth/PasskeySettings.vue
index 2120aad87a..c48205b9af 100644
--- a/apps/frontend/src/components/ui/auth/PasskeySettings.vue
+++ b/apps/frontend/src/components/ui/auth/PasskeySettings.vue
@@ -257,7 +257,7 @@ const messages = defineMessages({
 	},
 	managePasskeyModalLoading: {
 		id: 'settings.account.security.passkey.modal.loading',
-		defaultMessage: 'Loading passkeys…',
+		defaultMessage: 'Loading passkeys...',
 	},
 	managePasskeyModalNoPasskeys: {
 		id: 'settings.account.security.passkey.modal.no-passkeys',
diff --git a/apps/frontend/src/components/ui/moderation/GlobalDetailLocalTraceCard.vue b/apps/frontend/src/components/ui/moderation/GlobalDetailLocalTraceCard.vue
new file mode 100644
index 0000000000..46850664df
--- /dev/null
+++ b/apps/frontend/src/components/ui/moderation/GlobalDetailLocalTraceCard.vue
@@ -0,0 +1,63 @@
+<template>
+	<div class="rounded-lg border border-divider bg-bg-raised p-3">
+		<div class="flex flex-wrap items-start justify-between gap-3">
+			<div class="min-w-0">
+				<p class="m-0 break-words font-semibold text-contrast">
+					{{ trace.project_name }}
+				</p>
+				<p class="m-0 mt-1 break-all text-sm text-secondary">
+					Project {{ trace.project_slug ?? trace.project_id }} / Version
+					{{ trace.version_number }} / File {{ trace.file_name }}
+				</p>
+			</div>
+			<div class="flex flex-wrap items-center gap-2">
+				<span class="text-sm text-secondary">Local</span>
+				<Badge :type="trace.local_status" />
+				<span class="text-sm text-secondary">Effective</span>
+				<Badge :type="trace.effective_status" />
+				<ButtonStyled>
+					<NuxtLink :to="localTraceLink">
+						<ExternalIcon aria-hidden="true" />
+						View
+					</NuxtLink>
+				</ButtonStyled>
+			</div>
+		</div>
+
+		<div class="mt-3 grid gap-2 text-sm text-secondary md:grid-cols-2">
+			<p class="m-0 break-all">
+				<span class="font-semibold text-contrast">Issue</span>
+				{{ trace.issue_type }}
+			</p>
+			<p class="m-0 break-all">
+				<span class="font-semibold text-contrast">Severity</span>
+				{{ trace.severity }}
+			</p>
+			<p class="m-0 break-all">
+				<span class="font-semibold text-contrast">Path</span>
+				{{ trace.file_path }}
+			</p>
+			<p v-if="trace.jar" class="m-0 break-all">
+				<span class="font-semibold text-contrast">JAR</span>
+				{{ trace.jar }}
+			</p>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import { ExternalIcon } from '@modrinth/assets'
+import { Badge, ButtonStyled } from '@modrinth/ui'
+
+const props = defineProps<{
+	trace: Labrinth.TechReview.Internal.GlobalIssueDetailTrace
+}>()
+
+const localTraceLink = computed(
+	() =>
+		`/moderation/technical-review/${props.trace.project_id}?detail=${encodeURIComponent(
+			props.trace.detail_id,
+		)}`,
+)
+</script>
diff --git a/apps/frontend/src/components/ui/moderation/GlobalDetailTracesList.vue b/apps/frontend/src/components/ui/moderation/GlobalDetailTracesList.vue
new file mode 100644
index 0000000000..8c0a6037e4
--- /dev/null
+++ b/apps/frontend/src/components/ui/moderation/GlobalDetailTracesList.vue
@@ -0,0 +1,180 @@
+<template>
+	<div>
+		<form class="flex flex-col gap-2 sm:flex-row" @submit.prevent="executeSearch">
+			<StyledInput
+				v-model="query"
+				:icon="SearchIcon"
+				type="text"
+				autocomplete="off"
+				placeholder="Search global trace keys..."
+				clearable
+				wrapper-class="flex-1 w-full"
+			/>
+			<ButtonStyled color="brand">
+				<button type="submit" :disabled="isLoading">
+					<SearchIcon aria-hidden="true" />
+					Search
+				</button>
+			</ButtonStyled>
+		</form>
+
+		<div
+			v-if="!isLoading && !loadError && total > 0"
+			class="mt-4 flex flex-wrap items-center justify-between gap-3"
+		>
+			<p class="m-0 text-sm text-secondary">Showing {{ pageStart }}-{{ pageEnd }} of {{ total }}</p>
+			<Pagination :page="currentPage" :count="pageCount" @switch-page="switchPage" />
+		</div>
+
+		<EmptyState
+			v-if="isLoading"
+			type="no-search-result"
+			heading="Loading global detail traces..."
+		/>
+		<EmptyState
+			v-else-if="loadError"
+			type="no-search-result"
+			heading="Failed to load global detail traces"
+		/>
+		<div v-else-if="traces.length > 0" class="mt-4 flex flex-col gap-3">
+			<article
+				v-for="trace in traces"
+				:key="trace.detail_key"
+				class="universal-card flex flex-col gap-3"
+			>
+				<div class="flex flex-wrap items-start justify-between gap-3">
+					<div class="min-w-0">
+						<div class="flex min-w-0 items-center gap-2">
+							<HashIcon class="shrink-0 text-secondary" aria-hidden="true" />
+							<h2 class="m-0 min-w-0 text-lg font-semibold text-contrast">
+								Trace
+								<span class="break-all font-mono text-base">{{ trace.detail_key }}</span>
+							</h2>
+						</div>
+						<p class="m-0 mt-1 text-sm text-secondary">
+							{{ formatTraceCount(trace.local_trace_count) }}
+						</p>
+					</div>
+					<Badge :type="trace.verdict" />
+				</div>
+
+				<div v-if="getPreviewLocalTraces(trace).length > 0" class="flex flex-col gap-2">
+					<div
+						v-if="getVisibleLocalTraceTotal(trace) > getPreviewLocalTraces(trace).length"
+						class="flex flex-wrap items-center justify-between gap-2"
+					>
+						<p class="m-0 text-sm text-secondary">
+							Showing first {{ getPreviewLocalTraces(trace).length }} of
+							{{ getVisibleLocalTraceTotal(trace) }} local traces
+						</p>
+						<ButtonStyled>
+							<NuxtLink :to="getGlobalTraceLink(trace)">
+								<ListIcon aria-hidden="true" />
+								View all
+							</NuxtLink>
+						</ButtonStyled>
+					</div>
+					<GlobalDetailLocalTraceCard
+						v-for="localTrace in getPreviewLocalTraces(trace)"
+						:key="localTrace.detail_id"
+						:trace="localTrace"
+					/>
+				</div>
+				<EmptyState
+					v-else
+					type="no-search-result"
+					heading="No local traces currently match this key"
+				/>
+			</article>
+		</div>
+		<EmptyState v-else type="no-search-result" heading="No global detail traces found" />
+
+		<div v-if="!isLoading && !loadError && total > 0" class="mt-4 flex justify-end">
+			<Pagination :page="currentPage" :count="pageCount" @switch-page="switchPage" />
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import { HashIcon, ListIcon, SearchIcon } from '@modrinth/assets'
+import {
+	Badge,
+	ButtonStyled,
+	EmptyState,
+	injectModrinthClient,
+	Pagination,
+	StyledInput,
+} from '@modrinth/ui'
+
+import GlobalDetailLocalTraceCard from '~/components/ui/moderation/GlobalDetailLocalTraceCard.vue'
+
+const client = injectModrinthClient()
+const query = ref('')
+const activeQuery = ref<string | null>(null)
+const isLoading = ref(false)
+const loadError = ref(false)
+const currentPage = ref(1)
+const itemsPerPage = 20
+const localTracePreviewLimit = 10
+const total = ref(0)
+const traces = ref<Labrinth.TechReview.Internal.GlobalIssueDetail[]>([])
+
+const pageCount = computed(() => Math.max(Math.ceil(total.value / itemsPerPage), 1))
+const pageStart = computed(() =>
+	total.value === 0 ? 0 : (currentPage.value - 1) * itemsPerPage + 1,
+)
+const pageEnd = computed(() => Math.min(currentPage.value * itemsPerPage, total.value))
+
+function formatTraceCount(count: number) {
+	return `${count} local ${count === 1 ? 'trace' : 'traces'}`
+}
+
+function getPreviewLocalTraces(trace: Labrinth.TechReview.Internal.GlobalIssueDetail) {
+	return trace.local_traces.slice(0, localTracePreviewLimit)
+}
+
+function getVisibleLocalTraceTotal(trace: Labrinth.TechReview.Internal.GlobalIssueDetail) {
+	return Math.max(trace.local_trace_count, trace.local_traces.length)
+}
+
+function getGlobalTraceLink(trace: Labrinth.TechReview.Internal.GlobalIssueDetail) {
+	return `/moderation/global-traces/${encodeURIComponent(trace.detail_key)}`
+}
+
+async function loadTraces() {
+	isLoading.value = true
+	loadError.value = false
+
+	try {
+		const response = await client.labrinth.tech_review_internal.searchGlobalIssueDetails({
+			query: activeQuery.value,
+			limit: itemsPerPage,
+			page: currentPage.value - 1,
+		})
+
+		traces.value = response.traces
+		total.value = response.total
+	} catch (error) {
+		console.error('Failed to load global detail traces', error)
+		traces.value = []
+		total.value = 0
+		loadError.value = true
+	} finally {
+		isLoading.value = false
+	}
+}
+
+async function executeSearch() {
+	activeQuery.value = query.value.trim() || null
+	currentPage.value = 1
+	await loadTraces()
+}
+
+async function switchPage(page: number) {
+	currentPage.value = page
+	await loadTraces()
+}
+
+onMounted(loadTraces)
+</script>
diff --git a/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue b/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue
index 8e2db41b96..61e0b9bc9c 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue
@@ -2,12 +2,7 @@
 	<div class="shadow-card rounded-2xl border border-solid border-surface-4 bg-surface-3 p-4">
 		<div class="flex items-center justify-between">
 			<div class="flex items-center gap-4">
-				<NuxtLink
-					:to="`/project/${queueEntry.project.slug}`"
-					target="_blank"
-					tabindex="-1"
-					class="flex"
-				>
+				<NuxtLink :to="`/project/${projectRouteParam}`" target="_blank" tabindex="-1" class="flex">
 					<Avatar
 						:src="queueEntry.project.icon_url"
 						size="4rem"
@@ -17,7 +12,7 @@
 				<div class="flex flex-col gap-1.5">
 					<div class="flex items-center gap-2">
 						<NuxtLink
-							:to="`/project/${queueEntry.project.slug}`"
+							:to="`/project/${projectRouteParam}`"
 							target="_blank"
 							class="text-lg font-semibold text-contrast hover:underline"
 						>
@@ -177,7 +172,7 @@ function getDaysQueued(date: Date): number {
 const queuedDate = computed(() => {
 	return dayjs(
 		props.queueEntry.project.queued ||
-			props.queueEntry.project.created ||
+			props.queueEntry.project.published ||
 			props.queueEntry.project.updated,
 	)
 })
@@ -186,10 +181,14 @@ const daysInQueue = computed(() => {
 	return getDaysQueued(queuedDate.value.toDate())
 })
 
+const projectRouteParam = computed(
+	() => props.queueEntry.project.slug || props.queueEntry.project.id,
+)
+
 const formattedDate = computed(() => {
 	const date =
 		props.queueEntry.project.queued ||
-		props.queueEntry.project.created ||
+		props.queueEntry.project.published ||
 		props.queueEntry.project.updated
 	if (!date) return 'Unknown'
 
@@ -202,7 +201,7 @@ const formattedDate = computed(() => {
 
 function copyLink() {
 	const base = window.location.origin
-	const projectUrl = `${base}/project/${props.queueEntry.project.slug}`
+	const projectUrl = `${base}/project/${projectRouteParam.value}`
 	navigator.clipboard.writeText(projectUrl).then(() => {
 		addNotification({
 			type: 'success',
diff --git a/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue b/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
index ffb10a6b64..3b34f4d010 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
@@ -45,7 +45,7 @@ import {
 	type User,
 } from '@modrinth/utils'
 import dayjs from 'dayjs'
-import { computed, reactive, ref, watch } from 'vue'
+import { computed, nextTick, reactive, ref, watch } from 'vue'
 
 import type { UnsafeFile } from '~/components/ui/moderation/MaliciousSummaryModal.vue'
 import ThreadView from '~/components/ui/thread/ThreadView.vue'
@@ -89,6 +89,7 @@ const props = defineProps<{
 		thread: Labrinth.TechReview.Internal.Thread
 		reports: FlattenedFileReport[]
 	}
+	focusedDetailId?: string | null
 	loadingIssues: Set<string>
 	decompiledSources: Map<string, string>
 }>()
@@ -192,7 +193,12 @@ watch(selectedFile, (newFile) => {
 
 const client = injectModrinthClient()
 
-async function updateIssueDetails(data: { detail_id: string; verdict: 'safe' | 'unsafe' }[]) {
+async function updateIssueDetails(
+	data: {
+		detail_id: string
+		verdict: Labrinth.TechReview.Internal.DelphiReportIssueStatus
+	}[],
+) {
 	await client.request('/moderation/tech-review/issue-detail', {
 		api: 'labrinth',
 		version: 'internal',
@@ -381,6 +387,49 @@ function viewFileFlags(file: FlattenedFileReport) {
 	currentTab.value = 'File'
 }
 
+function getDetailElementId(detailId: string) {
+	return `tech-review-detail-${detailId}`
+}
+
+function findFileForDetail(detailId: string): FlattenedFileReport | null {
+	for (const report of props.item.reports) {
+		for (const issue of report.issues) {
+			if (issue.details.some((detail) => detail.id === detailId)) {
+				return report
+			}
+		}
+	}
+
+	return null
+}
+
+async function focusDetail(detailId: string) {
+	const file = findFileForDetail(detailId)
+	if (!file) return
+
+	viewFileFlags(file)
+	await nextTick()
+
+	const classItem = groupedByClass.value.find((group) =>
+		group.flags.some((flag) => flag.detail.id === detailId),
+	)
+
+	if (classItem) {
+		expandClass(classItem)
+	}
+
+	await nextTick()
+
+	if (!import.meta.client) return
+
+	window.requestAnimationFrame(() => {
+		document.getElementById(getDetailElementId(detailId))?.scrollIntoView({
+			behavior: 'smooth',
+			block: 'center',
+		})
+	})
+}
+
 function backToFileList() {
 	selectedFileId.value = null
 	if (currentTab.value === 'File') {
@@ -691,6 +740,16 @@ const groupedByJar = computed<JarGroup[]>(() => {
 	})
 })
 
+watch(
+	() => props.focusedDetailId,
+	(detailId) => {
+		if (detailId) {
+			focusDetail(detailId)
+		}
+	},
+	{ immediate: true },
+)
+
 // Auto-expand/load source for small files; keep larger files lazy.
 watch(
 	[selectedFileId, groupedByClass],
@@ -1384,8 +1443,12 @@ function copyId() {
 							>
 								<div
 									v-for="flag in classItem.flags"
+									:id="getDetailElementId(flag.detail.id)"
 									:key="`${flag.issueId}-${flag.detail.id}`"
 									class="flex flex-col gap-2 rounded-lg border-[1px] border-b border-solid border-surface-5 bg-surface-3 py-2 pl-4 last:border-b-0"
+									:class="{
+										'!border-brand bg-brand-highlight': props.focusedDetailId === flag.detail.id,
+									}"
 								>
 									<div class="grid grid-cols-[1fr_auto] items-center">
 										<div
diff --git a/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue b/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
index 21cda7a992..5d31c33671 100644
--- a/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
+++ b/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
@@ -1949,7 +1949,10 @@ function generateModpackMessage(allFiles: {
 
 const hasNextProject = ref(false)
 async function refreshModerationCaches(threadId?: string) {
-	const refreshes: Promise<unknown>[] = [invalidate(), refreshNuxtData('moderation-projects')]
+	const refreshes: Promise<unknown>[] = [
+		invalidate(),
+		queryClient.invalidateQueries({ queryKey: ['moderation-projects'] }),
+	]
 
 	if (threadId) {
 		refreshes.push(queryClient.invalidateQueries({ queryKey: ['thread', threadId] }))
diff --git a/apps/frontend/src/composables/featureFlags.ts b/apps/frontend/src/composables/featureFlags.ts
index c6e7727e6c..956da2e300 100644
--- a/apps/frontend/src/composables/featureFlags.ts
+++ b/apps/frontend/src/composables/featureFlags.ts
@@ -58,6 +58,7 @@ export const DEFAULT_FEATURE_FLAGS = validateValues({
 	showHostingAccessInstanceAuditLog: false,
 	versionDevInfoCollapsed: true,
 	alwaysShowVersionDevInfo: false,
+	advancedFiltersCollapsed: true,
 } as const)
 
 export type FeatureFlag = keyof typeof DEFAULT_FEATURE_FLAGS
diff --git a/apps/frontend/src/helpers/moderation.ts b/apps/frontend/src/helpers/moderation.ts
index 8979c8d6b1..65b94e7dac 100644
--- a/apps/frontend/src/helpers/moderation.ts
+++ b/apps/frontend/src/helpers/moderation.ts
@@ -1,3 +1,4 @@
+import type { Labrinth } from '@modrinth/api-client'
 import type { ExtendedReport, OwnershipTarget } from '@modrinth/moderation'
 import type {
 	Organization,
@@ -197,14 +198,10 @@ export interface ModerationOwnershipOrganization {
 
 export type ModerationOwnership = ModerationOwnershipUser | ModerationOwnershipOrganization
 
-export interface ProjectWithOwnership {
-	ownership: ModerationOwnership
-	external_dependencies_count: number
-	[key: string]: any
-}
+export type ProjectWithOwnership = Labrinth.Moderation.Internal.QueueProject
 
 export interface ModerationProject {
-	project: any
+	project: Omit<ProjectWithOwnership, 'ownership' | 'external_dependencies_count'>
 	ownership: ModerationOwnership | null
 	external_dependencies_count: number
 }
diff --git a/apps/frontend/src/locales/da-DK/index.json b/apps/frontend/src/locales/da-DK/index.json
index 132a7da81b..1de37ab305 100644
--- a/apps/frontend/src/locales/da-DK/index.json
+++ b/apps/frontend/src/locales/da-DK/index.json
@@ -1766,9 +1766,6 @@
   "project.download.no-app": {
     "message": "Har ikke Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Ingen versioner tilgængelig til {gameVersion} og {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} understøtter ikke {platform} til {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index 9513b0629b..36d403783d 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -3227,9 +3227,6 @@
   "project.download.no-app": {
     "message": "Du hast die Modrinth App nicht?"
   },
-  "project.download.no-versions-available": {
-    "message": "Keinen versionen verfügbar für {gameVersion} und {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} unterstützt {platform} für {gameVersion} nicht"
   },
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index 9dcda3478c..8a575fb2a8 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -3227,9 +3227,6 @@
   "project.download.no-app": {
     "message": "Du hast die Modrinth App nicht?"
   },
-  "project.download.no-versions-available": {
-    "message": "Keine Versionen für {gameVersion} und {platform} verfügbar."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} unterstützt {platform} für die {gameVersion} nicht"
   },
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index ae19e368bc..b48c401909 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -2672,12 +2672,18 @@
   "layout.nav.upgrade-to-modrinth-plus": {
     "message": "Upgrade to Modrinth+"
   },
+  "moderation.exclude-technical-review": {
+    "message": "Exclude TR"
+  },
   "moderation.moderate": {
     "message": "Moderate"
   },
   "moderation.page.external-projects": {
     "message": "External projects"
   },
+  "moderation.page.global-detail-traces": {
+    "message": "Global traces"
+  },
   "moderation.page.projects": {
     "message": "Projects"
   },
@@ -3272,9 +3278,6 @@
   "project.details.licensed": {
     "message": "Licensed"
   },
-  "project.download.additional-files-title": {
-    "message": "Additional files"
-  },
   "project.download.base-game-version-incompatible-tooltip": {
     "message": "This game version is incompatible with the base project."
   },
@@ -3282,7 +3285,7 @@
     "message": "This loader is incompatible with the base project."
   },
   "project.download.compatible-version-title": {
-    "message": "Compatible version"
+    "message": "Compatible versions"
   },
   "project.download.dependencies-title": {
     "message": "Dependencies"
@@ -3290,6 +3293,9 @@
   "project.download.dependency-already-installed": {
     "message": "This dependency is already installed"
   },
+  "project.download.dependency-any-compatible": {
+    "message": "Any compatible"
+  },
   "project.download.dependency-conflicting": {
     "message": "This dependency conflicts with another dependency"
   },
@@ -3311,12 +3317,30 @@
   "project.download.dependency-quilt-fabric-api": {
     "message": "Fabric API is skipped for Quilt"
   },
+  "project.download.dependency-resource-pack-admonition": {
+    "message": "This project has a dependency with a required resource pack. Download it and place it in your {folder} folder."
+  },
   "project.download.dependency-unavailable": {
     "message": "This dependency cannot be downloaded"
   },
+  "project.download.download": {
+    "message": "Download"
+  },
+  "project.download.download-as-zip": {
+    "message": "Download as .zip"
+  },
   "project.download.download-version": {
     "message": "Download {version}"
   },
+  "project.download.download-with-dependencies": {
+    "message": "Download with deps"
+  },
+  "project.download.download-with-recommended": {
+    "message": "Download with recommended"
+  },
+  "project.download.download-with-recommended-as-zip": {
+    "message": "Download with recommended as .zip"
+  },
   "project.download.duplicate-dependencies-hidden": {
     "message": "Duplicate dependencies are hidden"
   },
@@ -3326,8 +3350,8 @@
   "project.download.game-version-unsupported-tooltip": {
     "message": "{title} does not support {gameVersion} for {platform}"
   },
-  "project.download.install-with-app-description": {
-    "message": "Automatically install the correct version and dependencies."
+  "project.download.install-with-app": {
+    "message": "Install with Modrinth App"
   },
   "project.download.manually": {
     "message": "Download manually"
@@ -3338,12 +3362,18 @@
   "project.download.no-game-versions-found": {
     "message": "No game versions found"
   },
-  "project.download.no-versions-available": {
-    "message": "No versions available for {gameVersion} and {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} does not support {platform} for {gameVersion}"
   },
+  "project.download.recommended-title": {
+    "message": "Recommended"
+  },
+  "project.download.required-resource-pack-admonition": {
+    "message": "This data pack also requires a resource pack. Download it and place it in your {folder} folder."
+  },
+  "project.download.required-resource-pack-short": {
+    "message": "Resource pack"
+  },
   "project.download.search-game-versions": {
     "message": "Select game version"
   },
@@ -3353,18 +3383,6 @@
   "project.download.select-platform": {
     "message": "Select platform"
   },
-  "project.download.selected-version-download-all": {
-    "message": "Download all (.zip)"
-  },
-  "project.download.selected-version-downloading": {
-    "message": "Downloading... ({current}/{total})"
-  },
-  "project.download.selected-version-failed-text": {
-    "message": "One or more version files could not be downloaded. Please try again."
-  },
-  "project.download.selected-version-failed-title": {
-    "message": "Could not download version"
-  },
   "project.download.show-all-versions": {
     "message": "Show all versions"
   },
@@ -3374,6 +3392,12 @@
   "project.download.unknown-loader": {
     "message": "Unknown loader"
   },
+  "project.download.zip-failed-text": {
+    "message": "One or more files could not be downloaded. Please try again."
+  },
+  "project.download.zip-failed-title": {
+    "message": "Could not download files"
+  },
   "project.environment.migration-no-permission.message": {
     "message": "We've just overhauled the Environments system on Modrinth and new options are now available. You don't have permission to modify these settings, but please let another member of the project know that the environment metadata needs to be verified."
   },
@@ -4203,7 +4227,7 @@
     "message": "Last used {ago}"
   },
   "settings.account.security.passkey.modal.loading": {
-    "message": "Loading passkeys…"
+    "message": "Loading passkeys..."
   },
   "settings.account.security.passkey.modal.never-used": {
     "message": "Never used"
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index 9c8a7dbc38..0ab2790f28 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -3227,9 +3227,6 @@
   "project.download.no-app": {
     "message": "¿No tienes la Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "No hay versiones disponibles para {gameVersion} y {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} no soporta {platform} para {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/es-ES/index.json b/apps/frontend/src/locales/es-ES/index.json
index 0e8c91024c..32f5d87670 100644
--- a/apps/frontend/src/locales/es-ES/index.json
+++ b/apps/frontend/src/locales/es-ES/index.json
@@ -3107,9 +3107,6 @@
   "project.download.no-app": {
     "message": "¿No tienes la aplicación Modrinth?"
   },
-  "project.download.no-versions-available": {
-    "message": "No hay versiones disponibles para {gameVersion} y {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} no está soportado para {platform} en la {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/fil-PH/index.json b/apps/frontend/src/locales/fil-PH/index.json
index f756d471c1..dea2d43e06 100644
--- a/apps/frontend/src/locales/fil-PH/index.json
+++ b/apps/frontend/src/locales/fil-PH/index.json
@@ -2414,9 +2414,6 @@
   "project.download.no-app": {
     "message": "Wala kang Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Walang bersiyong magagamit para sa {gameVersion} at {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "Hindi masuport ng {title} ang {platform} para sa {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index ffde04f70d..995ecea250 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -3227,9 +3227,6 @@
   "project.download.no-app": {
     "message": "Vous n'avez pas Modrinth App ?"
   },
-  "project.download.no-versions-available": {
-    "message": "Aucune version disponible pour {gameVersion} et {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} ne supporte pas {platform} pour {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/he-IL/index.json b/apps/frontend/src/locales/he-IL/index.json
index 6756b68e1b..5e68394a62 100644
--- a/apps/frontend/src/locales/he-IL/index.json
+++ b/apps/frontend/src/locales/he-IL/index.json
@@ -2033,9 +2033,6 @@
   "project.download.no-app": {
     "message": "אין לכם את אפליקציית Modrinth?"
   },
-  "project.download.no-versions-available": {
-    "message": "אין גרסאות זמינות עבור {gameVersion} ו-{platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} אינו תומך ב-{platform} עבור {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index 732216fd39..fab8e3572e 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -2924,9 +2924,6 @@
   "project.download.no-app": {
     "message": "Nincs meg a Modrinth App? "
   },
-  "project.download.no-versions-available": {
-    "message": "Nem érhető el verzió ehhez: {platform} {gameVersion}"
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "A(z) {title} nem támogatja ezt a verziót: {platform} {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/id-ID/index.json b/apps/frontend/src/locales/id-ID/index.json
index 40282c8733..3e3559a688 100644
--- a/apps/frontend/src/locales/id-ID/index.json
+++ b/apps/frontend/src/locales/id-ID/index.json
@@ -2429,9 +2429,6 @@
   "project.download.no-app": {
     "message": "Tidak memiliki Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Tidak ada versi tersedia untuk {gameVersion} dan {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} tidak mendukung {platform} untuk {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index 34d73900ab..e3b34e3e14 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -3218,9 +3218,6 @@
   "project.download.no-app": {
     "message": "Non hai Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Nessuna versione disponibile per {gameVersion} e {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} non supporta {platform} per {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/ja-JP/index.json b/apps/frontend/src/locales/ja-JP/index.json
index 7bcc3f7b10..d065a5d559 100644
--- a/apps/frontend/src/locales/ja-JP/index.json
+++ b/apps/frontend/src/locales/ja-JP/index.json
@@ -2735,9 +2735,6 @@
   "project.download.no-app": {
     "message": "Modrinth Appをお持ちでないですか？"
   },
-  "project.download.no-versions-available": {
-    "message": "{gameVersion}および{platform}向けのバージョンは利用できません。"
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title}は{gameVersion}の{platform}に対応していません"
   },
diff --git a/apps/frontend/src/locales/ko-KR/index.json b/apps/frontend/src/locales/ko-KR/index.json
index c8ee976fa5..5e231b3a8c 100644
--- a/apps/frontend/src/locales/ko-KR/index.json
+++ b/apps/frontend/src/locales/ko-KR/index.json
@@ -2549,9 +2549,6 @@
   "project.download.no-app": {
     "message": "Modrinth 앱을 설치하지 않으셨나요?"
   },
-  "project.download.no-versions-available": {
-    "message": "{gameVersion} 및 {platform}용 버전이 없습니다."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} 은(는) {gameVersion} 용 {platform} 을(를) 지원하지 않습니다."
   },
diff --git a/apps/frontend/src/locales/ms-MY/index.json b/apps/frontend/src/locales/ms-MY/index.json
index 251063f253..0457b18de8 100644
--- a/apps/frontend/src/locales/ms-MY/index.json
+++ b/apps/frontend/src/locales/ms-MY/index.json
@@ -2924,9 +2924,6 @@
   "project.download.no-app": {
     "message": "Tidak ada Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Tiada versi tersedia untuk {gameVersion} dan {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} tidak menyokong {platform} untuk {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/nl-NL/index.json b/apps/frontend/src/locales/nl-NL/index.json
index a59c7b89c8..0c86ebd39c 100644
--- a/apps/frontend/src/locales/nl-NL/index.json
+++ b/apps/frontend/src/locales/nl-NL/index.json
@@ -2798,9 +2798,6 @@
   "project.download.no-app": {
     "message": "Heb je de Modrinth App niet?"
   },
-  "project.download.no-versions-available": {
-    "message": "Geen versies beschikbaar voor {gameVersion} en {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} steunt niet {platform} voor {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/no-NO/index.json b/apps/frontend/src/locales/no-NO/index.json
index 13a5637f03..b245d68e2b 100644
--- a/apps/frontend/src/locales/no-NO/index.json
+++ b/apps/frontend/src/locales/no-NO/index.json
@@ -2255,9 +2255,6 @@
   "project.download.no-app": {
     "message": "Har du ikke en Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Ingen versjoner tilgjengelige for {gameVersion} og {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} støtter ikke {platform} for {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index 0af0770c02..07daffa118 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -3221,9 +3221,6 @@
   "project.download.no-app": {
     "message": "Nie masz Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Brak dostępnych wersji dla {gameVersion} i {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} nie obsługuje {platform} dla {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index a64f36b0b9..961ee1b07f 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -3218,9 +3218,6 @@
   "project.download.no-app": {
     "message": "Não tem o Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Nenhuma versão disponível para {gameVersion} e {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} não suporta {platform} para {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/pt-PT/index.json b/apps/frontend/src/locales/pt-PT/index.json
index a0b2b31ff5..bee9a54373 100644
--- a/apps/frontend/src/locales/pt-PT/index.json
+++ b/apps/frontend/src/locales/pt-PT/index.json
@@ -2228,9 +2228,6 @@
   "project.download.no-app": {
     "message": "Não tens a Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Nenhuma versão disponível para {gameVersion} e {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} não suporta {platform} para {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/ro-RO/index.json b/apps/frontend/src/locales/ro-RO/index.json
index 8431bf39fe..5d46c15daa 100644
--- a/apps/frontend/src/locales/ro-RO/index.json
+++ b/apps/frontend/src/locales/ro-RO/index.json
@@ -1421,9 +1421,6 @@
   "project.download.no-app": {
     "message": "Nu ai Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Nu există versiuni disponibile pentru {gameVersion} și {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} nu este compatibil cu {platform} pentru {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index f878f76674..2c75b0147c 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -3221,9 +3221,6 @@
   "project.download.no-app": {
     "message": "У вас нет Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Нет версий, доступных для {gameVersion} и {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} не поддерживает {platform} для {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/sv-SE/index.json b/apps/frontend/src/locales/sv-SE/index.json
index 8fe38cac45..161ccbd84d 100644
--- a/apps/frontend/src/locales/sv-SE/index.json
+++ b/apps/frontend/src/locales/sv-SE/index.json
@@ -2810,9 +2810,6 @@
   "project.download.no-app": {
     "message": "Har du inte Modrinth appen?"
   },
-  "project.download.no-versions-available": {
-    "message": "Inga versioner finns tillgängliga för {gameVersion} och {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} stöttar inte {platform} för {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/tr-TR/index.json b/apps/frontend/src/locales/tr-TR/index.json
index 40168ccde6..141fe81e56 100644
--- a/apps/frontend/src/locales/tr-TR/index.json
+++ b/apps/frontend/src/locales/tr-TR/index.json
@@ -3167,9 +3167,6 @@
   "project.download.no-app": {
     "message": "Modrinth App Yok Mu?"
   },
-  "project.download.no-versions-available": {
-    "message": "{gameVersion} ve {platform} için sürüm mevcut değil."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title}, {gameVersion} sürümünde {platform} desteklemiyor"
   },
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index c1e88501c9..100031e9ad 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -2855,9 +2855,6 @@
   "project.download.no-app": {
     "message": "Не маєте Modrinth App?"
   },
-  "project.download.no-versions-available": {
-    "message": "Немає доступних версій для {gameVersion} та {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} не підтримує {platform} для {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/vi-VN/index.json b/apps/frontend/src/locales/vi-VN/index.json
index 1f8509c7b1..5c32e31311 100644
--- a/apps/frontend/src/locales/vi-VN/index.json
+++ b/apps/frontend/src/locales/vi-VN/index.json
@@ -3071,9 +3071,6 @@
   "project.download.no-app": {
     "message": "Chưa có Ứng dụng Modrinth?"
   },
-  "project.download.no-versions-available": {
-    "message": "Không có phiên bản khả dụng cho {gameVersion} và {platform}."
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} không hỗ trợ {platform} cho {gameVersion}"
   },
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index 658b82c717..19a25cc242 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -3221,9 +3221,6 @@
   "project.download.no-app": {
     "message": "还没有 Modrinth App 吗？"
   },
-  "project.download.no-versions-available": {
-    "message": "没有支持 {platform} {gameVersion} 的版本。"
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} 不支持 {gameVersion} 的 {platform}"
   },
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index 41986af4f0..ada90b1d03 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -3227,9 +3227,6 @@
   "project.download.no-app": {
     "message": "還沒有 Modrinth App 嗎？"
   },
-  "project.download.no-versions-available": {
-    "message": "{platform} {gameVersion} 沒有可用的版本。"
-  },
   "project.download.platform-unsupported-tooltip": {
     "message": "{title} 不支援 {platform} {gameVersion}"
   },
diff --git a/apps/frontend/src/pages/admin/emails.vue b/apps/frontend/src/pages/admin/emails.vue
index 3a6e71e826..71b08af93c 100644
--- a/apps/frontend/src/pages/admin/emails.vue
+++ b/apps/frontend/src/pages/admin/emails.vue
@@ -143,7 +143,7 @@ onMounted(() => {
 					{{ previewError }}
 				</div>
 
-				<div v-if="previewLoading" class="my-4 text-sm text-secondary">Loading preview…</div>
+				<div v-if="previewLoading" class="my-4 text-sm text-secondary">Loading preview...</div>
 				<div v-else>
 					<div v-if="previewVariables.length" class="mt-2 grid gap-3 md:grid-cols-2">
 						<label
diff --git a/apps/frontend/src/pages/discover/[type]/index.vue b/apps/frontend/src/pages/discover/[type]/index.vue
index cd161f43bf..5e6721b8c2 100644
--- a/apps/frontend/src/pages/discover/[type]/index.vue
+++ b/apps/frontend/src/pages/discover/[type]/index.vue
@@ -372,6 +372,14 @@ const messages = defineMessages({
 	},
 })
 
+const advancedFiltersCollapsed = computed({
+	get: () => flags.value.advancedFiltersCollapsed,
+	set: (value) => {
+		flags.value.advancedFiltersCollapsed = value
+		saveFeatureFlags()
+	},
+})
+
 const projectTypeId = computed(() => projectType.value?.id ?? 'mod')
 
 debug('projectTypeId:', projectTypeId.value)
@@ -478,6 +486,7 @@ provideBrowseManager({
 	showServerOnly: showServerOnlyToggle,
 	serverOnlyLabel: computed(() => formatMessage(commonMessages.serverOnlyLabel)),
 	hiddenFilterTypes: computed(() => (showServerOnlyToggle.value ? ['environment'] : [])),
+	advancedFiltersCollapsed,
 	displayMode: resultsDisplayMode,
 	cycleDisplayMode: cycleSearchDisplayMode,
 	maxResultsOptions: currentMaxResultsOptions,
diff --git a/apps/frontend/src/pages/moderation.vue b/apps/frontend/src/pages/moderation.vue
index 0ff9f7490f..9352acabba 100644
--- a/apps/frontend/src/pages/moderation.vue
+++ b/apps/frontend/src/pages/moderation.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script setup lang="ts">
-import { FolderIcon, GlobeIcon, ReportIcon, ShieldCheckIcon } from '@modrinth/assets'
+import { FolderIcon, GlobeIcon, HashIcon, ReportIcon, ShieldCheckIcon } from '@modrinth/assets'
 import { Chips, defineMessages, NavTabs, useVIntl } from '@modrinth/ui'
 
 definePageMeta({
@@ -47,6 +47,10 @@ const messages = defineMessages({
 		id: 'moderation.page.external-projects',
 		defaultMessage: 'External projects',
 	},
+	globalDetailTracesTitle: {
+		id: 'moderation.page.global-detail-traces',
+		defaultMessage: 'Global traces',
+	},
 })
 
 const moderationLinks = [
@@ -62,6 +66,11 @@ const moderationLinks = [
 		href: '/moderation/external-projects',
 		icon: GlobeIcon,
 	},
+	{
+		label: formatMessage(messages.globalDetailTracesTitle),
+		href: '/moderation/global-traces',
+		icon: HashIcon,
+	},
 ]
 
 const mobileNavOptions = [
@@ -69,15 +78,20 @@ const mobileNavOptions = [
 	formatMessage(messages.technicalReviewTitle),
 	formatMessage(messages.reportsTitle),
 	formatMessage(messages.externalFilesTitle),
+	formatMessage(messages.globalDetailTracesTitle),
 ]
 
 const selectedChip = computed({
 	get() {
 		const path = route.path
-		if (path === '/moderation/technical-review') {
+		if (path.startsWith('/moderation/technical-review')) {
 			return formatMessage(messages.technicalReviewTitle)
-		} else if (path.startsWith('/moderation/reports/')) {
+		} else if (path.startsWith('/moderation/reports')) {
 			return formatMessage(messages.reportsTitle)
+		} else if (path.startsWith('/moderation/external-projects')) {
+			return formatMessage(messages.externalFilesTitle)
+		} else if (path.startsWith('/moderation/global-traces')) {
+			return formatMessage(messages.globalDetailTracesTitle)
 		} else {
 			return formatMessage(messages.projectsTitle)
 		}
@@ -92,6 +106,10 @@ function navigateToPage(selectedOption: string) {
 		router.push('/moderation/technical-review')
 	} else if (selectedOption === formatMessage(messages.reportsTitle)) {
 		router.push('/moderation/reports')
+	} else if (selectedOption === formatMessage(messages.externalFilesTitle)) {
+		router.push('/moderation/external-projects')
+	} else if (selectedOption === formatMessage(messages.globalDetailTracesTitle)) {
+		router.push('/moderation/global-traces')
 	} else {
 		router.push('/moderation')
 	}
diff --git a/apps/frontend/src/pages/moderation/global-traces/[key].vue b/apps/frontend/src/pages/moderation/global-traces/[key].vue
new file mode 100644
index 0000000000..91b8ddb9f1
--- /dev/null
+++ b/apps/frontend/src/pages/moderation/global-traces/[key].vue
@@ -0,0 +1,153 @@
+<template>
+	<div class="flex flex-col gap-4">
+		<div>
+			<ButtonStyled>
+				<NuxtLink to="/moderation/global-traces">
+					<ArrowLeftIcon aria-hidden="true" />
+					Back to global traces
+				</NuxtLink>
+			</ButtonStyled>
+		</div>
+
+		<EmptyState
+			v-if="isLoading && !trace"
+			type="no-search-result"
+			heading="Loading global detail trace..."
+		/>
+		<EmptyState
+			v-else-if="loadError"
+			type="no-search-result"
+			heading="Failed to load global detail trace"
+		/>
+		<article v-else-if="trace" class="universal-card flex flex-col gap-3">
+			<div class="flex flex-wrap items-start justify-between gap-3">
+				<div class="min-w-0">
+					<div class="flex min-w-0 items-center gap-2">
+						<HashIcon class="shrink-0 text-secondary" aria-hidden="true" />
+						<h2 class="m-0 min-w-0 text-lg font-semibold text-contrast">
+							Trace
+							<span class="break-all font-mono text-base">{{ trace.detail_key }}</span>
+						</h2>
+					</div>
+					<p class="m-0 mt-1 text-sm text-secondary">
+						{{ pageStart }}-{{ pageEnd }} of {{ trace.local_trace_count }} local traces
+					</p>
+				</div>
+				<Badge :type="trace.verdict" />
+			</div>
+
+			<div
+				v-if="trace.local_trace_count > localTracePageSize"
+				class="flex flex-wrap items-center justify-between gap-3"
+			>
+				<Pagination :page="currentPage" :count="pageCount" @switch-page="switchPage" />
+				<p v-if="isLoading" class="m-0 text-sm text-secondary">Loading page...</p>
+			</div>
+
+			<div v-if="trace.local_traces.length > 0" class="flex flex-col gap-2">
+				<GlobalDetailLocalTraceCard
+					v-for="localTrace in trace.local_traces"
+					:key="localTrace.detail_id"
+					:trace="localTrace"
+				/>
+			</div>
+			<EmptyState v-else type="no-search-result" heading="No local traces match this key" />
+
+			<div v-if="trace.local_trace_count > localTracePageSize" class="mt-1 flex justify-end">
+				<Pagination :page="currentPage" :count="pageCount" @switch-page="switchPage" />
+			</div>
+		</article>
+		<EmptyState v-else type="no-search-result" heading="Global detail trace not found" />
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import { ArrowLeftIcon, HashIcon } from '@modrinth/assets'
+import { Badge, ButtonStyled, EmptyState, injectModrinthClient, Pagination } from '@modrinth/ui'
+
+import GlobalDetailLocalTraceCard from '~/components/ui/moderation/GlobalDetailLocalTraceCard.vue'
+
+const client = injectModrinthClient()
+const route = useRoute()
+
+const detailKey = computed(() => {
+	const key = route.params.key
+	return Array.isArray(key) ? key.join('/') : String(key)
+})
+
+useHead({ title: () => `Global trace - ${detailKey.value} - Modrinth` })
+
+const localTracePageSize = 20
+const isLoading = ref(false)
+const loadError = ref(false)
+const currentPage = ref(1)
+const pageStartCursors = ref<(string | null)[]>([null])
+const trace = ref<Labrinth.TechReview.Internal.GlobalIssueDetail | null>(null)
+
+const pageCount = computed(() =>
+	Math.max(Math.ceil((trace.value?.local_trace_count ?? 0) / localTracePageSize), 1),
+)
+const pageStart = computed(() =>
+	trace.value && trace.value.local_trace_count > 0
+		? (currentPage.value - 1) * localTracePageSize + 1
+		: 0,
+)
+const pageEnd = computed(() =>
+	Math.min(currentPage.value * localTracePageSize, trace.value?.local_trace_count ?? 0),
+)
+
+async function fetchTracePage(afterDetailId: string | null) {
+	return await client.labrinth.tech_review_internal.getGlobalIssueDetail({
+		detail_key: detailKey.value,
+		limit: localTracePageSize,
+		after_detail_id: afterDetailId,
+	})
+}
+
+async function loadPage(page: number) {
+	if (page < 1 || isLoading.value) return
+
+	isLoading.value = true
+	loadError.value = false
+
+	try {
+		while (pageStartCursors.value.length < page) {
+			const cursor = pageStartCursors.value[pageStartCursors.value.length - 1]
+			const response = await fetchTracePage(cursor)
+
+			if (!response.next_after_detail_id) {
+				trace.value = response.trace
+				currentPage.value = pageStartCursors.value.length
+				return
+			}
+
+			pageStartCursors.value.push(response.next_after_detail_id)
+		}
+
+		const response = await fetchTracePage(pageStartCursors.value[page - 1])
+		trace.value = response.trace
+		currentPage.value = page
+	} catch (error) {
+		console.error('Failed to load global detail trace', error)
+		loadError.value = true
+	} finally {
+		isLoading.value = false
+	}
+}
+
+async function switchPage(page: number) {
+	await loadPage(page)
+}
+
+watch(
+	detailKey,
+	() => {
+		currentPage.value = 1
+		pageStartCursors.value = [null]
+		trace.value = null
+		loadPage(1)
+	},
+	{ immediate: true },
+)
+</script>
diff --git a/apps/frontend/src/pages/moderation/global-traces/index.vue b/apps/frontend/src/pages/moderation/global-traces/index.vue
new file mode 100644
index 0000000000..617099d0a1
--- /dev/null
+++ b/apps/frontend/src/pages/moderation/global-traces/index.vue
@@ -0,0 +1,9 @@
+<template>
+	<GlobalDetailTracesList />
+</template>
+
+<script setup lang="ts">
+import GlobalDetailTracesList from '~/components/ui/moderation/GlobalDetailTracesList.vue'
+
+useHead({ title: 'Global detail traces - Modrinth' })
+</script>
diff --git a/apps/frontend/src/pages/moderation/index.vue b/apps/frontend/src/pages/moderation/index.vue
index c1699d549f..f89d6d2c8c 100644
--- a/apps/frontend/src/pages/moderation/index.vue
+++ b/apps/frontend/src/pages/moderation/index.vue
@@ -18,6 +18,7 @@
 					<Combobox
 						v-model="currentFilterType"
 						class="!w-full flex-grow sm:!w-[280px] sm:flex-grow-0 lg:!w-[280px]"
+						trigger-class="!h-10"
 						:options="filterTypes"
 						:placeholder="formatMessage(commonMessages.filterByLabel)"
 						@select="goToPage(1)"
@@ -26,7 +27,7 @@
 							<span class="flex flex-row gap-2 align-middle font-semibold">
 								<ListFilterIcon class="size-5 flex-shrink-0 text-secondary" />
 								<span class="truncate text-contrast"
-									>{{ currentFilterType }} ({{ filteredProjects.length }})</span
+									>{{ currentFilterType }} ({{ totalProjects }})</span
 								>
 							</span>
 						</template>
@@ -35,6 +36,7 @@
 					<Combobox
 						v-model="currentSortType"
 						class="!w-full flex-grow sm:!w-[240px] sm:flex-grow-0"
+						trigger-class="!h-10"
 						:options="sortTypes"
 						:placeholder="formatMessage(commonMessages.sortByLabel)"
 						@select="goToPage(1)"
@@ -54,6 +56,7 @@
 					<Combobox
 						v-model="itemsPerPage"
 						class="!w-full flex-grow sm:!w-[160px] sm:flex-grow-0 lg:!w-[140px]"
+						trigger-class="!h-10"
 						:options="itemsPerPageOptions"
 						placeholder="Items per page"
 						@select="goToPage(1)"
@@ -69,7 +72,7 @@
 				<ButtonStyled color="orange">
 					<button
 						class="flex !h-[40px] w-full items-center justify-center gap-2 sm:w-auto"
-						:disabled="paginatedProjects?.length === 0"
+						:disabled="pending || paginatedProjects?.length === 0"
 						@click="moderateAllInFilter()"
 					>
 						<ScaleIcon class="flex-shrink-0" />
@@ -80,17 +83,27 @@
 			</div>
 		</div>
 
-		<div v-if="totalPages > 1" class="flex items-center justify-between">
-			<div>
-				Showing {{ itemsPerPage * (currentPage - 1) + 1 }}–{{
-					itemsPerPage * (currentPage - 1) + Math.min(itemsPerPage, paginatedProjects.length)
-				}}
-				of {{ filteredProjects.length }}
-				{{
-					currentFilterType === DEFAULT_FILTER_TYPE ? 'projects' : currentFilterType.toLowerCase()
-				}}
+		<div class="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
+			<div class="flex flex-wrap items-center gap-3">
+				<div v-if="totalProjects > 0">
+					Showing {{ pageStart }}–{{ pageEnd }} of {{ totalProjects }}
+					{{
+						currentFilterType === DEFAULT_FILTER_TYPE ? 'projects' : currentFilterType.toLowerCase()
+					}}
+				</div>
+				<div class="flex items-center gap-2 text-sm font-semibold text-secondary">
+					<Toggle id="moderation-exclude-technical-review" v-model="excludeTechnicalReview" small />
+					<label class="cursor-pointer" for="moderation-exclude-technical-review">
+						{{ formatMessage(messages.excludeTechnicalReview) }}
+					</label>
+				</div>
 			</div>
-			<Pagination :page="currentPage" :count="totalPages" @switch-page="goToPage" />
+			<Pagination
+				v-if="totalPages > 1"
+				:page="currentPage"
+				:count="totalPages"
+				@switch-page="goToPage"
+			/>
 			<ConfettiExplosion v-if="visible" />
 		</div>
 
@@ -124,6 +137,7 @@
 	</div>
 </template>
 <script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
 import { ListFilterIcon, ScaleIcon, SearchIcon, SortAscIcon, SortDescIcon } from '@modrinth/assets'
 import {
 	ButtonStyled,
@@ -132,20 +146,18 @@ import {
 	commonMessages,
 	defineMessages,
 	EmptyState,
+	injectModrinthClient,
 	injectNotificationManager,
 	Pagination,
 	StyledInput,
+	Toggle,
 	useVIntl,
 } from '@modrinth/ui'
-import Fuse from 'fuse.js'
+import { useQuery } from '@tanstack/vue-query'
 import ConfettiExplosion from 'vue-confetti-explosion'
 
 import ModerationQueueCard from '~/components/ui/moderation/ModerationQueueCard.vue'
-import {
-	type ModerationProject,
-	type ProjectWithOwnership,
-	toModerationProjects,
-} from '~/helpers/moderation.ts'
+import { type ModerationProject, toModerationProjects } from '~/helpers/moderation.ts'
 import { useModerationQueue } from '~/services/moderation-queue.ts'
 
 useHead({ title: 'Projects queue - Modrinth' })
@@ -155,6 +167,7 @@ const { addNotification } = injectNotificationManager()
 const moderationQueue = useModerationQueue()
 const route = useRoute()
 const router = useRouter()
+const client = injectModrinthClient()
 
 const visible = ref(false)
 if (import.meta.client && history && history.state && history.state.confetti) {
@@ -173,37 +186,14 @@ const messages = defineMessages({
 		id: 'moderation.moderate',
 		defaultMessage: 'Moderate',
 	},
-})
-
-const { data: allProjects, pending } = await useLazyAsyncData('moderation-projects', async () => {
-	const startTime = performance.now()
-	let currentOffset = 0
-	const PROJECT_ENDPOINT_COUNT = 350
-	const allProjects: ModerationProject[] = []
-
-	let projects: ProjectWithOwnership[] = []
-	do {
-		projects = (await useBaseFetch(
-			`moderation/projects?count=${PROJECT_ENDPOINT_COUNT}&offset=${currentOffset}`,
-			{ internal: true },
-		)) as ProjectWithOwnership[]
-
-		if (projects.length === 0) break
-
-		allProjects.push(...toModerationProjects(projects))
-		currentOffset += projects.length
-	} while (projects.length === PROJECT_ENDPOINT_COUNT)
-
-	const duration = performance.now() - startTime
-
-	console.debug(
-		`Projects fetched and processed in ${duration.toFixed(2)}ms (${(duration / 1000).toFixed(2)}s)`,
-	)
-
-	return allProjects
+	excludeTechnicalReview: {
+		id: 'moderation.exclude-technical-review',
+		defaultMessage: 'Exclude TR',
+	},
 })
 
 const query = ref(route.query.q?.toString() || '')
+const excludeTechnicalReview = ref(false)
 
 watch(
 	query,
@@ -379,116 +369,106 @@ const itemsPerPage = computed({
 })
 
 const currentPage = ref(1)
-const totalPages = computed(() =>
-	Math.ceil((filteredProjects.value?.length || 0) / itemsPerPage.value),
+
+function toApiProjectType(label: string): string | undefined {
+	switch (label) {
+		case 'Modpacks':
+			return 'modpack'
+		case 'Mods':
+			return 'mod'
+		case 'Resource Packs':
+			return 'resourcepack'
+		case 'Data Packs':
+			return 'datapack'
+		case 'Plugins':
+			return 'plugin'
+		case 'Shaders':
+			return 'shader'
+		case 'Servers':
+			return 'minecraft_java_server'
+		case 'Fucked up':
+			return 'none'
+		default:
+			return undefined
+	}
+}
+
+function toApiSort(label: string): Labrinth.Moderation.Internal.ProjectsSort {
+	switch (label) {
+		case 'Newest':
+			return 'newest'
+		case 'Most external deps':
+			return 'most_external_deps'
+		case 'Least external deps':
+			return 'least_external_deps'
+		default:
+			return 'oldest'
+	}
+}
+
+const moderationProjectsRequest = computed<Labrinth.Moderation.Internal.ProjectsRequest>(() => ({
+	count: itemsPerPage.value,
+	offset: (currentPage.value - 1) * itemsPerPage.value,
+	exclude_technical_review: excludeTechnicalReview.value,
+	query: query.value || undefined,
+	project_type: toApiProjectType(currentFilterType.value),
+	sort: toApiSort(currentSortType.value),
+}))
+
+const moderationProjectsQueryKey = computed(
+	() => ['moderation-projects', moderationProjectsRequest.value] as const,
 )
 
-const fuse = computed(() => {
-	if (!allProjects.value || allProjects.value.length === 0) return null
-	return new Fuse(allProjects.value, {
-		keys: [
-			{
-				name: 'project.title',
-				weight: 3,
-			},
-			{
-				name: 'project.slug',
-				weight: 2,
-			},
-			{
-				name: 'project.description',
-				weight: 2,
-			},
-			{
-				name: 'project.project_type',
-				weight: 1,
-			},
-			'ownership.name',
-		],
-		includeScore: true,
-		threshold: 0.4,
-	})
+const {
+	data: moderationProjectsResponse,
+	isPending: moderationProjectsPending,
+	isPlaceholderData: moderationProjectsPlaceholder,
+} = useQuery({
+	queryKey: moderationProjectsQueryKey,
+	queryFn: ({ queryKey }) => client.labrinth.moderation_internal.getProjects(queryKey[1]),
+	placeholderData: (previousData) => previousData,
 })
 
-const searchResults = computed(() => {
-	if (!query.value || !fuse.value) return null
-	return fuse.value.search(query.value).map((result) => result.item)
-})
-
-const baseFiltered = computed(() => {
-	if (!allProjects.value) return []
-	return query.value && searchResults.value ? searchResults.value : [...allProjects.value]
-})
-
-const typeFiltered = computed(() => {
-	if (currentFilterType.value === 'All projects') {
-		return baseFiltered.value
-	} else if (currentFilterType.value === 'Fucked up') {
-		return baseFiltered.value.filter((queueItem) => queueItem.project.project_types.length === 0)
+const pending = computed(
+	() => moderationProjectsPending.value || moderationProjectsPlaceholder.value,
+)
+const totalProjects = computed(() => moderationProjectsResponse.value?.total ?? 0)
+const totalPages = computed(() => Math.ceil(totalProjects.value / itemsPerPage.value))
+const filteredProjects = computed(() =>
+	toModerationProjects(moderationProjectsResponse.value?.projects ?? []),
+)
+const paginatedProjects = computed(() => filteredProjects.value)
+const pageStart = computed(() =>
+	totalProjects.value === 0 ? 0 : (currentPage.value - 1) * itemsPerPage.value + 1,
+)
+const pageEnd = computed(() =>
+	Math.min(
+		(currentPage.value - 1) * itemsPerPage.value + paginatedProjects.value.length,
+		totalProjects.value,
+	),
+)
+const projectsById = computed(() => {
+	const projects = new Map<string, ModerationProject>()
+	for (const project of filteredProjects.value) {
+		projects.set(project.project.id, project)
 	}
 
-	const filterMap: Record<string, string> = {
-		Modpacks: 'modpack',
-		Mods: 'mod',
-		'Resource Packs': 'resourcepack',
-		'Data Packs': 'datapack',
-		Plugins: 'plugin',
-		Shaders: 'shader',
-		Servers: 'minecraft_java_server',
-	}
-	const projectType = filterMap[currentFilterType.value]
-	if (!projectType) return baseFiltered.value
-
-	return baseFiltered.value.filter(
-		(queueItem) =>
-			(queueItem.project.project_types.length > 0 &&
-				queueItem.project.project_types[0] === projectType) ||
-			(projectType === 'minecraft_java_server' &&
-				queueItem.project.project_types.includes('minecraft_java_server')),
-	)
+	return projects
 })
 
-const filteredProjects = computed(() => {
-	const filtered = [...typeFiltered.value]
-
-	if (currentSortType.value === 'Most external deps') {
-		filtered.sort((a, b) => {
-			const depsDiff = b.external_dependencies_count - a.external_dependencies_count
-			if (depsDiff !== 0) return depsDiff
-			const dateA = new Date(a.project.queued || a.project.published || 0).getTime()
-			const dateB = new Date(b.project.queued || b.project.published || 0).getTime()
-			return dateA - dateB
-		})
-	} else if (currentSortType.value === 'Least external deps') {
-		filtered.sort((a, b) => {
-			const depsDiff = a.external_dependencies_count - b.external_dependencies_count
-			if (depsDiff !== 0) return depsDiff
-			const dateA = new Date(a.project.queued || a.project.published || 0).getTime()
-			const dateB = new Date(b.project.queued || b.project.published || 0).getTime()
-			return dateA - dateB
-		})
-	} else if (currentSortType.value === 'Oldest') {
-		filtered.sort((a, b) => {
-			const dateA = new Date(a.project.queued || a.project.published || 0).getTime()
-			const dateB = new Date(b.project.queued || b.project.published || 0).getTime()
-			return dateA - dateB
-		})
-	} else {
-		filtered.sort((a, b) => {
-			const dateA = new Date(a.project.queued || a.project.published || 0).getTime()
-			const dateB = new Date(b.project.queued || b.project.published || 0).getTime()
-			return dateB - dateA
-		})
+watch(totalPages, (pages) => {
+	if (pages === 0 && currentPage.value !== 1) {
+		currentPage.value = 1
+		return
 	}
 
-	return filtered
+	if (pages > 0 && currentPage.value > pages) {
+		currentPage.value = pages
+	}
 })
 
-const paginatedProjects = computed(() => {
-	if (!filteredProjects.value) return []
-	const start = (currentPage.value - 1) * itemsPerPage.value
-	const end = start + itemsPerPage.value
-	return filteredProjects.value.slice(start, end)
+watch(excludeTechnicalReview, () => {
+	goToPage(1)
 })
 
 const emptyStateHeading = computed(() => {
@@ -525,21 +505,16 @@ function notifySkippedProjects(skippedCount: number) {
 	})
 }
 
-async function findFirstEligibleProject(): Promise<ModerationProject | null> {
+async function findFirstEligibleProject(): Promise<string | null> {
 	let skippedCount = 0
 
 	while (moderationQueue.hasItems) {
 		const currentId = moderationQueue.getCurrentProjectId()
 		if (!currentId) return null
 
-		const project = filteredProjects.value.find((p) => p.project.id === currentId)
-		if (!project) {
-			await moderationQueue.completeCurrentProject(currentId, 'skipped')
-			skippedCount++
-			continue
-		}
+		const project = projectsById.value.get(currentId)
 
-		if (project.project.status !== 'processing') {
+		if (project && project.project.status !== 'processing') {
 			await moderationQueue.completeCurrentProject(currentId, 'skipped')
 			skippedCount++
 			continue
@@ -550,13 +525,13 @@ async function findFirstEligibleProject(): Promise<ModerationProject | null> {
 
 			if (!lockStatus.locked || lockStatus.expired || lockStatus.is_own_lock) {
 				notifySkippedProjects(skippedCount)
-				return project
+				return currentId
 			}
 
 			await moderationQueue.completeCurrentProject(currentId, 'skipped')
 			skippedCount++
 		} catch {
-			return project
+			return currentId
 		}
 	}
 
@@ -565,17 +540,42 @@ async function findFirstEligibleProject(): Promise<ModerationProject | null> {
 	return null
 }
 
+function getProjectRouteParam(projectId: string): string {
+	return projectsById.value.get(projectId)?.project.slug || projectId
+}
+
+async function navigateToModerationProject(projectId: string) {
+	await navigateTo({
+		name: 'type-project',
+		params: {
+			type: 'project',
+			project: getProjectRouteParam(projectId),
+		},
+		state: {
+			showChecklist: true,
+		},
+	})
+}
+
+async function getFilteredProjectIds(): Promise<string[]> {
+	const response = await client.labrinth.moderation_internal.getProjectIds({
+		exclude_technical_review: excludeTechnicalReview.value,
+		query: query.value || undefined,
+		project_type: toApiProjectType(currentFilterType.value),
+		sort: toApiSort(currentSortType.value),
+	})
+
+	return response.ids
+}
+
 async function moderateAllInFilter() {
-	// Start from the current page - get projects from current page onwards
 	const startIndex = (currentPage.value - 1) * itemsPerPage.value
-	const projectsFromCurrentPage = filteredProjects.value.slice(startIndex)
-	const projectIds = projectsFromCurrentPage.map((queueItem) => queueItem.project.id)
+	const projectIds = (await getFilteredProjectIds()).slice(startIndex)
 	await moderationQueue.setQueue(projectIds)
 
-	// Find first unlocked project
-	const targetProject = await findFirstEligibleProject()
+	const targetProjectId = await findFirstEligibleProject()
 
-	if (!targetProject) {
+	if (!targetProjectId) {
 		addNotification({
 			title: 'No projects available',
 			text: 'All projects in queue are already moderated or locked by others.',
@@ -584,34 +584,22 @@ async function moderateAllInFilter() {
 		return
 	}
 
-	navigateTo({
-		name: 'type-project',
-		params: {
-			type: 'project',
-			project: targetProject.project.slug,
-		},
-		state: {
-			showChecklist: true,
-		},
-	})
+	await navigateToModerationProject(targetProjectId)
 }
 
 async function startFromProject(projectId: string) {
-	// Find the index of the clicked project in the filtered list
-	const projectIndex = filteredProjects.value.findIndex((p) => p.project.id === projectId)
+	const allFilteredProjectIds = await getFilteredProjectIds()
+	const projectIndex = allFilteredProjectIds.indexOf(projectId)
 	if (projectIndex === -1) {
-		// Project not found in filtered list, just moderate it alone
 		await moderationQueue.setSingleProject(projectId)
 	} else {
-		// Start queue from this project onwards
-		const projectsFromHere = filteredProjects.value.slice(projectIndex)
-		const projectIds = projectsFromHere.map((queueItem) => queueItem.project.id)
+		const projectIds = allFilteredProjectIds.slice(projectIndex)
 		await moderationQueue.setQueue(projectIds)
 	}
 
-	const targetProject = await findFirstEligibleProject()
+	const targetProjectId = await findFirstEligibleProject()
 
-	if (!targetProject) {
+	if (!targetProjectId) {
 		addNotification({
 			title: 'No projects available',
 			text: 'All projects in queue are already moderated or locked by others.',
@@ -620,15 +608,6 @@ async function startFromProject(projectId: string) {
 		return
 	}
 
-	navigateTo({
-		name: 'type-project',
-		params: {
-			type: 'project',
-			project: targetProject.project.slug,
-		},
-		state: {
-			showChecklist: true,
-		},
-	})
+	await navigateToModerationProject(targetProjectId)
 }
 </script>
diff --git a/apps/frontend/src/pages/moderation/technical-review/[project].vue b/apps/frontend/src/pages/moderation/technical-review/[project].vue
index e4ec62c54d..e4da9ba339 100644
--- a/apps/frontend/src/pages/moderation/technical-review/[project].vue
+++ b/apps/frontend/src/pages/moderation/technical-review/[project].vue
@@ -11,6 +11,7 @@ import ModerationTechRevCard from '~/components/ui/moderation/ModerationTechRevC
 
 const client = injectModrinthClient()
 const queryClient = useQueryClient()
+const route = useRoute()
 
 const projectId = String(useRouteId('project'))
 
@@ -245,6 +246,8 @@ const reviewItem = computed(() => {
 	}
 })
 
+const focusedDetailId = computed(() => route.query.detail?.toString() ?? null)
+
 async function handleMarkComplete(projectId: string) {
 	await Promise.all([
 		queryClient.invalidateQueries({ queryKey: ['tech-reviews'] }),
@@ -299,6 +302,7 @@ function refetch() {
 		<ModerationTechRevCard
 			v-else
 			:item="reviewItem"
+			:focused-detail-id="focusedDetailId"
 			:loading-issues="loadingIssues"
 			:decompiled-sources="decompiledSources"
 			@refetch="refetch"
diff --git a/apps/labrinth/.sqlx/query-0545adc0340800b9fb4c23eb5ec2b30d5bba824f80cd25dbf08ca9f86c32ea1f.json b/apps/labrinth/.sqlx/query-0545adc0340800b9fb4c23eb5ec2b30d5bba824f80cd25dbf08ca9f86c32ea1f.json
deleted file mode 100644
index 69de0be739..0000000000
--- a/apps/labrinth/.sqlx/query-0545adc0340800b9fb4c23eb5ec2b30d5bba824f80cd25dbf08ca9f86c32ea1f.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            m.id AS \"project_id: DBProjectId\",\n            MIN(t.id) AS \"thread_id!: DBThreadId\"\n        FROM mods m\n        INNER JOIN threads t ON t.mod_id = m.id\n        INNER JOIN versions v ON v.mod_id = m.id\n        INNER JOIN files f ON f.version_id = v.id\n        INNER JOIN delphi_reports dr ON dr.file_id = f.id\n        INNER JOIN delphi_report_issues dri ON dri.report_id = dr.id\n        INNER JOIN delphi_report_issue_details drid\n            ON drid.issue_id = dri.id\n        LEFT JOIN delphi_issue_detail_verdicts didv\n            ON m.id = didv.project_id AND drid.key = didv.detail_key\n        LEFT JOIN threads_messages tm_last\n            ON tm_last.thread_id = t.id\n            AND tm_last.id = (\n                SELECT id FROM threads_messages\n                WHERE thread_id = t.id\n                ORDER BY created DESC\n                LIMIT 1\n            )\n        LEFT JOIN users u_last\n            ON u_last.id = tm_last.author_id\n        WHERE\n            (\n                cardinality($4::text[]) = 0\n                OR (\n                    'minecraft_java_server' = ANY($4::text[])\n                    AND (\n                        m.components ? 'minecraft_server'\n                        OR m.components ? 'minecraft_java_server'\n                    )\n                )\n                OR EXISTS (\n                    SELECT 1\n                    FROM versions type_v\n                    INNER JOIN loaders_versions type_lv\n                        ON type_lv.version_id = type_v.id\n                    INNER JOIN loaders_project_types type_lpt\n                        ON type_lpt.joining_loader_id = type_lv.loader_id\n                    INNER JOIN project_types type_pt\n                        ON type_pt.id = type_lpt.joining_project_type_id\n                    WHERE\n                        type_v.mod_id = m.id\n                        AND type_pt.name = ANY($4::text[])\n                        AND (\n                            type_pt.name != 'modpack'\n                            OR NOT (\n                                m.components ? 'minecraft_server'\n                                OR m.components ? 'minecraft_java_server'\n                            )\n                        )\n                )\n            )\n            AND m.status NOT IN ('draft', 'rejected', 'withheld')\n            AND (cardinality($6::text[]) = 0 OR m.status = ANY($6::text[]))\n            AND (cardinality($7::text[]) = 0 OR dri.issue_type = ANY($7::text[]))\n            AND (didv.verdict IS NULL OR didv.verdict = 'pending'::delphi_report_issue_status)\n            AND (\n                $5::text IS NULL\n                OR ($5::text = 'unreplied' AND (tm_last.id IS NULL OR u_last.role IS NULL OR u_last.role NOT IN ('moderator', 'admin')))\n                OR ($5::text = 'replied' AND tm_last.id IS NOT NULL AND u_last.role IS NOT NULL AND u_last.role IN ('moderator', 'admin'))\n            )\n        GROUP BY m.id\n        ORDER BY\n            CASE WHEN $3 = 'created_asc'   THEN MIN(dr.created)  ELSE TO_TIMESTAMP(0)        END ASC,\n            CASE WHEN $3 = 'created_desc'  THEN MIN(dr.created)  ELSE TO_TIMESTAMP(0)        END DESC,\n            CASE WHEN $3 = 'severity_asc'  THEN MAX(dr.severity) ELSE 'low'::delphi_severity END ASC,\n            CASE WHEN $3 = 'severity_desc' THEN MAX(dr.severity) ELSE 'low'::delphi_severity END DESC,\n            -- tie-breaker: oldest reports\n            MIN(dr.created) ASC\n        LIMIT $1 OFFSET $2\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "project_id: DBProjectId",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "thread_id!: DBThreadId",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8",
-        "Text",
-        "TextArray",
-        "Text",
-        "TextArray",
-        "TextArray"
-      ]
-    },
-    "nullable": [
-      false,
-      null
-    ]
-  },
-  "hash": "0545adc0340800b9fb4c23eb5ec2b30d5bba824f80cd25dbf08ca9f86c32ea1f"
-}
diff --git a/apps/labrinth/.sqlx/query-055f71ec6d193c5f5259cafc989a04f3f791205e6c2df15c5bf9d5afcf71a76a.json b/apps/labrinth/.sqlx/query-055f71ec6d193c5f5259cafc989a04f3f791205e6c2df15c5bf9d5afcf71a76a.json
new file mode 100644
index 0000000000..cf686ee65a
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-055f71ec6d193c5f5259cafc989a04f3f791205e6c2df15c5bf9d5afcf71a76a.json
@@ -0,0 +1,148 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT\n            didws.key AS \"detail_key!\",\n            didws.id AS \"detail_id!: DelphiReportIssueDetailsId\",\n            didws.issue_id AS \"issue_id!: DelphiReportIssueId\",\n            dri.issue_type,\n            m.id AS \"project_id!: DBProjectId\",\n            m.slug AS \"project_slug?\",\n            m.name AS \"project_name!\",\n            v.id AS \"version_id!: DBVersionId\",\n            v.version_number,\n            f.id AS \"file_id!: DBFileId\",\n            f.filename AS \"file_name!\",\n            didws.jar AS \"jar?\",\n            didws.file_path AS \"file_path!\",\n            didws.severity AS \"severity!: DelphiSeverity\",\n            COALESCE(didv.verdict, 'pending'::delphi_report_issue_status)\n                AS \"local_status!: DelphiStatus\",\n            didws.status AS \"effective_status!: DelphiStatus\"\n        FROM delphi_issue_details_with_statuses didws\n        INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n        INNER JOIN delphi_reports dr ON dr.id = dri.report_id\n        INNER JOIN files f ON f.id = dr.file_id\n        INNER JOIN versions v ON v.id = f.version_id\n        INNER JOIN mods m ON m.id = v.mod_id\n        LEFT JOIN delphi_issue_detail_verdicts didv\n            ON didv.project_id = didws.project_id\n            AND didv.detail_key = didws.key\n        WHERE\n            didws.key = $1\n            AND ($2::bigint IS NULL OR didws.id > $2)\n            AND dri.issue_type != '__dummy'\n        ORDER BY didws.id\n        LIMIT $3\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "detail_key!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "detail_id!: DelphiReportIssueDetailsId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "issue_id!: DelphiReportIssueId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "issue_type",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 4,
+        "name": "project_id!: DBProjectId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 5,
+        "name": "project_slug?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "project_name!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "version_id!: DBVersionId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 8,
+        "name": "version_number",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 9,
+        "name": "file_id!: DBFileId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 10,
+        "name": "file_name!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 11,
+        "name": "jar?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 12,
+        "name": "file_path!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 13,
+        "name": "severity!: DelphiSeverity",
+        "type_info": {
+          "Custom": {
+            "name": "delphi_severity",
+            "kind": {
+              "Enum": [
+                "low",
+                "medium",
+                "high",
+                "severe"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "local_status!: DelphiStatus",
+        "type_info": {
+          "Custom": {
+            "name": "delphi_report_issue_status",
+            "kind": {
+              "Enum": [
+                "pending",
+                "safe",
+                "unsafe"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "effective_status!: DelphiStatus",
+        "type_info": {
+          "Custom": {
+            "name": "delphi_report_issue_status",
+            "kind": {
+              "Enum": [
+                "pending",
+                "safe",
+                "unsafe"
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      true,
+      true,
+      true,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      null,
+      true
+    ]
+  },
+  "hash": "055f71ec6d193c5f5259cafc989a04f3f791205e6c2df15c5bf9d5afcf71a76a"
+}
diff --git a/apps/labrinth/.sqlx/query-079846a1e6a6b080e0e7f2e3efbb53b6526332433faf66de8716bc5cd2b12afd.json b/apps/labrinth/.sqlx/query-079846a1e6a6b080e0e7f2e3efbb53b6526332433faf66de8716bc5cd2b12afd.json
new file mode 100644
index 0000000000..6872b92825
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-079846a1e6a6b080e0e7f2e3efbb53b6526332433faf66de8716bc5cd2b12afd.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        select id\n        from mods\n        where id = any($1)\n          and status not in ('rejected', 'draft', 'withheld', 'withdrawn')\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8Array"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "079846a1e6a6b080e0e7f2e3efbb53b6526332433faf66de8716bc5cd2b12afd"
+}
diff --git a/apps/labrinth/.sqlx/query-119a59fcf4bb2f19f89002c712a67c75d30056143c0bcabdbd74bb4c7b442082.json b/apps/labrinth/.sqlx/query-119a59fcf4bb2f19f89002c712a67c75d30056143c0bcabdbd74bb4c7b442082.json
deleted file mode 100644
index fcd5b34f17..0000000000
--- a/apps/labrinth/.sqlx/query-119a59fcf4bb2f19f89002c712a67c75d30056143c0bcabdbd74bb4c7b442082.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            id,\n            external_dependencies_count as \"external_dependencies_count!\"\n        FROM (\n            SELECT DISTINCT ON (m.id)\n                m.id,\n                m.queued,\n                (\n                    SELECT COUNT(*)\n                    FROM versions v\n                    INNER JOIN dependencies d ON d.dependent_id = v.id\n                    WHERE v.mod_id = m.id\n                        AND d.dependency_file_name IS NOT NULL\n                ) external_dependencies_count\n            FROM mods m\n\n            /* -- Temporarily, don't exclude projects in tech rev q\n\n                -- exclude projects in tech review queue\n                LEFT JOIN delphi_issue_details_with_statuses didws\n                    ON didws.project_id = m.id AND didws.status = 'pending'\n            */\n\n            WHERE\n                m.status = $1\n                /* AND didws.status IS NULL */ -- Temporarily don't exclude\n\n            GROUP BY m.id\n        ) t\n        WHERE\n            ($4::boolean IS NULL OR (external_dependencies_count > 0) = $4)\n        ORDER BY queued ASC\n        OFFSET $3\n        LIMIT $2\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "external_dependencies_count!",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Int8",
-        "Int8",
-        "Bool"
-      ]
-    },
-    "nullable": [
-      false,
-      null
-    ]
-  },
-  "hash": "119a59fcf4bb2f19f89002c712a67c75d30056143c0bcabdbd74bb4c7b442082"
-}
diff --git a/apps/labrinth/.sqlx/query-1a6d4ac11af078439cff5c772f4dc2392729f99ba1f8c7892831235f341fb276.json b/apps/labrinth/.sqlx/query-1a6d4ac11af078439cff5c772f4dc2392729f99ba1f8c7892831235f341fb276.json
new file mode 100644
index 0000000000..4db30b1153
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-1a6d4ac11af078439cff5c772f4dc2392729f99ba1f8c7892831235f341fb276.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT\n            m.id AS \"project_id: DBProjectId\",\n            MIN(t.id) AS \"thread_id!: DBThreadId\"\n        FROM mods m\n        INNER JOIN threads t ON t.mod_id = m.id\n        INNER JOIN versions v ON v.mod_id = m.id\n        INNER JOIN files f ON f.version_id = v.id\n        INNER JOIN delphi_reports dr ON dr.file_id = f.id\n        INNER JOIN delphi_report_issues dri ON dri.report_id = dr.id\n        INNER JOIN delphi_issue_details_with_statuses didws\n            ON didws.issue_id = dri.id\n        LEFT JOIN threads_messages tm_last\n            ON tm_last.thread_id = t.id\n            AND tm_last.id = (\n                SELECT id FROM threads_messages\n                WHERE thread_id = t.id\n                ORDER BY created DESC\n                LIMIT 1\n            )\n        LEFT JOIN users u_last\n            ON u_last.id = tm_last.author_id\n        WHERE\n            (\n                cardinality($4::text[]) = 0\n                OR (\n                    'minecraft_java_server' = ANY($4::text[])\n                    AND (\n                        m.components ? 'minecraft_server'\n                        OR m.components ? 'minecraft_java_server'\n                    )\n                )\n                OR EXISTS (\n                    SELECT 1\n                    FROM versions type_v\n                    INNER JOIN loaders_versions type_lv\n                        ON type_lv.version_id = type_v.id\n                    INNER JOIN loaders_project_types type_lpt\n                        ON type_lpt.joining_loader_id = type_lv.loader_id\n                    INNER JOIN project_types type_pt\n                        ON type_pt.id = type_lpt.joining_project_type_id\n                    WHERE\n                        type_v.mod_id = m.id\n                        AND type_pt.name = ANY($4::text[])\n                        AND (\n                            type_pt.name != 'modpack'\n                            OR NOT (\n                                m.components ? 'minecraft_server'\n                                OR m.components ? 'minecraft_java_server'\n                            )\n                        )\n                )\n            )\n            AND m.status NOT IN ('draft', 'rejected', 'withheld')\n            AND (cardinality($6::text[]) = 0 OR m.status = ANY($6::text[]))\n            AND (cardinality($7::text[]) = 0 OR dri.issue_type = ANY($7::text[]))\n            AND didws.status = 'pending'\n            AND (\n                $5::text IS NULL\n                OR ($5::text = 'unreplied' AND (tm_last.id IS NULL OR u_last.role IS NULL OR u_last.role NOT IN ('moderator', 'admin')))\n                OR ($5::text = 'replied' AND tm_last.id IS NOT NULL AND u_last.role IS NOT NULL AND u_last.role IN ('moderator', 'admin'))\n            )\n        GROUP BY m.id\n        ORDER BY\n            CASE WHEN $3 = 'created_asc'   THEN MIN(dr.created)  ELSE TO_TIMESTAMP(0)        END ASC,\n            CASE WHEN $3 = 'created_desc'  THEN MIN(dr.created)  ELSE TO_TIMESTAMP(0)        END DESC,\n            CASE WHEN $3 = 'severity_asc'  THEN MAX(dr.severity) ELSE 'low'::delphi_severity END ASC,\n            CASE WHEN $3 = 'severity_desc' THEN MAX(dr.severity) ELSE 'low'::delphi_severity END DESC,\n            -- tie-breaker: oldest reports\n            MIN(dr.created) ASC\n        LIMIT $1 OFFSET $2\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "project_id: DBProjectId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "thread_id!: DBThreadId",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8",
+        "Text",
+        "TextArray",
+        "Text",
+        "TextArray",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      false,
+      null
+    ]
+  },
+  "hash": "1a6d4ac11af078439cff5c772f4dc2392729f99ba1f8c7892831235f341fb276"
+}
diff --git a/apps/labrinth/.sqlx/query-1bff1c5714dd039814d7a9d9f25f4ceca0e84a42b3a4c414210739fec6308e2d.json b/apps/labrinth/.sqlx/query-1bff1c5714dd039814d7a9d9f25f4ceca0e84a42b3a4c414210739fec6308e2d.json
new file mode 100644
index 0000000000..c55b8c6c7c
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-1bff1c5714dd039814d7a9d9f25f4ceca0e84a42b3a4c414210739fec6308e2d.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT id\n            FROM mods\n            WHERE\n                status = $1\n                AND (\n                    $3::boolean = false\n                    OR NOT EXISTS (\n                        SELECT 1\n                        FROM delphi_issue_details_with_statuses didws\n                        WHERE didws.project_id = mods.id\n                            AND didws.status = 'pending'\n                    )\n                )\n            ORDER BY\n                CASE WHEN $2 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n                CASE WHEN $2 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST,\n                id ASC\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "1bff1c5714dd039814d7a9d9f25f4ceca0e84a42b3a4c414210739fec6308e2d"
+}
diff --git a/apps/labrinth/.sqlx/query-22fbd4bf1c2088903842b2c0070fd08431fc3f984263faed7aaeb311fa6ac2a9.json b/apps/labrinth/.sqlx/query-22fbd4bf1c2088903842b2c0070fd08431fc3f984263faed7aaeb311fa6ac2a9.json
new file mode 100644
index 0000000000..38d43c6043
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-22fbd4bf1c2088903842b2c0070fd08431fc3f984263faed7aaeb311fa6ac2a9.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH moderation_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.description,\n                    m.queued,\n                    m.published,\n                    m.organization_id,\n                    m.team_id,\n                    m.components\n                FROM mods m\n                WHERE\n                    m.status = $1\n                    AND (\n                        $7::boolean = false\n                        OR NOT EXISTS (\n                            SELECT 1\n                            FROM delphi_issue_details_with_statuses didws\n                            WHERE didws.project_id = m.id\n                                AND didws.status = 'pending'\n                        )\n                    )\n            ),\n            external_dependencies AS (\n                SELECT\n                    v.mod_id,\n                    COUNT(*) AS external_dependencies_count\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN dependencies d ON d.dependent_id = v.id\n                WHERE d.dependency_file_name IS NOT NULL\n                GROUP BY v.mod_id\n            ),\n            version_project_types AS (\n                SELECT\n                    v.mod_id,\n                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN loaders_versions lv ON v.id = lv.version_id\n                INNER JOIN loaders l ON lv.loader_id = l.id\n                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n                WHERE v.status = ANY($2)\n                GROUP BY v.mod_id\n            ),\n            queue_projects AS (\n                SELECT\n                    mp.id,\n                    mp.slug,\n                    mp.name,\n                    mp.summary,\n                    mp.description,\n                    mp.queued,\n                    mp.published,\n                    search_organization.name AS organization_name,\n                    search_owner.username AS owner_name,\n                    CASE\n                        WHEN mp.components ? 'minecraft_server'\n                            THEN ARRAY_APPEND(\n                                ARRAY_REMOVE(\n                                    COALESCE(vpt.project_types::text[], ARRAY[]::text[]),\n                                    'modpack'\n                                ),\n                                'minecraft_java_server'\n                            )\n                        ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])\n                    END AS project_types,\n                    COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count\n                FROM moderation_projects mp\n                LEFT JOIN organizations search_organization\n                    ON search_organization.id = mp.organization_id\n                    AND $3::text IS NOT NULL\n                LEFT JOIN LATERAL (\n                    SELECT\n                        u.username\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = mp.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) search_owner ON $3::text IS NOT NULL\n                    AND mp.organization_id IS NULL\n                LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id\n                LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id\n            )\n            SELECT id\n            FROM queue_projects\n            WHERE\n                (\n                    $3::text IS NULL\n                    OR name ILIKE '%' || $3 || '%'\n                    OR slug ILIKE '%' || $3 || '%'\n                    OR summary ILIKE '%' || $3 || '%'\n                    OR description ILIKE '%' || $3 || '%'\n                    OR owner_name ILIKE '%' || $3 || '%'\n                    OR organization_name ILIKE '%' || $3 || '%'\n                    OR EXISTS (\n                        SELECT 1\n                        FROM UNNEST(project_types) AS searched_project_type(project_type)\n                        WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'\n                    )\n                )\n                AND (\n                    $4::text IS NULL\n                    OR ($4 = 'none' AND CARDINALITY(project_types) = 0)\n                    OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])\n                    OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND project_types[1] = $4)\n                )\n                AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)\n            ORDER BY\n                CASE WHEN $6 = 'most_external_deps' THEN external_dependencies_count END DESC,\n                CASE WHEN $6 = 'least_external_deps' THEN external_dependencies_count END ASC,\n                CASE WHEN $6 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n                CASE WHEN $6 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,\n                id ASC\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray",
+        "Text",
+        "Text",
+        "Bool",
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "22fbd4bf1c2088903842b2c0070fd08431fc3f984263faed7aaeb311fa6ac2a9"
+}
diff --git a/apps/labrinth/.sqlx/query-4680c4a59c6679f90e3b9e1a33ed1cb1fb60b93ffb79ba5b99e01ee0c14c991a.json b/apps/labrinth/.sqlx/query-4680c4a59c6679f90e3b9e1a33ed1cb1fb60b93ffb79ba5b99e01ee0c14c991a.json
new file mode 100644
index 0000000000..21c5f042e6
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-4680c4a59c6679f90e3b9e1a33ed1cb1fb60b93ffb79ba5b99e01ee0c14c991a.json
@@ -0,0 +1,47 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT\n            dgdv.detail_key,\n            dgdv.verdict AS \"verdict!: DelphiStatus\",\n            COUNT(dri.id) AS \"local_trace_count!\"\n        FROM delphi_global_detail_verdicts dgdv\n        LEFT JOIN delphi_issue_details_with_statuses didws\n            ON didws.key = dgdv.detail_key\n        LEFT JOIN delphi_report_issues dri\n            ON dri.id = didws.issue_id\n            AND dri.issue_type != '__dummy'\n        WHERE (\n            $1::text IS NULL\n            OR dgdv.detail_key ILIKE '%' || $1 || '%'\n        )\n        GROUP BY dgdv.detail_key, dgdv.verdict\n        ORDER BY dgdv.detail_key\n        LIMIT $2 OFFSET $3\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "detail_key",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "verdict!: DelphiStatus",
+        "type_info": {
+          "Custom": {
+            "name": "delphi_report_issue_status",
+            "kind": {
+              "Enum": [
+                "pending",
+                "safe",
+                "unsafe"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "local_trace_count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      null
+    ]
+  },
+  "hash": "4680c4a59c6679f90e3b9e1a33ed1cb1fb60b93ffb79ba5b99e01ee0c14c991a"
+}
diff --git a/apps/labrinth/.sqlx/query-5a68c53bd00c08edf9dfb9ffdabc28f86cdd77cd06bbb10c9a8e5199509f9c4b.json b/apps/labrinth/.sqlx/query-5a68c53bd00c08edf9dfb9ffdabc28f86cdd77cd06bbb10c9a8e5199509f9c4b.json
new file mode 100644
index 0000000000..450ec6ad79
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-5a68c53bd00c08edf9dfb9ffdabc28f86cdd77cd06bbb10c9a8e5199509f9c4b.json
@@ -0,0 +1,135 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH filtered_projects AS (\n                SELECT\n                    m.id,\n                    m.queued,\n                    m.published\n                FROM mods m\n                WHERE\n                    m.status = $1\n                    AND (\n                        $6::boolean = false\n                        OR NOT EXISTS (\n                            SELECT 1\n                            FROM delphi_issue_details_with_statuses didws\n                            WHERE didws.project_id = m.id\n                                AND didws.status = 'pending'\n                        )\n                    )\n            ),\n            total AS (\n                SELECT COUNT(*) AS total_count FROM filtered_projects\n            ),\n            page_ids AS (\n                SELECT\n                    id,\n                    queued,\n                    published\n                FROM filtered_projects\n                ORDER BY\n                    CASE WHEN $5 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n                    CASE WHEN $5 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST,\n                    id ASC\n                OFFSET $4\n                LIMIT $3\n            ),\n            page_project_types AS (\n                SELECT\n                    v.mod_id,\n                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n                FROM versions v\n                INNER JOIN page_ids page ON page.id = v.mod_id\n                INNER JOIN loaders_versions lv ON v.id = lv.version_id\n                INNER JOIN loaders l ON lv.loader_id = l.id\n                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n                WHERE v.status = ANY($2)\n                GROUP BY v.mod_id\n            ),\n            page_external_dependencies AS (\n                SELECT\n                    v.mod_id,\n                    COUNT(*) AS external_dependencies_count\n                FROM versions v\n                INNER JOIN page_ids page ON page.id = v.mod_id\n                INNER JOIN dependencies d ON d.dependent_id = v.id\n                WHERE d.dependency_file_name IS NOT NULL\n                GROUP BY v.mod_id\n            ),\n            page_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.icon_url,\n                    m.status,\n                    m.requested_status,\n                    m.queued,\n                    m.published,\n                    m.updated,\n                    m.organization_id,\n                    o.name AS organization_name,\n                    o.icon_url AS organization_icon_url,\n                    owner.user_id AS owner_id,\n                    owner.username AS owner_name,\n                    owner.avatar_url AS owner_icon_url,\n                    CASE\n                        WHEN m.components ? 'minecraft_server'\n                            THEN ARRAY_APPEND(\n                                ARRAY_REMOVE(\n                                    COALESCE(ppt.project_types::text[], ARRAY[]::text[]),\n                                    'modpack'\n                                ),\n                                'minecraft_java_server'\n                            )\n                        ELSE COALESCE(ppt.project_types::text[], ARRAY[]::text[])\n                    END AS project_types,\n                    COALESCE(ped.external_dependencies_count, 0) AS external_dependencies_count\n                FROM page_ids page\n                INNER JOIN mods m ON m.id = page.id\n                LEFT JOIN organizations o ON o.id = m.organization_id\n                LEFT JOIN LATERAL (\n                    SELECT\n                        tm.user_id,\n                        u.username,\n                        u.avatar_url\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = m.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) owner ON m.organization_id IS NULL\n                LEFT JOIN page_project_types ppt ON ppt.mod_id = m.id\n                LEFT JOIN page_external_dependencies ped ON ped.mod_id = m.id\n            )\n            SELECT\n                total.total_count AS \"total_count!\",\n                page_projects.id AS \"id?\",\n                page_projects.slug AS \"slug?\",\n                page_projects.name AS \"name?\",\n                page_projects.summary AS \"summary?\",\n                page_projects.icon_url AS \"icon_url?\",\n                page_projects.status AS \"status?\",\n                page_projects.requested_status AS \"requested_status?\",\n                page_projects.queued AS \"queued?\",\n                page_projects.published AS \"published?\",\n                page_projects.updated AS \"updated?\",\n                page_projects.organization_id AS \"organization_id?\",\n                page_projects.organization_name AS \"organization_name?\",\n                page_projects.organization_icon_url AS \"organization_icon_url?\",\n                page_projects.owner_id AS \"owner_id?\",\n                page_projects.owner_name AS \"owner_name?\",\n                page_projects.owner_icon_url AS \"owner_icon_url?\",\n                page_projects.project_types AS \"project_types?: Vec<String>\",\n                page_projects.external_dependencies_count AS \"external_dependencies_count?\"\n            FROM total\n            LEFT JOIN page_projects ON true\n            ORDER BY\n                CASE WHEN $5 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,\n                CASE WHEN $5 = 'oldest' THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,\n                page_projects.id ASC\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "total_count!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "id?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "slug?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "name?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 4,
+        "name": "summary?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "icon_url?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "status?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "requested_status?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 8,
+        "name": "queued?",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 9,
+        "name": "published?",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 10,
+        "name": "updated?",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 11,
+        "name": "organization_id?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 12,
+        "name": "organization_name?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 13,
+        "name": "organization_icon_url?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 14,
+        "name": "owner_id?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 15,
+        "name": "owner_name?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 16,
+        "name": "owner_icon_url?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 17,
+        "name": "project_types?: Vec<String>",
+        "type_info": "TextArray"
+      },
+      {
+        "ordinal": 18,
+        "name": "external_dependencies_count?",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray",
+        "Int8",
+        "Int8",
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      null,
+      false,
+      true,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true,
+      false,
+      false,
+      true,
+      false,
+      true,
+      false,
+      false,
+      true,
+      null,
+      null
+    ]
+  },
+  "hash": "5a68c53bd00c08edf9dfb9ffdabc28f86cdd77cd06bbb10c9a8e5199509f9c4b"
+}
diff --git a/apps/labrinth/.sqlx/query-5e5fcfa6ac68f296ba5238e8211f8e206473f11fe1796fc2feda15f8d0ee7f41.json b/apps/labrinth/.sqlx/query-5e5fcfa6ac68f296ba5238e8211f8e206473f11fe1796fc2feda15f8d0ee7f41.json
new file mode 100644
index 0000000000..99e2d4391d
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-5e5fcfa6ac68f296ba5238e8211f8e206473f11fe1796fc2feda15f8d0ee7f41.json
@@ -0,0 +1,45 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT\n            dgdv.detail_key,\n            dgdv.verdict AS \"verdict!: DelphiStatus\",\n            COUNT(dri.id) AS \"local_trace_count!\"\n        FROM delphi_global_detail_verdicts dgdv\n        LEFT JOIN delphi_issue_details_with_statuses didws\n            ON didws.key = dgdv.detail_key\n        LEFT JOIN delphi_report_issues dri\n            ON dri.id = didws.issue_id\n            AND dri.issue_type != '__dummy'\n        WHERE dgdv.detail_key = $1\n        GROUP BY dgdv.detail_key, dgdv.verdict\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "detail_key",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "verdict!: DelphiStatus",
+        "type_info": {
+          "Custom": {
+            "name": "delphi_report_issue_status",
+            "kind": {
+              "Enum": [
+                "pending",
+                "safe",
+                "unsafe"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "local_trace_count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      null
+    ]
+  },
+  "hash": "5e5fcfa6ac68f296ba5238e8211f8e206473f11fe1796fc2feda15f8d0ee7f41"
+}
diff --git a/apps/labrinth/.sqlx/query-6402f359bbf733a9a2173f23c2ea222611fde49f692406123145dc6acd3dcd6a.json b/apps/labrinth/.sqlx/query-6402f359bbf733a9a2173f23c2ea222611fde49f692406123145dc6acd3dcd6a.json
new file mode 100644
index 0000000000..edd519845e
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-6402f359bbf733a9a2173f23c2ea222611fde49f692406123145dc6acd3dcd6a.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        WITH incoming AS (\n            SELECT *\n            FROM unnest($1::text[], $2::text[]) WITH ORDINALITY\n                AS u(detail_key, verdict, ord)\n        )\n        INSERT INTO delphi_global_detail_verdicts (\n            detail_key,\n            verdict\n        )\n        SELECT DISTINCT ON (detail_key)\n            detail_key,\n            verdict::delphi_report_issue_status\n        FROM incoming\n        ORDER BY detail_key, ord DESC\n        ON CONFLICT (detail_key)\n        DO UPDATE SET verdict = EXCLUDED.verdict\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "TextArray",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "6402f359bbf733a9a2173f23c2ea222611fde49f692406123145dc6acd3dcd6a"
+}
diff --git a/apps/labrinth/.sqlx/query-87d30e8802ebe69858141d0d918cafb5286f984cfe55ad1a7ac2219ec50539a4.json b/apps/labrinth/.sqlx/query-87d30e8802ebe69858141d0d918cafb5286f984cfe55ad1a7ac2219ec50539a4.json
new file mode 100644
index 0000000000..eabfd4299d
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-87d30e8802ebe69858141d0d918cafb5286f984cfe55ad1a7ac2219ec50539a4.json
@@ -0,0 +1,147 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        WITH ranked_local_traces AS (\n            SELECT\n                didws.key AS detail_key,\n                didws.id AS detail_id,\n                didws.issue_id,\n                dri.issue_type,\n                m.id AS project_id,\n                m.slug AS project_slug,\n                m.name AS project_name,\n                v.id AS version_id,\n                v.version_number,\n                f.id AS file_id,\n                f.filename AS file_name,\n                didws.jar,\n                didws.file_path,\n                didws.severity,\n                COALESCE(didv.verdict, 'pending'::delphi_report_issue_status)\n                    AS local_status,\n                didws.status AS effective_status,\n                ROW_NUMBER() OVER (\n                    PARTITION BY didws.key\n                    ORDER BY didws.id\n                ) AS row_num\n            FROM delphi_issue_details_with_statuses didws\n            INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n            INNER JOIN delphi_reports dr ON dr.id = dri.report_id\n            INNER JOIN files f ON f.id = dr.file_id\n            INNER JOIN versions v ON v.id = f.version_id\n            INNER JOIN mods m ON m.id = v.mod_id\n            LEFT JOIN delphi_issue_detail_verdicts didv\n                ON didv.project_id = didws.project_id\n                AND didv.detail_key = didws.key\n            WHERE\n                didws.key = ANY($1::text[])\n                AND dri.issue_type != '__dummy'\n        )\n        SELECT\n            detail_key AS \"detail_key!\",\n            detail_id AS \"detail_id!: DelphiReportIssueDetailsId\",\n            issue_id AS \"issue_id!: DelphiReportIssueId\",\n            issue_type,\n            project_id AS \"project_id!: DBProjectId\",\n            project_slug AS \"project_slug?\",\n            project_name AS \"project_name!\",\n            version_id AS \"version_id!: DBVersionId\",\n            v.version_number,\n            file_id AS \"file_id!: DBFileId\",\n            file_name AS \"file_name!\",\n            jar AS \"jar?\",\n            file_path AS \"file_path!\",\n            severity AS \"severity!: DelphiSeverity\",\n            local_status AS \"local_status!: DelphiStatus\",\n            effective_status AS \"effective_status!: DelphiStatus\"\n        FROM ranked_local_traces v\n        WHERE row_num <= $2\n        ORDER BY detail_key, detail_id\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "detail_key!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "detail_id!: DelphiReportIssueDetailsId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "issue_id!: DelphiReportIssueId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "issue_type",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 4,
+        "name": "project_id!: DBProjectId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 5,
+        "name": "project_slug?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "project_name!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "version_id!: DBVersionId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 8,
+        "name": "version_number",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 9,
+        "name": "file_id!: DBFileId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 10,
+        "name": "file_name!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 11,
+        "name": "jar?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 12,
+        "name": "file_path!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 13,
+        "name": "severity!: DelphiSeverity",
+        "type_info": {
+          "Custom": {
+            "name": "delphi_severity",
+            "kind": {
+              "Enum": [
+                "low",
+                "medium",
+                "high",
+                "severe"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "local_status!: DelphiStatus",
+        "type_info": {
+          "Custom": {
+            "name": "delphi_report_issue_status",
+            "kind": {
+              "Enum": [
+                "pending",
+                "safe",
+                "unsafe"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "effective_status!: DelphiStatus",
+        "type_info": {
+          "Custom": {
+            "name": "delphi_report_issue_status",
+            "kind": {
+              "Enum": [
+                "pending",
+                "safe",
+                "unsafe"
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "TextArray",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      true,
+      true,
+      true,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      null,
+      true
+    ]
+  },
+  "hash": "87d30e8802ebe69858141d0d918cafb5286f984cfe55ad1a7ac2219ec50539a4"
+}
diff --git a/apps/labrinth/.sqlx/query-263ad3654f544ffb6061c839d49dada47fb382a76fdcabad2077fb1ef6d1010a.json b/apps/labrinth/.sqlx/query-951700c659d040068dae8e2f91b82b6a3af676439b47ff76d72000ddeca0e334.json
similarity index 56%
rename from apps/labrinth/.sqlx/query-263ad3654f544ffb6061c839d49dada47fb382a76fdcabad2077fb1ef6d1010a.json
rename to apps/labrinth/.sqlx/query-951700c659d040068dae8e2f91b82b6a3af676439b47ff76d72000ddeca0e334.json
index 23c13cd169..a3d7addb9c 100644
--- a/apps/labrinth/.sqlx/query-263ad3654f544ffb6061c839d49dada47fb382a76fdcabad2077fb1ef6d1010a.json
+++ b/apps/labrinth/.sqlx/query-951700c659d040068dae8e2f91b82b6a3af676439b47ff76d72000ddeca0e334.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            drid.id AS \"id!: DelphiReportIssueDetailsId\",\n            drid.issue_id AS \"issue_id!: DelphiReportIssueId\",\n            drid.key AS \"key!: String\",\n            drid.jar AS \"jar?: String\",\n            drid.file_path AS \"file_path!: String\",\n            drid.data AS \"data!: sqlx::types::Json<HashMap<String, serde_json::Value>>\",\n            drid.severity AS \"severity!: DelphiSeverity\",\n            COALESCE(didv.verdict, 'pending'::delphi_report_issue_status) AS \"status!: DelphiStatus\"\n        FROM delphi_report_issue_details drid\n        INNER JOIN delphi_report_issues dri ON dri.id = drid.issue_id\n        INNER JOIN delphi_reports dr ON dr.id = dri.report_id\n        INNER JOIN files f ON f.id = dr.file_id\n        INNER JOIN versions v ON v.id = f.version_id\n        INNER JOIN mods m ON m.id = v.mod_id\n        LEFT JOIN delphi_issue_detail_verdicts didv\n            ON m.id = didv.project_id AND drid.key = didv.detail_key\n        WHERE drid.issue_id = ANY($1::bigint[])\n        ",
+  "query": "\n        SELECT\n            didws.id AS \"id!: DelphiReportIssueDetailsId\",\n            didws.issue_id AS \"issue_id!: DelphiReportIssueId\",\n            didws.key AS \"key!: String\",\n            didws.jar AS \"jar?: String\",\n            didws.file_path AS \"file_path!: String\",\n            didws.data AS \"data!: sqlx::types::Json<HashMap<String, serde_json::Value>>\",\n            didws.severity AS \"severity!: DelphiSeverity\",\n            didws.status AS \"status!: DelphiStatus\"\n        FROM delphi_issue_details_with_statuses didws\n        WHERE didws.issue_id = ANY($1::bigint[])\n        ",
   "describe": {
     "columns": [
       {
@@ -73,15 +73,15 @@
       ]
     },
     "nullable": [
-      false,
-      false,
-      false,
       true,
-      false,
-      false,
-      false,
-      null
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true
     ]
   },
-  "hash": "263ad3654f544ffb6061c839d49dada47fb382a76fdcabad2077fb1ef6d1010a"
+  "hash": "951700c659d040068dae8e2f91b82b6a3af676439b47ff76d72000ddeca0e334"
 }
diff --git a/apps/labrinth/.sqlx/query-997944b328b628792d84b21747f9e9c670ad40d0f89a175aedece93df1169195.json b/apps/labrinth/.sqlx/query-997944b328b628792d84b21747f9e9c670ad40d0f89a175aedece93df1169195.json
deleted file mode 100644
index ccb1ff7d65..0000000000
--- a/apps/labrinth/.sqlx/query-997944b328b628792d84b21747f9e9c670ad40d0f89a175aedece93df1169195.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT EXISTS(\n            SELECT 1\n            FROM unnest($2::text[]) AS incoming(detail_key)\n            LEFT JOIN delphi_issue_detail_verdicts didv\n                ON didv.project_id = $1 AND didv.detail_key = incoming.detail_key\n            WHERE didv.project_id IS NULL\n        ) AS \"has_unflagged_issue_details!\"\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "has_unflagged_issue_details!",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "TextArray"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "997944b328b628792d84b21747f9e9c670ad40d0f89a175aedece93df1169195"
-}
diff --git a/apps/labrinth/.sqlx/query-bab0f71c84902bac7589a30923e95cbcd76d340c21ac6116d9bd27878786bd26.json b/apps/labrinth/.sqlx/query-bab0f71c84902bac7589a30923e95cbcd76d340c21ac6116d9bd27878786bd26.json
new file mode 100644
index 0000000000..37671e4a2a
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-bab0f71c84902bac7589a30923e95cbcd76d340c21ac6116d9bd27878786bd26.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT EXISTS(\n            SELECT 1\n            FROM unnest($2::text[]) AS incoming(detail_key)\n            LEFT JOIN delphi_global_detail_verdicts dgdv\n                ON dgdv.detail_key = incoming.detail_key\n            LEFT JOIN delphi_issue_detail_verdicts didv\n                ON didv.project_id = $1 AND didv.detail_key = incoming.detail_key\n            WHERE dgdv.detail_key IS NULL AND didv.project_id IS NULL\n        ) AS \"has_unflagged_issue_details!\"\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "has_unflagged_issue_details!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "bab0f71c84902bac7589a30923e95cbcd76d340c21ac6116d9bd27878786bd26"
+}
diff --git a/apps/labrinth/.sqlx/query-c9d5796b2c98dedd9f2f237a1a2cf7a059a49387c0c564b730733bda7358f7fe.json b/apps/labrinth/.sqlx/query-c9d5796b2c98dedd9f2f237a1a2cf7a059a49387c0c564b730733bda7358f7fe.json
new file mode 100644
index 0000000000..3d0aa419ad
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-c9d5796b2c98dedd9f2f237a1a2cf7a059a49387c0c564b730733bda7358f7fe.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT COUNT(*) AS \"total!\"\n        FROM delphi_global_detail_verdicts dgdv\n        WHERE (\n            $1::text IS NULL\n            OR dgdv.detail_key ILIKE '%' || $1 || '%'\n        )\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "total!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "c9d5796b2c98dedd9f2f237a1a2cf7a059a49387c0c564b730733bda7358f7fe"
+}
diff --git a/apps/labrinth/.sqlx/query-ca8493b59004511e8d26200638951d55a61c2b6466db69a81be975e150b3ef41.json b/apps/labrinth/.sqlx/query-ca8493b59004511e8d26200638951d55a61c2b6466db69a81be975e150b3ef41.json
new file mode 100644
index 0000000000..91c2728ad9
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-ca8493b59004511e8d26200638951d55a61c2b6466db69a81be975e150b3ef41.json
@@ -0,0 +1,138 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH moderation_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.description,\n                    m.queued,\n                    m.published,\n                    m.organization_id,\n                    m.team_id,\n                    m.components\n                FROM mods m\n                WHERE\n                    m.status = $1\n                    AND (\n                        $9::boolean = false\n                        OR NOT EXISTS (\n                            SELECT 1\n                            FROM delphi_issue_details_with_statuses didws\n                            WHERE didws.project_id = m.id\n                                AND didws.status = 'pending'\n                        )\n                    )\n            ),\n            external_dependencies AS (\n                SELECT\n                    v.mod_id,\n                    COUNT(*) AS external_dependencies_count\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN dependencies d ON d.dependent_id = v.id\n                WHERE d.dependency_file_name IS NOT NULL\n                GROUP BY v.mod_id\n            ),\n            version_project_types AS (\n                SELECT\n                    v.mod_id,\n                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN loaders_versions lv ON v.id = lv.version_id\n                INNER JOIN loaders l ON lv.loader_id = l.id\n                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n                WHERE v.status = ANY($2)\n                GROUP BY v.mod_id\n            ),\n            queue_projects AS (\n                SELECT\n                    mp.id,\n                    mp.slug,\n                    mp.name,\n                    mp.summary,\n                    mp.description,\n                    mp.queued,\n                    mp.published,\n                    search_organization.name AS organization_name,\n                    search_owner.username AS owner_name,\n                    CASE\n                        WHEN mp.components ? 'minecraft_server'\n                            THEN ARRAY_APPEND(\n                                ARRAY_REMOVE(\n                                    COALESCE(vpt.project_types::text[], ARRAY[]::text[]),\n                                    'modpack'\n                                ),\n                                'minecraft_java_server'\n                            )\n                        ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])\n                    END AS project_types,\n                    COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count\n                FROM moderation_projects mp\n                LEFT JOIN organizations search_organization\n                    ON search_organization.id = mp.organization_id\n                    AND $3::text IS NOT NULL\n                LEFT JOIN LATERAL (\n                    SELECT\n                        u.username\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = mp.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) search_owner ON $3::text IS NOT NULL\n                    AND mp.organization_id IS NULL\n                LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id\n                LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id\n            ),\n            filtered_projects AS (\n                SELECT\n                    id,\n                    queued,\n                    published,\n                    project_types,\n                    external_dependencies_count\n                FROM queue_projects\n                WHERE\n                    (\n                        $3::text IS NULL\n                        OR name ILIKE '%' || $3 || '%'\n                        OR slug ILIKE '%' || $3 || '%'\n                        OR summary ILIKE '%' || $3 || '%'\n                        OR description ILIKE '%' || $3 || '%'\n                        OR owner_name ILIKE '%' || $3 || '%'\n                        OR organization_name ILIKE '%' || $3 || '%'\n                        OR EXISTS (\n                            SELECT 1\n                            FROM UNNEST(project_types) AS searched_project_type(project_type)\n                            WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'\n                        )\n                    )\n                    AND (\n                        $4::text IS NULL\n                        OR ($4 = 'none' AND CARDINALITY(project_types) = 0)\n                        OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])\n                        OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND\n                            project_types[1] = $4\n                        )\n                    )\n                    AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)\n            ),\n            total AS (\n                SELECT COUNT(*) AS total_count FROM filtered_projects\n            ),\n            page_ids AS (\n                SELECT\n                    id,\n                    queued,\n                    published,\n                    project_types,\n                    external_dependencies_count\n                FROM filtered_projects\n                ORDER BY\n                    CASE WHEN $8 = 'most_external_deps' THEN external_dependencies_count END DESC,\n                    CASE WHEN $8 = 'least_external_deps' THEN external_dependencies_count END ASC,\n                    CASE WHEN $8 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n                    CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,\n                    id ASC\n                OFFSET $7\n                LIMIT $6\n            ),\n            page_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.icon_url,\n                    m.status,\n                    m.requested_status,\n                    m.queued,\n                    m.published,\n                    m.updated,\n                    m.organization_id,\n                    m.team_id,\n                    o.name AS organization_name,\n                    o.icon_url AS organization_icon_url,\n                    owner.user_id AS owner_id,\n                    owner.username AS owner_name,\n                    owner.avatar_url AS owner_icon_url,\n                    page_ids.project_types,\n                    page_ids.external_dependencies_count\n                FROM page_ids\n                INNER JOIN mods m ON m.id = page_ids.id\n                LEFT JOIN organizations o ON o.id = m.organization_id\n                LEFT JOIN LATERAL (\n                    SELECT\n                        tm.user_id,\n                        u.username,\n                        u.avatar_url\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = m.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) owner ON m.organization_id IS NULL\n            )\n            SELECT\n                total.total_count AS \"total_count!\",\n                page_projects.id AS \"id?\",\n                page_projects.slug AS \"slug?\",\n                page_projects.name AS \"name?\",\n                page_projects.summary AS \"summary?\",\n                page_projects.icon_url AS \"icon_url?\",\n                page_projects.status AS \"status?\",\n                page_projects.requested_status AS \"requested_status?\",\n                page_projects.queued AS \"queued?\",\n                page_projects.published AS \"published?\",\n                page_projects.updated AS \"updated?\",\n                page_projects.organization_id AS \"organization_id?\",\n                page_projects.organization_name AS \"organization_name?\",\n                page_projects.organization_icon_url AS \"organization_icon_url?\",\n                page_projects.owner_id AS \"owner_id?\",\n                page_projects.owner_name AS \"owner_name?\",\n                page_projects.owner_icon_url AS \"owner_icon_url?\",\n                page_projects.project_types AS \"project_types?: Vec<String>\",\n                page_projects.external_dependencies_count AS \"external_dependencies_count?\"\n            FROM total\n            LEFT JOIN page_projects ON true\n            ORDER BY\n                CASE WHEN $8 = 'most_external_deps' THEN page_projects.external_dependencies_count END DESC,\n                CASE WHEN $8 = 'least_external_deps' THEN page_projects.external_dependencies_count END ASC,\n                CASE WHEN $8 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,\n                CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,\n                page_projects.id ASC\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "total_count!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "id?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "slug?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "name?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 4,
+        "name": "summary?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "icon_url?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "status?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "requested_status?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 8,
+        "name": "queued?",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 9,
+        "name": "published?",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 10,
+        "name": "updated?",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 11,
+        "name": "organization_id?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 12,
+        "name": "organization_name?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 13,
+        "name": "organization_icon_url?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 14,
+        "name": "owner_id?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 15,
+        "name": "owner_name?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 16,
+        "name": "owner_icon_url?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 17,
+        "name": "project_types?: Vec<String>",
+        "type_info": "TextArray"
+      },
+      {
+        "ordinal": 18,
+        "name": "external_dependencies_count?",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray",
+        "Text",
+        "Text",
+        "Bool",
+        "Int8",
+        "Int8",
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      null,
+      false,
+      true,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true,
+      false,
+      false,
+      true,
+      false,
+      true,
+      false,
+      false,
+      true,
+      null,
+      null
+    ]
+  },
+  "hash": "ca8493b59004511e8d26200638951d55a61c2b6466db69a81be975e150b3ef41"
+}
diff --git a/apps/labrinth/.sqlx/query-ccedb120b05ff47ddc15bb4570025a8e8249050c12f7036d936f9a01f939db1f.json b/apps/labrinth/.sqlx/query-ccedb120b05ff47ddc15bb4570025a8e8249050c12f7036d936f9a01f939db1f.json
deleted file mode 100644
index b676807d6b..0000000000
--- a/apps/labrinth/.sqlx/query-ccedb120b05ff47ddc15bb4570025a8e8249050c12f7036d936f9a01f939db1f.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        WITH incoming AS (\n            SELECT *\n            FROM unnest($1::bigint[], $2::text[]) WITH ORDINALITY\n                AS u(detail_id, verdict, ord)\n        ),\n        resolved AS (\n            SELECT\n                i.ord,\n                didws.project_id,\n                didws.key AS detail_key,\n                i.verdict::delphi_report_issue_status AS verdict\n            FROM incoming i\n            INNER JOIN delphi_issue_details_with_statuses didws ON didws.id = i.detail_id\n            INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n            WHERE\n                -- see delphi.rs todo comment\n                dri.issue_type != '__dummy'\n        ),\n        validated AS (\n            SELECT\n                (SELECT COUNT(*) FROM incoming) AS incoming_count,\n                (SELECT COUNT(*) FROM resolved) AS resolved_count\n        ),\n        upserted AS (\n            INSERT INTO delphi_issue_detail_verdicts (\n                project_id,\n                detail_key,\n                verdict\n            )\n            SELECT DISTINCT ON (project_id, detail_key)\n                project_id,\n                detail_key,\n                verdict\n            FROM resolved\n            ORDER BY project_id, detail_key, ord DESC\n            ON CONFLICT (project_id, detail_key)\n            DO UPDATE SET verdict = EXCLUDED.verdict\n            RETURNING 1\n        )\n        SELECT\n            (v.incoming_count = v.resolved_count) AS \"all_found!\",\n            (SELECT COUNT(*) FROM upserted) AS \"upserted_count!\"\n        FROM validated v\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "all_found!",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 1,
-        "name": "upserted_count!",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8Array",
-        "TextArray"
-      ]
-    },
-    "nullable": [
-      null,
-      null
-    ]
-  },
-  "hash": "ccedb120b05ff47ddc15bb4570025a8e8249050c12f7036d936f9a01f939db1f"
-}
diff --git a/apps/labrinth/.sqlx/query-e8b6e423aaf62046afd19fb1e177a3ef1f18f4814df8924926c47d4b0c7145c7.json b/apps/labrinth/.sqlx/query-e8b6e423aaf62046afd19fb1e177a3ef1f18f4814df8924926c47d4b0c7145c7.json
new file mode 100644
index 0000000000..1e3e8c4d7f
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-e8b6e423aaf62046afd19fb1e177a3ef1f18f4814df8924926c47d4b0c7145c7.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        WITH incoming AS (\n            SELECT *\n            FROM unnest($1::bigint[], $2::text[]) WITH ORDINALITY\n                AS u(detail_id, verdict, ord)\n        ),\n        resolved AS (\n            SELECT\n                i.ord,\n                didws.project_id,\n                didws.key AS detail_key,\n                i.verdict\n            FROM incoming i\n            INNER JOIN delphi_issue_details_with_statuses didws ON didws.id = i.detail_id\n            INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n            WHERE\n                -- see delphi.rs todo comment\n                dri.issue_type != '__dummy'\n        ),\n        validated AS (\n            SELECT\n                (SELECT COUNT(*) FROM incoming) AS incoming_count,\n                (SELECT COUNT(*) FROM resolved) AS resolved_count\n        ),\n        latest AS (\n            SELECT DISTINCT ON (project_id, detail_key)\n                project_id,\n                detail_key,\n                verdict\n            FROM resolved\n            ORDER BY project_id, detail_key, ord DESC\n        ),\n        deleted AS (\n            DELETE FROM delphi_issue_detail_verdicts didv\n            USING latest\n            WHERE\n                didv.project_id = latest.project_id\n                AND didv.detail_key = latest.detail_key\n                AND latest.verdict = 'pending'\n            RETURNING 1\n        ),\n        upserted AS (\n            INSERT INTO delphi_issue_detail_verdicts (\n                project_id,\n                detail_key,\n                verdict\n            )\n            SELECT\n                project_id,\n                detail_key,\n                verdict::delphi_report_issue_status\n            FROM latest\n            WHERE verdict != 'pending'\n            ON CONFLICT (project_id, detail_key)\n            DO UPDATE SET verdict = EXCLUDED.verdict\n            RETURNING 1\n        )\n        SELECT\n            (v.incoming_count = v.resolved_count) AS \"all_found!\",\n            (SELECT COUNT(*) FROM upserted) AS \"upserted_count!\"\n        FROM validated v\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "all_found!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 1,
+        "name": "upserted_count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8Array",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "e8b6e423aaf62046afd19fb1e177a3ef1f18f4814df8924926c47d4b0c7145c7"
+}
diff --git a/apps/labrinth/AGENTS.md b/apps/labrinth/AGENTS.md
index bee7be3220..0c1e193f6f 100644
--- a/apps/labrinth/AGENTS.md
+++ b/apps/labrinth/AGENTS.md
@@ -33,3 +33,4 @@
 - To seed the database locally: `psql postgresql://labrinth:labrinth@localhost/labrinth -f apps/labrinth/fixtures/labrinth-seed-data-202508052143.sql`
 - When writing `sqlx` queries, prefer `r#` raw strings over escaping quotes
 - When interacting with the Postgres database, prefer using a `ro_pool: ReadOnlyPgPool` when performing read-only operations
+- After writing a SQL query, run `EXPLAIN ANALYZE` to see how long the query would take to run. Report to the user the estimated performance impact of the query.
diff --git a/apps/labrinth/migrations/20260707120000_delphi_global_detail_verdicts.sql b/apps/labrinth/migrations/20260707120000_delphi_global_detail_verdicts.sql
new file mode 100644
index 0000000000..0e4d5323cd
--- /dev/null
+++ b/apps/labrinth/migrations/20260707120000_delphi_global_detail_verdicts.sql
@@ -0,0 +1,29 @@
+CREATE TABLE delphi_global_detail_verdicts (
+	detail_key TEXT PRIMARY KEY,
+	verdict    delphi_report_issue_status NOT NULL
+);
+
+CREATE INDEX delphi_report_issue_details_key
+	ON delphi_report_issue_details (key);
+
+CREATE INDEX delphi_issue_detail_verdicts_detail_key
+	ON delphi_issue_detail_verdicts (detail_key);
+
+DROP VIEW delphi_issue_details_with_statuses;
+
+CREATE VIEW delphi_issue_details_with_statuses AS
+SELECT
+	drid.*,
+	m.id AS project_id,
+	COALESCE(dgdv.verdict, didv.verdict, 'pending') AS status
+FROM delphi_report_issue_details drid
+INNER JOIN delphi_report_issues dri ON dri.id = drid.issue_id
+INNER JOIN delphi_reports dr ON dr.id = dri.report_id
+INNER JOIN files f ON f.id = dr.file_id
+INNER JOIN versions v ON v.id = f.version_id
+INNER JOIN mods m ON m.id = v.mod_id
+LEFT JOIN delphi_global_detail_verdicts dgdv
+	ON drid.key = dgdv.detail_key
+LEFT JOIN delphi_issue_detail_verdicts didv
+	ON m.id = didv.project_id
+	AND drid.key = didv.detail_key;
diff --git a/apps/labrinth/src/models/v2/notifications.rs b/apps/labrinth/src/models/v2/notifications.rs
index 9f02f5888c..1eb749fbed 100644
--- a/apps/labrinth/src/models/v2/notifications.rs
+++ b/apps/labrinth/src/models/v2/notifications.rs
@@ -78,6 +78,7 @@ pub enum LegacyNotificationBody {
     SharedInstanceInvite {
         shared_instance_id: String,
         shared_instance_name: String,
+        shared_instance_icon: Option<String>,
         invited_by: UserId,
     },
     StatusChange {
@@ -307,10 +308,12 @@ impl LegacyNotification {
             NotificationBody::SharedInstanceInvite {
                 shared_instance_id,
                 shared_instance_name,
+                shared_instance_icon,
                 invited_by,
             } => LegacyNotificationBody::SharedInstanceInvite {
                 shared_instance_id,
                 shared_instance_name,
+                shared_instance_icon,
                 invited_by,
             },
             NotificationBody::StatusChange {
diff --git a/apps/labrinth/src/models/v2/search.rs b/apps/labrinth/src/models/v2/search.rs
index c105fa3dc1..46865a47a5 100644
--- a/apps/labrinth/src/models/v2/search.rs
+++ b/apps/labrinth/src/models/v2/search.rs
@@ -15,6 +15,8 @@ pub struct LegacySearchResults {
 pub struct LegacyResultSearchProject {
     pub project_id: String,
     pub project_type: String,
+    #[serde(default)]
+    pub all_project_types: Vec<String>,
     pub slug: Option<String>,
     pub author: String,
     #[serde(default)]
@@ -136,6 +138,7 @@ impl LegacyResultSearchProject {
 
         Self {
             project_type,
+            all_project_types: result_search_project.all_project_types,
             client_side,
             server_side,
             versions,
diff --git a/apps/labrinth/src/models/v3/notifications.rs b/apps/labrinth/src/models/v3/notifications.rs
index 139607bcde..6a655958f9 100644
--- a/apps/labrinth/src/models/v3/notifications.rs
+++ b/apps/labrinth/src/models/v3/notifications.rs
@@ -179,6 +179,7 @@ pub enum NotificationBody {
     SharedInstanceInvite {
         shared_instance_id: String,
         shared_instance_name: String,
+        shared_instance_icon: Option<String>,
         invited_by: UserId,
     },
     StatusChange {
diff --git a/apps/labrinth/src/queue/file_scan.rs b/apps/labrinth/src/queue/file_scan.rs
index 2c2e414c2b..b655b64967 100644
--- a/apps/labrinth/src/queue/file_scan.rs
+++ b/apps/labrinth/src/queue/file_scan.rs
@@ -542,6 +542,26 @@ const OVERRIDE_PREFIXES: &[&str] = &[
     "client-overrides/resourcepacks",
 ];
 
+const OVERRIDE_ROOT_PREFIXES: &[&str] =
+    &["overrides/", "client-overrides/", "server-overrides/"];
+
+fn override_relative_name(name: &str) -> Option<&str> {
+    // strip the root prefix
+    let relative = OVERRIDE_ROOT_PREFIXES
+        .iter()
+        .find_map(|prefix| name.strip_prefix(prefix))?;
+
+    // check if it matches any of the whitelisted scan prefixes
+    OVERRIDE_PREFIXES
+        .iter()
+        .any(|prefix| {
+            name.strip_prefix(prefix)
+                // check the stripped prefix is actually a full segment, not something weird like "overrides/modsabce/file.jar"
+                .is_some_and(|suffix| suffix.starts_with('/'))
+        })
+        .then_some(relative)
+}
+
 fn should_scan(name: &str) -> bool {
     let name = name.to_lowercase();
     let should_skip = name.starts_with("mods/.connector/")
@@ -550,7 +570,7 @@ fn should_scan(name: &str) -> bool {
         || name.starts_with("mods/mcef-libraries/")
         || name.starts_with("mods/mcef-cache/")
         || name.starts_with("config/super_resolution/libraries/")
-        || name.starts_with("config/Veinminer/update/")
+        || name.starts_with("config/veinminer/update/")
         || name.starts_with("config/epicfight/native/")
         || name.starts_with("essential/")
         || name.ends_with(".rpo")
@@ -579,14 +599,11 @@ fn extract_override_files(data: &[u8]) -> Result<Vec<OverrideFile>> {
             continue;
         }
 
-        if !OVERRIDE_PREFIXES
-            .iter()
-            .any(|prefix| name.starts_with(prefix))
-        {
+        let Some(relative_name) = override_relative_name(&name) else {
             continue;
-        }
+        };
 
-        if !should_scan(&name) {
+        if !should_scan(relative_name) {
             continue;
         }
 
diff --git a/apps/labrinth/src/routes/index.rs b/apps/labrinth/src/routes/index.rs
index 9a0f7ae568..96a5c17f50 100644
--- a/apps/labrinth/src/routes/index.rs
+++ b/apps/labrinth/src/routes/index.rs
@@ -1,9 +1,8 @@
 use actix_web::{HttpResponse, get};
 use serde_json::json;
 
-#[get("/")]
-pub async fn index_get() -> HttpResponse {
-    let data = json!({
+fn build_info() -> serde_json::Value {
+    json!({
         "name": "modrinth-labrinth",
         "version": env!("CARGO_PKG_VERSION"),
         "documentation": "https://docs.modrinth.com",
@@ -14,7 +13,15 @@ pub async fn index_get() -> HttpResponse {
             "git_hash": option_env!("GIT_HASH").unwrap_or("unknown"),
             "profile": env!("COMPILATION_PROFILE"),
         }
-    });
+    })
+}
 
-    HttpResponse::Ok().json(data)
+#[get("/")]
+pub async fn index_get() -> HttpResponse {
+    HttpResponse::Ok().json(build_info())
+}
+
+#[get("/build")]
+pub async fn build_get() -> HttpResponse {
+    HttpResponse::Ok().json(build_info())
 }
diff --git a/apps/labrinth/src/routes/internal/delphi/mod.rs b/apps/labrinth/src/routes/internal/delphi/mod.rs
index df64c7e2a0..45098a3e60 100644
--- a/apps/labrinth/src/routes/internal/delphi/mod.rs
+++ b/apps/labrinth/src/routes/internal/delphi/mod.rs
@@ -240,9 +240,11 @@ async fn ingest_report_deserialized(
         SELECT EXISTS(
             SELECT 1
             FROM unnest($2::text[]) AS incoming(detail_key)
+            LEFT JOIN delphi_global_detail_verdicts dgdv
+                ON dgdv.detail_key = incoming.detail_key
             LEFT JOIN delphi_issue_detail_verdicts didv
                 ON didv.project_id = $1 AND didv.detail_key = incoming.detail_key
-            WHERE didv.project_id IS NULL
+            WHERE dgdv.detail_key IS NULL AND didv.project_id IS NULL
         ) AS "has_unflagged_issue_details!"
         "#,
         DBProjectId::from(report.project_id) as _,
diff --git a/apps/labrinth/src/routes/internal/mod.rs b/apps/labrinth/src/routes/internal/mod.rs
index ac0a212f29..c1061ead40 100644
--- a/apps/labrinth/src/routes/internal/mod.rs
+++ b/apps/labrinth/src/routes/internal/mod.rs
@@ -101,6 +101,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
 		pats::edit_pat,
 		pats::delete_pat,
 		moderation::get_projects,
+		moderation::get_project_ids,
 		moderation::get_project_meta,
 		moderation::set_project_meta,
 		moderation::acquire_lock,
@@ -112,9 +113,12 @@ pub fn config(cfg: &mut web::ServiceConfig) {
 		moderation::tech_review::get_issue,
 		moderation::tech_review::get_report,
 		moderation::tech_review::search_projects,
+		moderation::tech_review::global::search_global_issue_details,
+		moderation::tech_review::global::get_global_issue_detail,
 		moderation::tech_review::get_project_report,
 		moderation::tech_review::submit_report,
 		moderation::tech_review::update_issue_details,
+		moderation::tech_review::update_global_issue_details,
 		moderation::tech_review::add_report,
 		moderation::external_license::search,
 		moderation::external_license::lookup,
diff --git a/apps/labrinth/src/routes/internal/moderation/mod.rs b/apps/labrinth/src/routes/internal/moderation/mod.rs
index b230830cf5..7b3dac3ca1 100644
--- a/apps/labrinth/src/routes/internal/moderation/mod.rs
+++ b/apps/labrinth/src/routes/internal/moderation/mod.rs
@@ -5,8 +5,8 @@ use crate::database::PgPool;
 use crate::database::models::DBModerationLock;
 use crate::database::models::moderation_external_item;
 use crate::database::redis::RedisPool;
-use crate::models::ids::OrganizationId;
-use crate::models::projects::{Project, ProjectStatus};
+use crate::models::ids::{OrganizationId, ProjectId};
+use crate::models::projects::{ProjectStatus, VersionStatus};
 use crate::queue::moderation::{ApprovalType, IdentifiedFile, MissingMetadata};
 use crate::queue::session::AuthQueue;
 use crate::util::error::Context;
@@ -17,7 +17,7 @@ use crate::{
 use actix_web::{HttpRequest, delete, get, post, web};
 use ariadne::ids::{UserId, random_base62};
 use chrono::{DateTime, Utc};
-use ownership::get_projects_ownership;
+use eyre::eyre;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
@@ -27,6 +27,7 @@ pub mod tech_review;
 
 pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
     cfg.service(get_projects)
+        .service(get_project_ids)
         .service(get_project_meta)
         .service(set_project_meta)
         .service(acquire_lock)
@@ -52,19 +53,74 @@ pub struct ProjectsRequestOptions {
     /// Whether to filter by modpacks that have external dependencies.
     #[serde(default)]
     pub has_external_dependencies: Option<bool>,
+    /// Whether to exclude projects with pending technical review issues.
+    #[serde(default)]
+    pub exclude_technical_review: bool,
+    /// Text query to search against project and owner fields.
+    #[serde(default)]
+    pub query: Option<String>,
+    /// Project type to filter by. Use `none` for projects without a type.
+    #[serde(default)]
+    pub project_type: Option<String>,
+    /// Sort order for the moderation queue.
+    #[serde(default)]
+    pub sort: Option<ModerationProjectsSort>,
 }
 
 fn default_count() -> u16 {
     100
 }
 
-/// Project with extra information fetched from the database, to avoid having
-/// clients make more round trips.
+const MAX_PROJECTS_PER_PAGE: u16 = 200;
+
+#[derive(
+    Debug, Clone, Copy, Serialize, Deserialize, utoipa::ToSchema, Default,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum ModerationProjectsSort {
+    #[default]
+    Oldest,
+    Newest,
+    MostExternalDeps,
+    LeastExternalDeps,
+}
+
+impl ModerationProjectsSort {
+    fn as_str(self) -> &'static str {
+        match self {
+            Self::Oldest => "oldest",
+            Self::Newest => "newest",
+            Self::MostExternalDeps => "most_external_deps",
+            Self::LeastExternalDeps => "least_external_deps",
+        }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct FetchedProject {
-    /// Project info.
-    #[serde(flatten)]
-    pub project: Project,
+pub struct ModerationProjectsResponse {
+    pub total: i64,
+    pub projects: Vec<ModerationQueueProject>,
+}
+
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct ModerationProjectIdsResponse {
+    pub ids: Vec<ProjectId>,
+}
+
+/// Lightweight project information for the moderation queue index.
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct ModerationQueueProject {
+    pub id: ProjectId,
+    pub slug: Option<String>,
+    pub name: String,
+    pub summary: String,
+    pub icon_url: Option<String>,
+    pub status: ProjectStatus,
+    pub requested_status: Option<ProjectStatus>,
+    pub queued: Option<DateTime<Utc>>,
+    pub published: DateTime<Utc>,
+    pub updated: DateTime<Utc>,
+    pub project_types: Vec<String>,
     /// Who owns the project.
     pub ownership: Ownership,
     /// How many external file dependencies the project has.
@@ -162,12 +218,16 @@ pub struct DeleteAllLocksResponse {
 #[utoipa::path(
 	context_path = "/moderation",
 	tag = "moderation",
-	params(
+    params(
 		("count" = Option<u16>, Query),
 		("offset" = Option<u32>, Query),
-		("has_external_dependencies" = Option<bool>, Query)
+		("has_external_dependencies" = Option<bool>, Query),
+		("exclude_technical_review" = bool, Query),
+		("query" = Option<String>, Query),
+		("project_type" = Option<String>, Query),
+		("sort" = Option<ModerationProjectsSort>, Query)
 	),
-    responses((status = OK, body = inline(Vec<FetchedProject>)))
+    responses((status = OK, body = ModerationProjectsResponse))
 )]
 #[get("/projects")]
 pub async fn get_projects(
@@ -176,7 +236,7 @@ pub async fn get_projects(
     redis: web::Data<RedisPool>,
     request_opts: web::Query<ProjectsRequestOptions>,
     session_queue: web::Data<AuthQueue>,
-) -> Result<web::Json<Vec<FetchedProject>>, ApiError> {
+) -> Result<web::Json<ModerationProjectsResponse>, ApiError> {
     get_projects_internal(req, pool, redis, request_opts, session_queue).await
 }
 
@@ -186,7 +246,7 @@ pub async fn get_projects_internal(
     redis: web::Data<RedisPool>,
     request_opts: web::Query<ProjectsRequestOptions>,
     session_queue: web::Data<AuthQueue>,
-) -> Result<web::Json<Vec<FetchedProject>>, ApiError> {
+) -> Result<web::Json<ModerationProjectsResponse>, ApiError> {
     check_is_moderator_from_headers(
         &req,
         &**pool,
@@ -196,102 +256,803 @@ pub async fn get_projects_internal(
     )
     .await?;
 
-    use futures::stream::TryStreamExt;
+    let request_opts = request_opts.into_inner();
+    let query = normalize_optional_string(request_opts.query.as_deref());
+    let project_type =
+        normalize_optional_string(request_opts.project_type.as_deref());
+    let sort = request_opts.sort.unwrap_or_default().as_str();
+    let listed_version_statuses = listed_version_statuses();
+    let count = request_opts.count.min(MAX_PROJECTS_PER_PAGE) as i64;
+    let offset = request_opts.offset as i64;
+    let exclude_technical_review = request_opts.exclude_technical_review;
+    let needs_filtered_queue = query.is_some()
+        || project_type.is_some()
+        || request_opts.has_external_dependencies.is_some()
+        || matches!(sort, "most_external_deps" | "least_external_deps");
 
-    let project_rows = sqlx::query!(
-        r#"
-        SELECT
-            id,
-            external_dependencies_count as "external_dependencies_count!"
-        FROM (
-            SELECT DISTINCT ON (m.id)
-                m.id,
-                m.queued,
-                (
-                    SELECT COUNT(*)
-                    FROM versions v
-                    INNER JOIN dependencies d ON d.dependent_id = v.id
-                    WHERE v.mod_id = m.id
-                        AND d.dependency_file_name IS NOT NULL
-                ) external_dependencies_count
-            FROM mods m
-
-            /* -- Temporarily, don't exclude projects in tech rev q
-
-                -- exclude projects in tech review queue
-                LEFT JOIN delphi_issue_details_with_statuses didws
-                    ON didws.project_id = m.id AND didws.status = 'pending'
-            */
-
-            WHERE
-                m.status = $1
-                /* AND didws.status IS NULL */ -- Temporarily don't exclude
-
-            GROUP BY m.id
-        ) t
-        WHERE
-            ($4::boolean IS NULL OR (external_dependencies_count > 0) = $4)
-        ORDER BY queued ASC
-        OFFSET $3
-        LIMIT $2
-        "#,
-        ProjectStatus::Processing.as_str(),
-        request_opts.count as i64,
-        request_opts.offset as i64,
-        request_opts.has_external_dependencies,
-    )
-    .fetch(&**pool)
-    .try_collect::<Vec<_>>()
-    .await
-    .wrap_internal_err("failed to fetch projects awaiting review")?;
-
-    let project_ids = project_rows
-        .iter()
-        .map(|m| database::models::DBProjectId(m.id))
-        .collect::<Vec<_>>();
-    let project_metadata = project_rows
-        .into_iter()
-        .map(|m| {
-            (
-                database::models::DBProjectId(m.id),
-                m.external_dependencies_count,
+    let (total, projects) = if needs_filtered_queue {
+        let project_rows = sqlx::query!(
+            r#"
+            WITH moderation_projects AS (
+                SELECT
+                    m.id,
+                    m.slug,
+                    m.name,
+                    m.summary,
+                    m.description,
+                    m.queued,
+                    m.published,
+                    m.organization_id,
+                    m.team_id,
+                    m.components
+                FROM mods m
+                WHERE
+                    m.status = $1
+                    AND (
+                        $9::boolean = false
+                        OR NOT EXISTS (
+                            SELECT 1
+                            FROM delphi_issue_details_with_statuses didws
+                            WHERE didws.project_id = m.id
+                                AND didws.status = 'pending'
+                        )
+                    )
+            ),
+            external_dependencies AS (
+                SELECT
+                    v.mod_id,
+                    COUNT(*) AS external_dependencies_count
+                FROM versions v
+                INNER JOIN moderation_projects mp ON mp.id = v.mod_id
+                INNER JOIN dependencies d ON d.dependent_id = v.id
+                WHERE d.dependency_file_name IS NOT NULL
+                GROUP BY v.mod_id
+            ),
+            version_project_types AS (
+                SELECT
+                    v.mod_id,
+                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types
+                FROM versions v
+                INNER JOIN moderation_projects mp ON mp.id = v.mod_id
+                INNER JOIN loaders_versions lv ON v.id = lv.version_id
+                INNER JOIN loaders l ON lv.loader_id = l.id
+                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id
+                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id
+                WHERE v.status = ANY($2)
+                GROUP BY v.mod_id
+            ),
+            queue_projects AS (
+                SELECT
+                    mp.id,
+                    mp.slug,
+                    mp.name,
+                    mp.summary,
+                    mp.description,
+                    mp.queued,
+                    mp.published,
+                    search_organization.name AS organization_name,
+                    search_owner.username AS owner_name,
+                    CASE
+                        WHEN mp.components ? 'minecraft_server'
+                            THEN ARRAY_APPEND(
+                                ARRAY_REMOVE(
+                                    COALESCE(vpt.project_types::text[], ARRAY[]::text[]),
+                                    'modpack'
+                                ),
+                                'minecraft_java_server'
+                            )
+                        ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])
+                    END AS project_types,
+                    COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count
+                FROM moderation_projects mp
+                LEFT JOIN organizations search_organization
+                    ON search_organization.id = mp.organization_id
+                    AND $3::text IS NOT NULL
+                LEFT JOIN LATERAL (
+                    SELECT
+                        u.username
+                    FROM team_members tm
+                    INNER JOIN users u ON u.id = tm.user_id
+                    WHERE tm.team_id = mp.team_id
+                        AND tm.is_owner
+                    ORDER BY tm.ordering ASC
+                    LIMIT 1
+                ) search_owner ON $3::text IS NOT NULL
+                    AND mp.organization_id IS NULL
+                LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id
+                LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id
+            ),
+            filtered_projects AS (
+                SELECT
+                    id,
+                    queued,
+                    published,
+                    project_types,
+                    external_dependencies_count
+                FROM queue_projects
+                WHERE
+                    (
+                        $3::text IS NULL
+                        OR name ILIKE '%' || $3 || '%'
+                        OR slug ILIKE '%' || $3 || '%'
+                        OR summary ILIKE '%' || $3 || '%'
+                        OR description ILIKE '%' || $3 || '%'
+                        OR owner_name ILIKE '%' || $3 || '%'
+                        OR organization_name ILIKE '%' || $3 || '%'
+                        OR EXISTS (
+                            SELECT 1
+                            FROM UNNEST(project_types) AS searched_project_type(project_type)
+                            WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'
+                        )
+                    )
+                    AND (
+                        $4::text IS NULL
+                        OR ($4 = 'none' AND CARDINALITY(project_types) = 0)
+                        OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])
+                        OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND
+                            project_types[1] = $4
+                        )
+                    )
+                    AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)
+            ),
+            total AS (
+                SELECT COUNT(*) AS total_count FROM filtered_projects
+            ),
+            page_ids AS (
+                SELECT
+                    id,
+                    queued,
+                    published,
+                    project_types,
+                    external_dependencies_count
+                FROM filtered_projects
+                ORDER BY
+                    CASE WHEN $8 = 'most_external_deps' THEN external_dependencies_count END DESC,
+                    CASE WHEN $8 = 'least_external_deps' THEN external_dependencies_count END ASC,
+                    CASE WHEN $8 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,
+                    CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,
+                    id ASC
+                OFFSET $7
+                LIMIT $6
+            ),
+            page_projects AS (
+                SELECT
+                    m.id,
+                    m.slug,
+                    m.name,
+                    m.summary,
+                    m.icon_url,
+                    m.status,
+                    m.requested_status,
+                    m.queued,
+                    m.published,
+                    m.updated,
+                    m.organization_id,
+                    m.team_id,
+                    o.name AS organization_name,
+                    o.icon_url AS organization_icon_url,
+                    owner.user_id AS owner_id,
+                    owner.username AS owner_name,
+                    owner.avatar_url AS owner_icon_url,
+                    page_ids.project_types,
+                    page_ids.external_dependencies_count
+                FROM page_ids
+                INNER JOIN mods m ON m.id = page_ids.id
+                LEFT JOIN organizations o ON o.id = m.organization_id
+                LEFT JOIN LATERAL (
+                    SELECT
+                        tm.user_id,
+                        u.username,
+                        u.avatar_url
+                    FROM team_members tm
+                    INNER JOIN users u ON u.id = tm.user_id
+                    WHERE tm.team_id = m.team_id
+                        AND tm.is_owner
+                    ORDER BY tm.ordering ASC
+                    LIMIT 1
+                ) owner ON m.organization_id IS NULL
             )
-        })
-        .collect::<HashMap<_, _>>();
-
-    let projects =
-        database::DBProject::get_many_ids(&project_ids, &**pool, &redis)
-            .await
-            .wrap_internal_err("failed to fetch projects")?
-            .into_iter()
-            .map(crate::models::projects::Project::from)
-            .collect::<Vec<_>>();
-
-    let ownerships = get_projects_ownership(&projects, &pool, &redis)
+            SELECT
+                total.total_count AS "total_count!",
+                page_projects.id AS "id?",
+                page_projects.slug AS "slug?",
+                page_projects.name AS "name?",
+                page_projects.summary AS "summary?",
+                page_projects.icon_url AS "icon_url?",
+                page_projects.status AS "status?",
+                page_projects.requested_status AS "requested_status?",
+                page_projects.queued AS "queued?",
+                page_projects.published AS "published?",
+                page_projects.updated AS "updated?",
+                page_projects.organization_id AS "organization_id?",
+                page_projects.organization_name AS "organization_name?",
+                page_projects.organization_icon_url AS "organization_icon_url?",
+                page_projects.owner_id AS "owner_id?",
+                page_projects.owner_name AS "owner_name?",
+                page_projects.owner_icon_url AS "owner_icon_url?",
+                page_projects.project_types AS "project_types?: Vec<String>",
+                page_projects.external_dependencies_count AS "external_dependencies_count?"
+            FROM total
+            LEFT JOIN page_projects ON true
+            ORDER BY
+                CASE WHEN $8 = 'most_external_deps' THEN page_projects.external_dependencies_count END DESC,
+                CASE WHEN $8 = 'least_external_deps' THEN page_projects.external_dependencies_count END ASC,
+                CASE WHEN $8 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,
+                CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,
+                page_projects.id ASC
+            "#,
+            ProjectStatus::Processing.as_str(),
+            &listed_version_statuses,
+            query,
+            project_type,
+            request_opts.has_external_dependencies,
+            count,
+            offset,
+            sort,
+            exclude_technical_review,
+        )
+        .fetch_all(&**pool)
         .await
-        .wrap_internal_err("failed to fetch project ownerships")?;
+        .wrap_internal_err("failed to fetch filtered projects awaiting review")?;
 
-    let map_project =
-        |(project, ownership): (Project, Ownership)| -> FetchedProject {
-            let external_dependencies_count = project_metadata
-                .get(&database::models::DBProjectId(project.id.0 as i64))
-                .copied()
-                .unwrap_or_default();
-
-            FetchedProject {
-                ownership,
-                project,
-                external_dependencies_count,
+        let total =
+            project_rows.first().map(|row| row.total_count).unwrap_or(0);
+        let mut projects = Vec::new();
+        for row in project_rows {
+            if let Some(project) = row_to_queue_project(
+                row.id,
+                row.slug,
+                row.name,
+                row.summary,
+                row.icon_url,
+                row.status,
+                row.requested_status,
+                row.queued,
+                row.published,
+                row.updated,
+                row.organization_id,
+                row.organization_name,
+                row.organization_icon_url,
+                row.owner_id,
+                row.owner_name,
+                row.owner_icon_url,
+                row.project_types,
+                row.external_dependencies_count,
+            )? {
+                projects.push(project);
             }
-        };
+        }
 
-    let projects = projects
-        .into_iter()
-        .zip(ownerships)
-        .map(map_project)
-        .collect::<Vec<_>>();
+        (total, projects)
+    } else {
+        let project_rows = sqlx::query!(
+            r#"
+            WITH filtered_projects AS (
+                SELECT
+                    m.id,
+                    m.queued,
+                    m.published
+                FROM mods m
+                WHERE
+                    m.status = $1
+                    AND (
+                        $6::boolean = false
+                        OR NOT EXISTS (
+                            SELECT 1
+                            FROM delphi_issue_details_with_statuses didws
+                            WHERE didws.project_id = m.id
+                                AND didws.status = 'pending'
+                        )
+                    )
+            ),
+            total AS (
+                SELECT COUNT(*) AS total_count FROM filtered_projects
+            ),
+            page_ids AS (
+                SELECT
+                    id,
+                    queued,
+                    published
+                FROM filtered_projects
+                ORDER BY
+                    CASE WHEN $5 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,
+                    CASE WHEN $5 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST,
+                    id ASC
+                OFFSET $4
+                LIMIT $3
+            ),
+            page_project_types AS (
+                SELECT
+                    v.mod_id,
+                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types
+                FROM versions v
+                INNER JOIN page_ids page ON page.id = v.mod_id
+                INNER JOIN loaders_versions lv ON v.id = lv.version_id
+                INNER JOIN loaders l ON lv.loader_id = l.id
+                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id
+                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id
+                WHERE v.status = ANY($2)
+                GROUP BY v.mod_id
+            ),
+            page_external_dependencies AS (
+                SELECT
+                    v.mod_id,
+                    COUNT(*) AS external_dependencies_count
+                FROM versions v
+                INNER JOIN page_ids page ON page.id = v.mod_id
+                INNER JOIN dependencies d ON d.dependent_id = v.id
+                WHERE d.dependency_file_name IS NOT NULL
+                GROUP BY v.mod_id
+            ),
+            page_projects AS (
+                SELECT
+                    m.id,
+                    m.slug,
+                    m.name,
+                    m.summary,
+                    m.icon_url,
+                    m.status,
+                    m.requested_status,
+                    m.queued,
+                    m.published,
+                    m.updated,
+                    m.organization_id,
+                    o.name AS organization_name,
+                    o.icon_url AS organization_icon_url,
+                    owner.user_id AS owner_id,
+                    owner.username AS owner_name,
+                    owner.avatar_url AS owner_icon_url,
+                    CASE
+                        WHEN m.components ? 'minecraft_server'
+                            THEN ARRAY_APPEND(
+                                ARRAY_REMOVE(
+                                    COALESCE(ppt.project_types::text[], ARRAY[]::text[]),
+                                    'modpack'
+                                ),
+                                'minecraft_java_server'
+                            )
+                        ELSE COALESCE(ppt.project_types::text[], ARRAY[]::text[])
+                    END AS project_types,
+                    COALESCE(ped.external_dependencies_count, 0) AS external_dependencies_count
+                FROM page_ids page
+                INNER JOIN mods m ON m.id = page.id
+                LEFT JOIN organizations o ON o.id = m.organization_id
+                LEFT JOIN LATERAL (
+                    SELECT
+                        tm.user_id,
+                        u.username,
+                        u.avatar_url
+                    FROM team_members tm
+                    INNER JOIN users u ON u.id = tm.user_id
+                    WHERE tm.team_id = m.team_id
+                        AND tm.is_owner
+                    ORDER BY tm.ordering ASC
+                    LIMIT 1
+                ) owner ON m.organization_id IS NULL
+                LEFT JOIN page_project_types ppt ON ppt.mod_id = m.id
+                LEFT JOIN page_external_dependencies ped ON ped.mod_id = m.id
+            )
+            SELECT
+                total.total_count AS "total_count!",
+                page_projects.id AS "id?",
+                page_projects.slug AS "slug?",
+                page_projects.name AS "name?",
+                page_projects.summary AS "summary?",
+                page_projects.icon_url AS "icon_url?",
+                page_projects.status AS "status?",
+                page_projects.requested_status AS "requested_status?",
+                page_projects.queued AS "queued?",
+                page_projects.published AS "published?",
+                page_projects.updated AS "updated?",
+                page_projects.organization_id AS "organization_id?",
+                page_projects.organization_name AS "organization_name?",
+                page_projects.organization_icon_url AS "organization_icon_url?",
+                page_projects.owner_id AS "owner_id?",
+                page_projects.owner_name AS "owner_name?",
+                page_projects.owner_icon_url AS "owner_icon_url?",
+                page_projects.project_types AS "project_types?: Vec<String>",
+                page_projects.external_dependencies_count AS "external_dependencies_count?"
+            FROM total
+            LEFT JOIN page_projects ON true
+            ORDER BY
+                CASE WHEN $5 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,
+                CASE WHEN $5 = 'oldest' THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,
+                page_projects.id ASC
+            "#,
+            ProjectStatus::Processing.as_str(),
+            &listed_version_statuses,
+            count,
+            offset,
+            sort,
+            exclude_technical_review,
+        )
+        .fetch_all(&**pool)
+        .await
+        .wrap_internal_err("failed to fetch projects awaiting review")?;
 
-    Ok(web::Json(projects))
+        let total =
+            project_rows.first().map(|row| row.total_count).unwrap_or(0);
+        let mut projects = Vec::new();
+        for row in project_rows {
+            if let Some(project) = row_to_queue_project(
+                row.id,
+                row.slug,
+                row.name,
+                row.summary,
+                row.icon_url,
+                row.status,
+                row.requested_status,
+                row.queued,
+                row.published,
+                row.updated,
+                row.organization_id,
+                row.organization_name,
+                row.organization_icon_url,
+                row.owner_id,
+                row.owner_name,
+                row.owner_icon_url,
+                row.project_types,
+                row.external_dependencies_count,
+            )? {
+                projects.push(project);
+            }
+        }
+
+        (total, projects)
+    };
+
+    Ok(web::Json(ModerationProjectsResponse { total, projects }))
+}
+
+#[utoipa::path(
+    context_path = "/moderation",
+    tag = "moderation",
+    params(
+		("has_external_dependencies" = Option<bool>, Query),
+		("exclude_technical_review" = bool, Query),
+		("query" = Option<String>, Query),
+		("project_type" = Option<String>, Query),
+		("sort" = Option<ModerationProjectsSort>, Query)
+	),
+    responses((status = OK, body = ModerationProjectIdsResponse))
+)]
+#[get("/projects/ids")]
+pub async fn get_project_ids(
+    req: HttpRequest,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    request_opts: web::Query<ProjectsRequestOptions>,
+    session_queue: web::Data<AuthQueue>,
+) -> Result<web::Json<ModerationProjectIdsResponse>, ApiError> {
+    check_is_moderator_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Scopes::PROJECT_READ,
+    )
+    .await?;
+
+    let request_opts = request_opts.into_inner();
+    let query = normalize_optional_string(request_opts.query.as_deref());
+    let project_type =
+        normalize_optional_string(request_opts.project_type.as_deref());
+    let sort = request_opts.sort.unwrap_or_default().as_str();
+    let listed_version_statuses = listed_version_statuses();
+    let exclude_technical_review = request_opts.exclude_technical_review;
+    let needs_filtered_queue = query.is_some()
+        || project_type.is_some()
+        || request_opts.has_external_dependencies.is_some()
+        || matches!(sort, "most_external_deps" | "least_external_deps");
+
+    let ids = if needs_filtered_queue {
+        let project_rows = sqlx::query!(
+            r#"
+            WITH moderation_projects AS (
+                SELECT
+                    m.id,
+                    m.slug,
+                    m.name,
+                    m.summary,
+                    m.description,
+                    m.queued,
+                    m.published,
+                    m.organization_id,
+                    m.team_id,
+                    m.components
+                FROM mods m
+                WHERE
+                    m.status = $1
+                    AND (
+                        $7::boolean = false
+                        OR NOT EXISTS (
+                            SELECT 1
+                            FROM delphi_issue_details_with_statuses didws
+                            WHERE didws.project_id = m.id
+                                AND didws.status = 'pending'
+                        )
+                    )
+            ),
+            external_dependencies AS (
+                SELECT
+                    v.mod_id,
+                    COUNT(*) AS external_dependencies_count
+                FROM versions v
+                INNER JOIN moderation_projects mp ON mp.id = v.mod_id
+                INNER JOIN dependencies d ON d.dependent_id = v.id
+                WHERE d.dependency_file_name IS NOT NULL
+                GROUP BY v.mod_id
+            ),
+            version_project_types AS (
+                SELECT
+                    v.mod_id,
+                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types
+                FROM versions v
+                INNER JOIN moderation_projects mp ON mp.id = v.mod_id
+                INNER JOIN loaders_versions lv ON v.id = lv.version_id
+                INNER JOIN loaders l ON lv.loader_id = l.id
+                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id
+                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id
+                WHERE v.status = ANY($2)
+                GROUP BY v.mod_id
+            ),
+            queue_projects AS (
+                SELECT
+                    mp.id,
+                    mp.slug,
+                    mp.name,
+                    mp.summary,
+                    mp.description,
+                    mp.queued,
+                    mp.published,
+                    search_organization.name AS organization_name,
+                    search_owner.username AS owner_name,
+                    CASE
+                        WHEN mp.components ? 'minecraft_server'
+                            THEN ARRAY_APPEND(
+                                ARRAY_REMOVE(
+                                    COALESCE(vpt.project_types::text[], ARRAY[]::text[]),
+                                    'modpack'
+                                ),
+                                'minecraft_java_server'
+                            )
+                        ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])
+                    END AS project_types,
+                    COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count
+                FROM moderation_projects mp
+                LEFT JOIN organizations search_organization
+                    ON search_organization.id = mp.organization_id
+                    AND $3::text IS NOT NULL
+                LEFT JOIN LATERAL (
+                    SELECT
+                        u.username
+                    FROM team_members tm
+                    INNER JOIN users u ON u.id = tm.user_id
+                    WHERE tm.team_id = mp.team_id
+                        AND tm.is_owner
+                    ORDER BY tm.ordering ASC
+                    LIMIT 1
+                ) search_owner ON $3::text IS NOT NULL
+                    AND mp.organization_id IS NULL
+                LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id
+                LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id
+            )
+            SELECT id
+            FROM queue_projects
+            WHERE
+                (
+                    $3::text IS NULL
+                    OR name ILIKE '%' || $3 || '%'
+                    OR slug ILIKE '%' || $3 || '%'
+                    OR summary ILIKE '%' || $3 || '%'
+                    OR description ILIKE '%' || $3 || '%'
+                    OR owner_name ILIKE '%' || $3 || '%'
+                    OR organization_name ILIKE '%' || $3 || '%'
+                    OR EXISTS (
+                        SELECT 1
+                        FROM UNNEST(project_types) AS searched_project_type(project_type)
+                        WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'
+                    )
+                )
+                AND (
+                    $4::text IS NULL
+                    OR ($4 = 'none' AND CARDINALITY(project_types) = 0)
+                    OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])
+                    OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND project_types[1] = $4)
+                )
+                AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)
+            ORDER BY
+                CASE WHEN $6 = 'most_external_deps' THEN external_dependencies_count END DESC,
+                CASE WHEN $6 = 'least_external_deps' THEN external_dependencies_count END ASC,
+                CASE WHEN $6 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,
+                CASE WHEN $6 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,
+                id ASC
+            "#,
+            ProjectStatus::Processing.as_str(),
+            &listed_version_statuses,
+            query,
+            project_type,
+            request_opts.has_external_dependencies,
+            sort,
+            exclude_technical_review,
+        )
+        .fetch_all(&**pool)
+        .await
+        .wrap_internal_err("failed to fetch filtered project ids awaiting review")?;
+
+        project_rows
+            .into_iter()
+            .map(|row| ProjectId::from(database::models::DBProjectId(row.id)))
+            .collect()
+    } else {
+        let project_rows = sqlx::query!(
+            r#"
+            SELECT id
+            FROM mods
+            WHERE
+                status = $1
+                AND (
+                    $3::boolean = false
+                    OR NOT EXISTS (
+                        SELECT 1
+                        FROM delphi_issue_details_with_statuses didws
+                        WHERE didws.project_id = mods.id
+                            AND didws.status = 'pending'
+                    )
+                )
+            ORDER BY
+                CASE WHEN $2 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,
+                CASE WHEN $2 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST,
+                id ASC
+            "#,
+            ProjectStatus::Processing.as_str(),
+            sort,
+            exclude_technical_review,
+        )
+        .fetch_all(&**pool)
+        .await
+        .wrap_internal_err("failed to fetch project ids awaiting review")?;
+
+        project_rows
+            .into_iter()
+            .map(|row| ProjectId::from(database::models::DBProjectId(row.id)))
+            .collect()
+    };
+
+    Ok(web::Json(ModerationProjectIdsResponse { ids }))
+}
+
+fn row_to_queue_project(
+    id: Option<i64>,
+    slug: Option<String>,
+    name: Option<String>,
+    summary: Option<String>,
+    icon_url: Option<String>,
+    status: Option<String>,
+    requested_status: Option<String>,
+    queued: Option<DateTime<Utc>>,
+    published: Option<DateTime<Utc>>,
+    updated: Option<DateTime<Utc>>,
+    organization_id: Option<i64>,
+    organization_name: Option<String>,
+    organization_icon_url: Option<String>,
+    owner_id: Option<i64>,
+    owner_name: Option<String>,
+    owner_icon_url: Option<String>,
+    project_types: Option<Vec<String>>,
+    external_dependencies_count: Option<i64>,
+) -> Result<Option<ModerationQueueProject>, ApiError> {
+    let Some(id) = id else {
+        return Ok(None);
+    };
+
+    let project_id = ProjectId::from(database::models::DBProjectId(id));
+    let name = name.wrap_internal_err_with(|| {
+        eyre!("project {project_id} is missing `name` in moderation queue row")
+    })?;
+    let summary = summary.wrap_internal_err_with(|| {
+        eyre!(
+            "project {project_id} is missing `summary` in moderation queue row"
+        )
+    })?;
+    let status = status.wrap_internal_err_with(|| {
+        eyre!(
+            "project {project_id} is missing `status` in moderation queue row"
+        )
+    })?;
+    let published = published.wrap_internal_err_with(|| {
+        eyre!(
+            "project {project_id} is missing `published` in moderation queue row"
+        )
+    })?;
+    let updated = updated.wrap_internal_err_with(|| {
+        eyre!(
+            "project {project_id} is missing `updated` in moderation queue row"
+        )
+    })?;
+    let ownership = row_to_ownership(
+        project_id,
+        organization_id,
+        organization_name,
+        organization_icon_url,
+        owner_id,
+        owner_name,
+        owner_icon_url,
+    )?;
+
+    Ok(Some(ModerationQueueProject {
+        id: project_id,
+        slug,
+        name,
+        summary,
+        icon_url,
+        status: ProjectStatus::from_string(&status),
+        requested_status: requested_status
+            .as_deref()
+            .map(ProjectStatus::from_string),
+        queued,
+        published,
+        updated,
+        project_types: project_types.unwrap_or_default(),
+        ownership,
+        external_dependencies_count: external_dependencies_count.unwrap_or(0),
+    }))
+}
+
+fn normalize_optional_string(value: Option<&str>) -> Option<&str> {
+    value.map(str::trim).filter(|value| !value.is_empty())
+}
+
+fn listed_version_statuses() -> Vec<String> {
+    VersionStatus::iterator()
+        .filter(|status| status.is_listed())
+        .map(|status| status.as_str().to_string())
+        .collect()
+}
+
+fn row_to_ownership(
+    project_id: ProjectId,
+    organization_id: Option<i64>,
+    organization_name: Option<String>,
+    organization_icon_url: Option<String>,
+    owner_id: Option<i64>,
+    owner_name: Option<String>,
+    owner_icon_url: Option<String>,
+) -> Result<Ownership, ApiError> {
+    if let Some(organization_id) = organization_id {
+        let organization_name =
+            organization_name.wrap_internal_err_with(|| {
+                eyre!(
+                    "project {project_id} is owned by organization {} without a valid name",
+                    OrganizationId::from(database::models::DBOrganizationId(
+                        organization_id
+                    ))
+                )
+            })?;
+
+        return Ok(Ownership::Organization {
+            id: OrganizationId::from(database::models::DBOrganizationId(
+                organization_id,
+            )),
+            name: organization_name,
+            icon_url: organization_icon_url,
+        });
+    }
+
+    let owner_id = owner_id.wrap_internal_err_with(|| {
+        eyre!("project {project_id} is owned by a team without a valid owner")
+    })?;
+    let owner_name = owner_name.wrap_internal_err_with(|| {
+        eyre!(
+            "project {project_id} is owned by a team owner without a valid name"
+        )
+    })?;
+
+    Ok(Ownership::User {
+        id: UserId::from(database::models::DBUserId(owner_id)),
+        name: owner_name,
+        icon_url: owner_icon_url,
+    })
 }
 
 /// Get project moderation metadata.  
diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review.rs b/apps/labrinth/src/routes/internal/moderation/tech_review.rs
index 683057e063..37d38e8e55 100644
--- a/apps/labrinth/src/routes/internal/moderation/tech_review.rs
+++ b/apps/labrinth/src/routes/internal/moderation/tech_review.rs
@@ -37,13 +37,17 @@ use crate::{
 };
 use eyre::eyre;
 
+pub mod global;
+
 pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
     cfg.service(search_projects)
+        .configure(global::config)
         .service(get_project_report)
         .service(get_report)
         .service(get_issue)
         .service(submit_report)
         .service(update_issue_details)
+        .service(update_global_issue_details)
         .service(add_report);
 }
 
@@ -502,23 +506,16 @@ async fn fetch_project_reports(
     let detail_rows = sqlx::query!(
         r#"
         SELECT
-            drid.id AS "id!: DelphiReportIssueDetailsId",
-            drid.issue_id AS "issue_id!: DelphiReportIssueId",
-            drid.key AS "key!: String",
-            drid.jar AS "jar?: String",
-            drid.file_path AS "file_path!: String",
-            drid.data AS "data!: sqlx::types::Json<HashMap<String, serde_json::Value>>",
-            drid.severity AS "severity!: DelphiSeverity",
-            COALESCE(didv.verdict, 'pending'::delphi_report_issue_status) AS "status!: DelphiStatus"
-        FROM delphi_report_issue_details drid
-        INNER JOIN delphi_report_issues dri ON dri.id = drid.issue_id
-        INNER JOIN delphi_reports dr ON dr.id = dri.report_id
-        INNER JOIN files f ON f.id = dr.file_id
-        INNER JOIN versions v ON v.id = f.version_id
-        INNER JOIN mods m ON m.id = v.mod_id
-        LEFT JOIN delphi_issue_detail_verdicts didv
-            ON m.id = didv.project_id AND drid.key = didv.detail_key
-        WHERE drid.issue_id = ANY($1::bigint[])
+            didws.id AS "id!: DelphiReportIssueDetailsId",
+            didws.issue_id AS "issue_id!: DelphiReportIssueId",
+            didws.key AS "key!: String",
+            didws.jar AS "jar?: String",
+            didws.file_path AS "file_path!: String",
+            didws.data AS "data!: sqlx::types::Json<HashMap<String, serde_json::Value>>",
+            didws.severity AS "severity!: DelphiSeverity",
+            didws.status AS "status!: DelphiStatus"
+        FROM delphi_issue_details_with_statuses didws
+        WHERE didws.issue_id = ANY($1::bigint[])
         "#,
         &issue_ids.iter().map(|i| i.0).collect::<Vec<_>>()
     )
@@ -718,10 +715,8 @@ pub async fn search_projects(
         INNER JOIN files f ON f.version_id = v.id
         INNER JOIN delphi_reports dr ON dr.file_id = f.id
         INNER JOIN delphi_report_issues dri ON dri.report_id = dr.id
-        INNER JOIN delphi_report_issue_details drid
-            ON drid.issue_id = dri.id
-        LEFT JOIN delphi_issue_detail_verdicts didv
-            ON m.id = didv.project_id AND drid.key = didv.detail_key
+        INNER JOIN delphi_issue_details_with_statuses didws
+            ON didws.issue_id = dri.id
         LEFT JOIN threads_messages tm_last
             ON tm_last.thread_id = t.id
             AND tm_last.id = (
@@ -766,7 +761,7 @@ pub async fn search_projects(
             AND m.status NOT IN ('draft', 'rejected', 'withheld')
             AND (cardinality($6::text[]) = 0 OR m.status = ANY($6::text[]))
             AND (cardinality($7::text[]) = 0 OR dri.issue_type = ANY($7::text[]))
-            AND (didv.verdict IS NULL OR didv.verdict = 'pending'::delphi_report_issue_status)
+            AND didws.status = 'pending'
             AND (
                 $5::text IS NULL
                 OR ($5::text = 'unreplied' AND (tm_last.id IS NULL OR u_last.role IS NULL OR u_last.role NOT IN ('moderator', 'admin')))
@@ -1171,6 +1166,17 @@ pub struct UpdateIssue {
     /// ID of the issue detail to update.
     pub detail_id: DelphiReportIssueDetailsId,
     /// What the moderator has decided the outcome of this issue is.
+    ///
+    /// `pending` removes the project-local verdict for this issue detail.
+    pub verdict: DelphiStatus,
+}
+
+/// See [`update_global_issue_details`].
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct UpdateGlobalIssue {
+    /// Key of the issue detail to update globally.
+    pub detail_key: String,
+    /// What the moderator has decided the outcome of this issue is globally.
     pub verdict: DelphiVerdict,
 }
 
@@ -1211,8 +1217,9 @@ pub async fn update_issue_details(
     let verdicts = updates
         .iter()
         .map(|u| match u.verdict {
-            DelphiVerdict::Safe => "safe".to_string(),
-            DelphiVerdict::Unsafe => "unsafe".to_string(),
+            DelphiStatus::Safe => "safe".to_string(),
+            DelphiStatus::Unsafe => "unsafe".to_string(),
+            DelphiStatus::Pending => "pending".to_string(),
         })
         .collect::<Vec<_>>();
 
@@ -1228,7 +1235,7 @@ pub async fn update_issue_details(
                 i.ord,
                 didws.project_id,
                 didws.key AS detail_key,
-                i.verdict::delphi_report_issue_status AS verdict
+                i.verdict
             FROM incoming i
             INNER JOIN delphi_issue_details_with_statuses didws ON didws.id = i.detail_id
             INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id
@@ -1241,18 +1248,35 @@ pub async fn update_issue_details(
                 (SELECT COUNT(*) FROM incoming) AS incoming_count,
                 (SELECT COUNT(*) FROM resolved) AS resolved_count
         ),
-        upserted AS (
-            INSERT INTO delphi_issue_detail_verdicts (
-                project_id,
-                detail_key,
-                verdict
-            )
+        latest AS (
             SELECT DISTINCT ON (project_id, detail_key)
                 project_id,
                 detail_key,
                 verdict
             FROM resolved
             ORDER BY project_id, detail_key, ord DESC
+        ),
+        deleted AS (
+            DELETE FROM delphi_issue_detail_verdicts didv
+            USING latest
+            WHERE
+                didv.project_id = latest.project_id
+                AND didv.detail_key = latest.detail_key
+                AND latest.verdict = 'pending'
+            RETURNING 1
+        ),
+        upserted AS (
+            INSERT INTO delphi_issue_detail_verdicts (
+                project_id,
+                detail_key,
+                verdict
+            )
+            SELECT
+                project_id,
+                detail_key,
+                verdict::delphi_report_issue_status
+            FROM latest
+            WHERE verdict != 'pending'
             ON CONFLICT (project_id, detail_key)
             DO UPDATE SET verdict = EXCLUDED.verdict
             RETURNING 1
@@ -1280,6 +1304,92 @@ pub async fn update_issue_details(
     Ok(())
 }
 
+/// Update global technical review issue detail verdicts.
+///
+/// This marks every issue detail with a matching key as safe or unsafe.
+#[utoipa::path(
+	context_path = "/moderation/tech-review",
+	tag = "moderation",
+    security(("bearer_auth" = [])),
+    responses((status = NO_CONTENT))
+)]
+#[post("/global-issue-detail")]
+pub async fn update_global_issue_details(
+    req: HttpRequest,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    session_queue: web::Data<AuthQueue>,
+    update_reqs: web::Json<Vec<UpdateGlobalIssue>>,
+) -> Result<(), ApiError> {
+    check_is_moderator_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Scopes::PROJECT_WRITE,
+    )
+    .await?;
+
+    let updates = update_reqs.into_inner();
+
+    if updates.iter().any(|u| {
+        u.detail_key.is_empty() || u.detail_key.starts_with("<no-key-")
+    }) {
+        return Err(ApiError::Request(eyre!(
+            "detail key cannot be empty or generated fallback key"
+        )));
+    }
+
+    let detail_keys = updates
+        .iter()
+        .map(|u| u.detail_key.clone())
+        .collect::<Vec<_>>();
+    let verdicts = updates
+        .iter()
+        .map(|u| match u.verdict {
+            DelphiVerdict::Safe => "safe".to_string(),
+            DelphiVerdict::Unsafe => "unsafe".to_string(),
+        })
+        .collect::<Vec<_>>();
+
+    let mut txn = pool
+        .begin()
+        .await
+        .wrap_internal_err("failed to start transaction")?;
+
+    sqlx::query!(
+        r#"
+        WITH incoming AS (
+            SELECT *
+            FROM unnest($1::text[], $2::text[]) WITH ORDINALITY
+                AS u(detail_key, verdict, ord)
+        )
+        INSERT INTO delphi_global_detail_verdicts (
+            detail_key,
+            verdict
+        )
+        SELECT DISTINCT ON (detail_key)
+            detail_key,
+            verdict::delphi_report_issue_status
+        FROM incoming
+        ORDER BY detail_key, ord DESC
+        ON CONFLICT (detail_key)
+        DO UPDATE SET verdict = EXCLUDED.verdict
+        "#,
+        &detail_keys,
+        &verdicts,
+    )
+    .execute(&mut txn)
+    .await
+    .wrap_internal_err("failed to update global issue details")?;
+
+    txn.commit()
+        .await
+        .wrap_internal_err("failed to commit transaction")?;
+
+    Ok(())
+}
+
 /// See [`add_report`].
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct AddReport {
diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs b/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs
new file mode 100644
index 0000000000..82aa8055b1
--- /dev/null
+++ b/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs
@@ -0,0 +1,465 @@
+use actix_web::{HttpRequest, post, web};
+use itertools::Itertools;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    auth::check_is_moderator_from_headers,
+    database::{
+        PgPool,
+        models::{
+            DBFileId, DBProjectId, DBVersionId, DelphiReportIssueDetailsId,
+            DelphiReportIssueId,
+            delphi_report_item::{DelphiSeverity, DelphiStatus},
+        },
+        redis::RedisPool,
+    },
+    models::{
+        ids::{FileId, ProjectId, VersionId},
+        pats::Scopes,
+    },
+    queue::session::AuthQueue,
+    routes::ApiError,
+    util::error::Context,
+};
+use eyre::eyre;
+
+pub fn config(cfg: &mut web::ServiceConfig) {
+    cfg.service(search_global_issue_details)
+        .service(get_global_issue_detail);
+}
+
+fn default_limit() -> u64 {
+    20
+}
+
+const LOCAL_TRACE_PREVIEW_LIMIT: i64 = 10;
+
+/// Arguments for searching globally-verdict'ed Delphi detail traces.
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct SearchGlobalIssueDetails {
+    #[serde(default = "default_limit")]
+    #[schema(default = 20)]
+    pub limit: u64,
+    #[serde(default)]
+    #[schema(default = 0)]
+    pub page: u64,
+    #[serde(default)]
+    pub query: Option<String>,
+}
+
+/// Response for searching globally-verdict'ed Delphi detail traces.
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct SearchGlobalIssueDetailsResponse {
+    /// Total number of matching global verdicts.
+    pub total: i64,
+    /// Globally-verdict'ed detail keys and their local matches.
+    pub traces: Vec<GlobalIssueDetail>,
+}
+
+/// Arguments for fetching one globally-verdict'ed Delphi detail trace.
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct GetGlobalIssueDetail {
+    /// Key used by Delphi to identify matching detail traces.
+    pub detail_key: String,
+    #[serde(default = "default_limit")]
+    #[schema(default = 20)]
+    pub limit: u64,
+    /// Return local traces with IDs greater than this detail ID.
+    #[serde(default)]
+    pub after_detail_id: Option<DelphiReportIssueDetailsId>,
+}
+
+/// Response for one globally-verdict'ed Delphi detail trace.
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct GetGlobalIssueDetailResponse {
+    /// Globally-verdict'ed detail key and a page of local matches.
+    pub trace: GlobalIssueDetail,
+    /// Pass this as `after_detail_id` to fetch the next page.
+    pub next_after_detail_id: Option<DelphiReportIssueDetailsId>,
+}
+
+/// A globally-verdict'ed Delphi detail key.
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct GlobalIssueDetail {
+    /// Key used by Delphi to identify matching detail traces.
+    pub detail_key: String,
+    /// Verdict applied to every matching detail trace.
+    pub verdict: DelphiStatus,
+    /// Number of local detail traces with this key.
+    pub local_trace_count: i64,
+    /// Local detail traces matching this key.
+    pub local_traces: Vec<GlobalIssueDetailTrace>,
+}
+
+/// A local Delphi detail trace matching a globally-verdict'ed key.
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct GlobalIssueDetailTrace {
+    /// ID of the local detail trace.
+    pub detail_id: DelphiReportIssueDetailsId,
+    /// ID of the issue containing this detail trace.
+    pub issue_id: DelphiReportIssueId,
+    /// Delphi issue kind.
+    pub issue_type: String,
+    /// ID of the project containing this detail trace.
+    pub project_id: ProjectId,
+    /// Project slug, when one is set.
+    pub project_slug: Option<String>,
+    /// Project name.
+    pub project_name: String,
+    /// ID of the version containing this detail trace.
+    pub version_id: VersionId,
+    /// Version number.
+    pub version_number: String,
+    /// ID of the file containing this detail trace.
+    pub file_id: FileId,
+    /// File name.
+    pub file_name: String,
+    /// JAR containing the detail trace, when Delphi reported one.
+    pub jar: Option<String>,
+    /// File path containing the detail trace.
+    pub file_path: String,
+    /// Delphi severity for this detail trace.
+    pub severity: DelphiSeverity,
+    /// Project-local verdict for this key.
+    pub local_status: DelphiStatus,
+    /// Effective verdict after applying global fallback rules.
+    pub effective_status: DelphiStatus,
+}
+
+/// Search globally-verdict'ed Delphi detail traces.
+#[utoipa::path(
+	context_path = "/moderation/tech-review",
+	tag = "moderation",
+    security(("bearer_auth" = [])),
+	responses((status = OK, body = SearchGlobalIssueDetailsResponse))
+)]
+#[post("/global-issue-detail/search")]
+pub async fn search_global_issue_details(
+    req: HttpRequest,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    session_queue: web::Data<AuthQueue>,
+    search_req: web::Json<SearchGlobalIssueDetails>,
+) -> Result<web::Json<SearchGlobalIssueDetailsResponse>, ApiError> {
+    check_is_moderator_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Scopes::PROJECT_READ,
+    )
+    .await?;
+
+    let query = search_req
+        .query
+        .as_deref()
+        .map(str::trim)
+        .filter(|q| !q.is_empty());
+    let limit = search_req.limit.clamp(1, 100);
+    let offset = limit.saturating_mul(search_req.page);
+
+    let limit =
+        i64::try_from(limit).wrap_request_err("limit cannot fit into `i64`")?;
+    let offset = i64::try_from(offset)
+        .wrap_request_err("offset cannot fit into `i64`")?;
+
+    let total = sqlx::query!(
+        r#"
+        SELECT COUNT(*) AS "total!"
+        FROM delphi_global_detail_verdicts dgdv
+        WHERE (
+            $1::text IS NULL
+            OR dgdv.detail_key ILIKE '%' || $1 || '%'
+        )
+        "#,
+        query,
+    )
+    .fetch_one(&**pool)
+    .await
+    .wrap_internal_err("failed to count global issue details")?
+    .total;
+
+    let global_rows = sqlx::query!(
+        r#"
+        SELECT
+            dgdv.detail_key,
+            dgdv.verdict AS "verdict!: DelphiStatus",
+            COUNT(dri.id) AS "local_trace_count!"
+        FROM delphi_global_detail_verdicts dgdv
+        LEFT JOIN delphi_issue_details_with_statuses didws
+            ON didws.key = dgdv.detail_key
+        LEFT JOIN delphi_report_issues dri
+            ON dri.id = didws.issue_id
+            AND dri.issue_type != '__dummy'
+        WHERE (
+            $1::text IS NULL
+            OR dgdv.detail_key ILIKE '%' || $1 || '%'
+        )
+        GROUP BY dgdv.detail_key, dgdv.verdict
+        ORDER BY dgdv.detail_key
+        LIMIT $2 OFFSET $3
+        "#,
+        query,
+        limit,
+        offset,
+    )
+    .fetch_all(&**pool)
+    .await
+    .wrap_internal_err("failed to fetch global issue details")?;
+
+    let detail_keys = global_rows
+        .iter()
+        .map(|row| row.detail_key.clone())
+        .collect::<Vec<_>>();
+
+    let local_rows = sqlx::query!(
+        r#"
+        WITH ranked_local_traces AS (
+            SELECT
+                didws.key AS detail_key,
+                didws.id AS detail_id,
+                didws.issue_id,
+                dri.issue_type,
+                m.id AS project_id,
+                m.slug AS project_slug,
+                m.name AS project_name,
+                v.id AS version_id,
+                v.version_number,
+                f.id AS file_id,
+                f.filename AS file_name,
+                didws.jar,
+                didws.file_path,
+                didws.severity,
+                COALESCE(didv.verdict, 'pending'::delphi_report_issue_status)
+                    AS local_status,
+                didws.status AS effective_status,
+                ROW_NUMBER() OVER (
+                    PARTITION BY didws.key
+                    ORDER BY didws.id
+                ) AS row_num
+            FROM delphi_issue_details_with_statuses didws
+            INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id
+            INNER JOIN delphi_reports dr ON dr.id = dri.report_id
+            INNER JOIN files f ON f.id = dr.file_id
+            INNER JOIN versions v ON v.id = f.version_id
+            INNER JOIN mods m ON m.id = v.mod_id
+            LEFT JOIN delphi_issue_detail_verdicts didv
+                ON didv.project_id = didws.project_id
+                AND didv.detail_key = didws.key
+            WHERE
+                didws.key = ANY($1::text[])
+                AND dri.issue_type != '__dummy'
+        )
+        SELECT
+            detail_key AS "detail_key!",
+            detail_id AS "detail_id!: DelphiReportIssueDetailsId",
+            issue_id AS "issue_id!: DelphiReportIssueId",
+            issue_type,
+            project_id AS "project_id!: DBProjectId",
+            project_slug AS "project_slug?",
+            project_name AS "project_name!",
+            version_id AS "version_id!: DBVersionId",
+            v.version_number,
+            file_id AS "file_id!: DBFileId",
+            file_name AS "file_name!",
+            jar AS "jar?",
+            file_path AS "file_path!",
+            severity AS "severity!: DelphiSeverity",
+            local_status AS "local_status!: DelphiStatus",
+            effective_status AS "effective_status!: DelphiStatus"
+        FROM ranked_local_traces v
+        WHERE row_num <= $2
+        ORDER BY detail_key, detail_id
+        "#,
+        &detail_keys,
+        LOCAL_TRACE_PREVIEW_LIMIT,
+    )
+    .fetch_all(&**pool)
+    .await
+    .wrap_internal_err("failed to fetch local issue detail traces")?;
+
+    let mut traces_by_key = local_rows
+        .into_iter()
+        .map(|row| {
+            (
+                row.detail_key,
+                GlobalIssueDetailTrace {
+                    detail_id: row.detail_id,
+                    issue_id: row.issue_id,
+                    issue_type: row.issue_type,
+                    project_id: ProjectId::from(row.project_id),
+                    project_slug: row.project_slug,
+                    project_name: row.project_name,
+                    version_id: VersionId::from(row.version_id),
+                    version_number: row.version_number,
+                    file_id: FileId::from(row.file_id),
+                    file_name: row.file_name,
+                    jar: row.jar,
+                    file_path: row.file_path,
+                    severity: row.severity,
+                    local_status: row.local_status,
+                    effective_status: row.effective_status,
+                },
+            )
+        })
+        .into_group_map();
+
+    let traces = global_rows
+        .into_iter()
+        .map(|row| GlobalIssueDetail {
+            local_traces: traces_by_key
+                .remove(&row.detail_key)
+                .unwrap_or_default(),
+            detail_key: row.detail_key,
+            verdict: row.verdict,
+            local_trace_count: row.local_trace_count,
+        })
+        .collect();
+
+    Ok(web::Json(SearchGlobalIssueDetailsResponse {
+        total,
+        traces,
+    }))
+}
+
+/// Fetch one globally-verdict'ed Delphi detail trace with paginated local matches.
+#[utoipa::path(
+	context_path = "/moderation/tech-review",
+	tag = "moderation",
+    security(("bearer_auth" = [])),
+	responses((status = OK, body = GetGlobalIssueDetailResponse))
+)]
+#[post("/global-issue-detail/local-traces")]
+pub async fn get_global_issue_detail(
+    req: HttpRequest,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    session_queue: web::Data<AuthQueue>,
+    get_req: web::Json<GetGlobalIssueDetail>,
+) -> Result<web::Json<GetGlobalIssueDetailResponse>, ApiError> {
+    check_is_moderator_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Scopes::PROJECT_READ,
+    )
+    .await?;
+
+    let detail_key = get_req.detail_key.trim();
+    if detail_key.is_empty() {
+        return Err(ApiError::Request(eyre!("detail key cannot be empty")));
+    }
+
+    let limit = get_req.limit.clamp(1, 100);
+    let query_limit = i64::try_from(limit + 1)
+        .wrap_request_err("limit cannot fit into `i64`")?;
+    let limit = usize::try_from(limit)
+        .wrap_request_err("limit cannot fit into `usize`")?;
+    let after_detail_id = get_req.after_detail_id.map(|id| id.0);
+
+    let global_row = sqlx::query!(
+        r#"
+        SELECT
+            dgdv.detail_key,
+            dgdv.verdict AS "verdict!: DelphiStatus",
+            COUNT(dri.id) AS "local_trace_count!"
+        FROM delphi_global_detail_verdicts dgdv
+        LEFT JOIN delphi_issue_details_with_statuses didws
+            ON didws.key = dgdv.detail_key
+        LEFT JOIN delphi_report_issues dri
+            ON dri.id = didws.issue_id
+            AND dri.issue_type != '__dummy'
+        WHERE dgdv.detail_key = $1
+        GROUP BY dgdv.detail_key, dgdv.verdict
+        "#,
+        detail_key,
+    )
+    .fetch_optional(&**pool)
+    .await
+    .wrap_internal_err("failed to fetch global issue detail")?
+    .ok_or(ApiError::NotFound)?;
+
+    let local_rows = sqlx::query!(
+        r#"
+        SELECT
+            didws.key AS "detail_key!",
+            didws.id AS "detail_id!: DelphiReportIssueDetailsId",
+            didws.issue_id AS "issue_id!: DelphiReportIssueId",
+            dri.issue_type,
+            m.id AS "project_id!: DBProjectId",
+            m.slug AS "project_slug?",
+            m.name AS "project_name!",
+            v.id AS "version_id!: DBVersionId",
+            v.version_number,
+            f.id AS "file_id!: DBFileId",
+            f.filename AS "file_name!",
+            didws.jar AS "jar?",
+            didws.file_path AS "file_path!",
+            didws.severity AS "severity!: DelphiSeverity",
+            COALESCE(didv.verdict, 'pending'::delphi_report_issue_status)
+                AS "local_status!: DelphiStatus",
+            didws.status AS "effective_status!: DelphiStatus"
+        FROM delphi_issue_details_with_statuses didws
+        INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id
+        INNER JOIN delphi_reports dr ON dr.id = dri.report_id
+        INNER JOIN files f ON f.id = dr.file_id
+        INNER JOIN versions v ON v.id = f.version_id
+        INNER JOIN mods m ON m.id = v.mod_id
+        LEFT JOIN delphi_issue_detail_verdicts didv
+            ON didv.project_id = didws.project_id
+            AND didv.detail_key = didws.key
+        WHERE
+            didws.key = $1
+            AND ($2::bigint IS NULL OR didws.id > $2)
+            AND dri.issue_type != '__dummy'
+        ORDER BY didws.id
+        LIMIT $3
+        "#,
+        detail_key,
+        after_detail_id,
+        query_limit,
+    )
+    .fetch_all(&**pool)
+    .await
+    .wrap_internal_err("failed to fetch local issue detail traces")?;
+
+    let mut local_traces = local_rows
+        .into_iter()
+        .map(|row| GlobalIssueDetailTrace {
+            detail_id: row.detail_id,
+            issue_id: row.issue_id,
+            issue_type: row.issue_type,
+            project_id: ProjectId::from(row.project_id),
+            project_slug: row.project_slug,
+            project_name: row.project_name,
+            version_id: VersionId::from(row.version_id),
+            version_number: row.version_number,
+            file_id: FileId::from(row.file_id),
+            file_name: row.file_name,
+            jar: row.jar,
+            file_path: row.file_path,
+            severity: row.severity,
+            local_status: row.local_status,
+            effective_status: row.effective_status,
+        })
+        .collect::<Vec<_>>();
+
+    let has_more = local_traces.len() > limit;
+    if has_more {
+        local_traces.pop();
+    }
+    let next_after_detail_id = has_more
+        .then(|| local_traces.last().map(|trace| trace.detail_id))
+        .flatten();
+
+    Ok(web::Json(GetGlobalIssueDetailResponse {
+        trace: GlobalIssueDetail {
+            detail_key: global_row.detail_key,
+            verdict: global_row.verdict,
+            local_trace_count: global_row.local_trace_count,
+            local_traces,
+        },
+        next_after_detail_id,
+    }))
+}
diff --git a/apps/labrinth/src/routes/mod.rs b/apps/labrinth/src/routes/mod.rs
index 509e3c998a..e9e606deba 100644
--- a/apps/labrinth/src/routes/mod.rs
+++ b/apps/labrinth/src/routes/mod.rs
@@ -138,6 +138,7 @@ pub fn root_config(cfg: &mut web::ServiceConfig) {
         web::scope("")
             .wrap(default_cors())
             .service(index::index_get)
+            .service(index::build_get)
             .service(Files::new("/", "assets/")),
     );
 }
diff --git a/apps/labrinth/src/routes/v2/mod.rs b/apps/labrinth/src/routes/v2/mod.rs
index 0738423db8..5c55d5c9be 100644
--- a/apps/labrinth/src/routes/v2/mod.rs
+++ b/apps/labrinth/src/routes/v2/mod.rs
@@ -1,4 +1,3 @@
-pub(crate) mod moderation;
 mod notifications;
 mod openapi;
 pub(crate) mod project_creation;
@@ -26,7 +25,6 @@ pub fn config(cfg: &mut web::ServiceConfig) {
             .configure(super::internal::flows::config)
             .configure(super::internal::pats::config)
             .configure(super::internal::admin::config)
-            .configure(moderation::config)
             .configure(notifications::config)
             .configure(project_creation::config)
             .configure(projects::config)
diff --git a/apps/labrinth/src/routes/v2/moderation.rs b/apps/labrinth/src/routes/v2/moderation.rs
deleted file mode 100644
index 61b00e6a9d..0000000000
--- a/apps/labrinth/src/routes/v2/moderation.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use super::ApiError;
-use crate::database::PgPool;
-use crate::models::projects::Project;
-use crate::models::v2::projects::LegacyProject;
-use crate::queue::session::AuthQueue;
-use crate::routes::internal;
-use crate::{database::redis::RedisPool, routes::v2_reroute};
-use actix_web::{HttpRequest, HttpResponse, get, web};
-use serde::Deserialize;
-
-pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
-    cfg.service(web::scope("/moderation").service(get_projects));
-}
-
-#[derive(Deserialize)]
-pub struct ResultCount {
-    #[serde(default = "default_count")]
-    pub count: u16,
-}
-
-fn default_count() -> u16 {
-    100
-}
-
-/// List projects in the moderation queue.  
-#[utoipa::path(
-	context_path = "/moderation",
-	tag = "v2 moderation",
-    get,
-    operation_id = "getModerationProjects",
-    params(
-        ("count" = Option<u16>, Query, description = "Maximum number of projects to return")
-    ),
-    responses(
-		(status = 200, description = "Expected response to a valid request", body = Vec<LegacyProject>),
-        (
-            status = 401,
-            description = "Incorrect token scopes or no authorization to access the requested item(s)"
-        ),
-        (
-            status = 404,
-            description = "The requested item(s) were not found or no authorization to access the requested item(s)"
-        )
-    ),
-    security(("bearer_auth" = ["PROJECT_READ"]))
-)]
-#[get("/projects")]
-pub async fn get_projects(
-    req: HttpRequest,
-    pool: web::Data<PgPool>,
-    redis: web::Data<RedisPool>,
-    count: web::Query<ResultCount>,
-    session_queue: web::Data<AuthQueue>,
-) -> Result<HttpResponse, ApiError> {
-    let response = internal::moderation::get_projects_internal(
-        req,
-        pool.clone(),
-        redis.clone(),
-        web::Query(internal::moderation::ProjectsRequestOptions {
-            count: count.count,
-            offset: 0,
-            has_external_dependencies: None,
-        }),
-        session_queue,
-    )
-    .await
-    .map(|resp| HttpResponse::Ok().json(resp))
-    .or_else(v2_reroute::flatten_404_error)?;
-
-    // Convert to V2 projects
-    match v2_reroute::extract_ok_json::<Vec<Project>>(response).await {
-        Ok(project) => {
-            let legacy_projects =
-                LegacyProject::from_many(project, &**pool, &redis).await?;
-            Ok(HttpResponse::Ok().json(legacy_projects))
-        }
-        Err(response) => Ok(response),
-    }
-}
diff --git a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs
index 0844337cc2..484af9b152 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs
@@ -611,6 +611,7 @@ static DOWNLOAD_SOURCE_PATTERNS: LazyLock<Vec<(Regex, DownloadSourcePattern)>> =
             (r"^(packwiz-installer|packwiz/)", P::Named("Packwiz")),
             (r"^mrpack4server", P::Named("mrpack4server")),
             (r"^DawnLauncher/", P::Named("Dawn")),
+            (r"^Complementary-Installer", P::Named("Complementary Installer")),
             (
                 r"^(Mozilla/|Chrome/|Chromium/|Firefox/|Safari/|AppleWebKit/|Edg/|OPR/)",
                 P::Website,
diff --git a/apps/labrinth/src/routes/v3/content/mod.rs b/apps/labrinth/src/routes/v3/content/mod.rs
index c06479a5f9..78e3098c2e 100644
--- a/apps/labrinth/src/routes/v3/content/mod.rs
+++ b/apps/labrinth/src/routes/v3/content/mod.rs
@@ -28,10 +28,10 @@ const CONTENT_RESOLVE_CACHE_SCHEMA_VERSION: &str = "v1";
 const CONTENT_RESOLVE_CACHE_HEAT_WINDOW_SECONDS: i64 = 60 * 60 * 24;
 
 pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
-    cfg.service(web::scope("/v3").service(resolve_content));
+    cfg.service(resolve_content);
 }
 
-/// Resolve content.  
+/// Resolve content.
 #[utoipa::path(
 	tag = "content",
 	request_body = serde_json::Value,
diff --git a/apps/labrinth/src/routes/v3/mod.rs b/apps/labrinth/src/routes/v3/mod.rs
index 98df78ef10..b859510c24 100644
--- a/apps/labrinth/src/routes/v3/mod.rs
+++ b/apps/labrinth/src/routes/v3/mod.rs
@@ -69,9 +69,9 @@ pub fn config(cfg: &mut web::ServiceConfig) {
             .configure(users::config)
             .configure(version_file::config)
             .configure(versions::config)
-            .configure(friends::config),
+            .configure(friends::config)
+            .configure(content::config),
     );
-    cfg.configure(content::config);
 }
 
 #[derive(utoipa::OpenApi)]
diff --git a/apps/labrinth/src/search/backend/typesense/mod.rs b/apps/labrinth/src/search/backend/typesense/mod.rs
index 4db90b621c..c6c37a0b84 100644
--- a/apps/labrinth/src/search/backend/typesense/mod.rs
+++ b/apps/labrinth/src/search/backend/typesense/mod.rs
@@ -408,6 +408,14 @@ impl SearchField {
                 optional: true,
                 token_separators: &["-"],
             },
+            SearchField::AllProjectTypes => TypesenseFieldSpec {
+                path: "all_project_types",
+                ty: "string[]",
+                facet: true,
+                sort: false,
+                optional: true,
+                token_separators: &["-"],
+            },
             SearchField::ProjectId => TypesenseFieldSpec {
                 path: "project_id",
                 ty: "string",
@@ -566,6 +574,7 @@ impl Typesense {
             json!({"name": "indexed_name", "type": "string", "facet": false, "stem": true}),
             json!({"name": "indexed_author", "type": "string", "facet": false}),
             json!({"name": "log_downloads", "type": "float", "sort": true}),
+            json!({"name": "downloads", "type": "int32", "sort": true}),
             json!({"name": "follows", "type": "int32", "facet": true, "sort": true}),
             json!({"name": "created_timestamp", "type": "int64", "sort": true}),
             json!({"name": "modified_timestamp", "type": "int64", "sort": true}),
@@ -1355,9 +1364,12 @@ fn facets_to_typesense(facets_json: &str) -> Result<String> {
 /// Converts a single facet condition such as `"categories:mods"`,
 /// `"categories=mods"`, or `"downloads!=100"` into a Typesense filter clause.
 fn condition_to_typesense_filter(cond: &str) -> String {
-    // Handle `!=` before `=` so we don't misfire on the equality arm.
-    if let Some((field, value)) = cond.split_once("!=") {
-        return format!("{}:!= {}", field.trim(), value.trim());
+    // Match multi-character operators before their single-character prefixes,
+    // and range/inequality operators before the plain `=` equality arm.
+    for op in ["!=", ">=", "<=", ">", "<"] {
+        if let Some((field, value)) = cond.split_once(op) {
+            return format!("{}:{} {}", field.trim(), op, value.trim());
+        }
     }
     if let Some((field, value)) = cond.split_once(':') {
         return format!("{}:= {}", field.trim(), value.trim());
diff --git a/apps/labrinth/src/search/indexing.rs b/apps/labrinth/src/search/indexing.rs
index 4ebe510abd..213ad59354 100644
--- a/apps/labrinth/src/search/indexing.rs
+++ b/apps/labrinth/src/search/indexing.rs
@@ -553,6 +553,20 @@ async fn build_search_documents(
                 .flat_map(|x| x.loaders.clone())
                 .collect::<Vec<_>>();
 
+            // all valid project types across every version of the project, so that
+            // filters can exclude projects that have *any* version of a given
+            // project type (unlike the version-specific `project_types` field).
+            let mut all_project_types = versions
+                .iter()
+                .flat_map(|x| x.project_types.clone())
+                .collect::<Vec<_>>();
+            all_project_types.sort();
+            all_project_types.dedup();
+            exp::compat::correct_project_types(
+                &project.components,
+                &mut all_project_types,
+            );
+
             for version in versions {
                 if let Some(version_ids_to_index) = version_ids_to_index
                     && !version_ids_to_index.contains(&version.id)
@@ -673,6 +687,7 @@ async fn build_search_documents(
                     slug: project.slug.clone(),
                     // TODO
                     project_types,
+                    all_project_types: all_project_types.clone(),
                     gallery: gallery.clone(),
                     featured_gallery: featured_gallery.clone(),
                     open_source,
diff --git a/apps/labrinth/src/search/mod.rs b/apps/labrinth/src/search/mod.rs
index 608bef3968..87a7e538bb 100644
--- a/apps/labrinth/src/search/mod.rs
+++ b/apps/labrinth/src/search/mod.rs
@@ -202,6 +202,7 @@ pub enum SearchField {
     Author,
     License,
     ProjectTypes,
+    AllProjectTypes,
     ProjectId,
     OpenSource,
     Environment,
@@ -241,7 +242,8 @@ pub struct UploadSearchProject {
     pub project_id: String,
     //
     pub project_types: Vec<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub all_project_types: Vec<String>,
     pub slug: Option<String>,
     pub author: String,
     pub author_id: String,
@@ -321,6 +323,8 @@ pub struct ResultSearchProject {
     pub version_id: String,
     pub project_id: String,
     pub project_types: Vec<String>,
+    #[serde(default)]
+    pub all_project_types: Vec<String>,
     pub slug: Option<String>,
     pub author: String,
     #[serde(default)]
@@ -369,6 +373,7 @@ impl From<UploadSearchProject> for ResultSearchProject {
             version_id: source.version_id,
             project_id: source.project_id,
             project_types: source.project_types,
+            all_project_types: source.all_project_types,
             slug: source.slug,
             author: source.author,
             author_id: Some(source.author_id),
diff --git a/packages/api-client/src/modules/labrinth/moderation/internal.ts b/packages/api-client/src/modules/labrinth/moderation/internal.ts
index a03b1ce7fe..33328f9969 100644
--- a/packages/api-client/src/modules/labrinth/moderation/internal.ts
+++ b/packages/api-client/src/modules/labrinth/moderation/internal.ts
@@ -6,6 +6,34 @@ export class LabrinthModerationInternalModule extends AbstractModule {
 		return 'labrinth_moderation_internal'
 	}
 
+	public async getProjects(
+		params: Labrinth.Moderation.Internal.ProjectsRequest = {},
+	): Promise<Labrinth.Moderation.Internal.ProjectsResponse> {
+		return this.client.request<Labrinth.Moderation.Internal.ProjectsResponse>(
+			'/moderation/projects',
+			{
+				api: 'labrinth',
+				version: 'internal',
+				method: 'GET',
+				params,
+			},
+		)
+	}
+
+	public async getProjectIds(
+		params: Omit<Labrinth.Moderation.Internal.ProjectsRequest, 'count' | 'offset'> = {},
+	): Promise<Labrinth.Moderation.Internal.ProjectIdsResponse> {
+		return this.client.request<Labrinth.Moderation.Internal.ProjectIdsResponse>(
+			'/moderation/projects/ids',
+			{
+				api: 'labrinth',
+				version: 'internal',
+				method: 'GET',
+				params,
+			},
+		)
+	}
+
 	public async acquireLock(
 		projectId: string,
 	): Promise<Labrinth.Moderation.Internal.LockAcquireResponse> {
diff --git a/packages/api-client/src/modules/labrinth/tech-review/internal.ts b/packages/api-client/src/modules/labrinth/tech-review/internal.ts
index e0a02c70b0..0012474334 100644
--- a/packages/api-client/src/modules/labrinth/tech-review/internal.ts
+++ b/packages/api-client/src/modules/labrinth/tech-review/internal.ts
@@ -100,9 +100,15 @@ export class LabrinthTechReviewInternalModule extends AbstractModule {
 	 */
 	public async updateIssueDetail(
 		detailId: string,
-		data: Labrinth.TechReview.Internal.UpdateIssueRequest,
+		data: Labrinth.TechReview.Internal.UpdateIssueDetailRequest,
 	): Promise<void> {
-		return this.client.request<void>(`/moderation/tech-review/issue-detail/${detailId}`, {
+		return this.updateIssueDetails([{ detail_id: detailId, verdict: data.verdict }])
+	}
+
+	public async updateIssueDetails(
+		data: Labrinth.TechReview.Internal.UpdateIssueRequest[],
+	): Promise<void> {
+		return this.client.request<void>('/moderation/tech-review/issue-detail', {
 			api: 'labrinth',
 			version: 'internal',
 			method: 'PATCH',
@@ -110,6 +116,45 @@ export class LabrinthTechReviewInternalModule extends AbstractModule {
 		})
 	}
 
+	public async updateGlobalIssueDetails(
+		data: Labrinth.TechReview.Internal.UpdateGlobalIssueRequest[],
+	): Promise<void> {
+		return this.client.request<void>('/moderation/tech-review/global-issue-detail', {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'POST',
+			body: data,
+		})
+	}
+
+	public async searchGlobalIssueDetails(
+		params: Labrinth.TechReview.Internal.SearchGlobalIssueDetailsRequest,
+	): Promise<Labrinth.TechReview.Internal.SearchGlobalIssueDetailsResponse> {
+		return this.client.request<Labrinth.TechReview.Internal.SearchGlobalIssueDetailsResponse>(
+			'/moderation/tech-review/global-issue-detail/search',
+			{
+				api: 'labrinth',
+				version: 'internal',
+				method: 'POST',
+				body: params,
+			},
+		)
+	}
+
+	public async getGlobalIssueDetail(
+		params: Labrinth.TechReview.Internal.GetGlobalIssueDetailRequest,
+	): Promise<Labrinth.TechReview.Internal.GetGlobalIssueDetailResponse> {
+		return this.client.request<Labrinth.TechReview.Internal.GetGlobalIssueDetailResponse>(
+			'/moderation/tech-review/global-issue-detail/local-traces',
+			{
+				api: 'labrinth',
+				version: 'internal',
+				method: 'POST',
+				body: params,
+			},
+		)
+	}
+
 	public async submitProject(
 		projectId: string,
 		data: Labrinth.TechReview.Internal.SubmitProjectRequest,
diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
index 056508282b..5744f60128 100644
--- a/packages/api-client/src/modules/labrinth/types.ts
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -1742,6 +1742,7 @@ export namespace Labrinth {
 			export interface ResultSearchProject {
 				project_id: string
 				project_type: string
+				all_project_types: string[]
 				slug: string | null
 				author: string
 				author_id: string | null
@@ -1779,6 +1780,7 @@ export namespace Labrinth {
 				version_id: string
 				project_id: string
 				project_types: string[]
+				all_project_types: string[]
 				slug: string | null
 				author: string
 				author_id: string | null
@@ -1914,6 +1916,57 @@ export namespace Labrinth {
 
 	export namespace Moderation {
 		export namespace Internal {
+			export type Ownership =
+				| {
+						kind: 'user'
+						id: string
+						name: string
+						icon_url: string | null
+				  }
+				| {
+						kind: 'organization'
+						id: string
+						name: string
+						icon_url: string | null
+				  }
+
+			export type ProjectsSort = 'oldest' | 'newest' | 'most_external_deps' | 'least_external_deps'
+
+			export type ProjectsRequest = {
+				count?: number
+				offset?: number
+				has_external_dependencies?: boolean
+				exclude_technical_review?: boolean
+				query?: string
+				project_type?: string
+				sort?: ProjectsSort
+			}
+
+			export type QueueProject = {
+				id: string
+				slug: string | null
+				name: string
+				summary: string
+				icon_url: string | null
+				status: Projects.v2.ProjectStatus
+				requested_status: Projects.v2.ProjectStatus | null
+				queued: string | null
+				published: string
+				updated: string
+				project_types: string[]
+				ownership: Ownership
+				external_dependencies_count: number
+			}
+
+			export type ProjectsResponse = {
+				total: number
+				projects: QueueProject[]
+			}
+
+			export type ProjectIdsResponse = {
+				ids: string[]
+			}
+
 			export type LockedByUser = {
 				id: string
 				username: string
@@ -2171,9 +2224,66 @@ export namespace Labrinth {
 				| 'severity_desc'
 
 			export type UpdateIssueRequest = {
+				detail_id: string
+				verdict: DelphiReportIssueStatus
+			}
+
+			export type UpdateIssueDetailRequest = {
+				verdict: DelphiReportIssueStatus
+			}
+
+			export type UpdateGlobalIssueRequest = {
+				detail_key: string
 				verdict: 'safe' | 'unsafe'
 			}
 
+			export type SearchGlobalIssueDetailsRequest = {
+				limit?: number
+				page?: number
+				query?: string | null
+			}
+
+			export type SearchGlobalIssueDetailsResponse = {
+				total: number
+				traces: GlobalIssueDetail[]
+			}
+
+			export type GetGlobalIssueDetailRequest = {
+				detail_key: string
+				limit?: number
+				after_detail_id?: string | null
+			}
+
+			export type GetGlobalIssueDetailResponse = {
+				trace: GlobalIssueDetail
+				next_after_detail_id: string | null
+			}
+
+			export type GlobalIssueDetail = {
+				detail_key: string
+				verdict: DelphiReportIssueStatus
+				local_trace_count: number
+				local_traces: GlobalIssueDetailTrace[]
+			}
+
+			export type GlobalIssueDetailTrace = {
+				detail_id: string
+				issue_id: string
+				issue_type: string
+				project_id: string
+				project_slug: string | null
+				project_name: string
+				version_id: string
+				version_number: string
+				file_id: string
+				file_name: string
+				jar: string | null
+				file_path: string
+				severity: DelphiSeverity
+				local_status: DelphiReportIssueStatus
+				effective_status: DelphiReportIssueStatus
+			}
+
 			export type SubmitProjectRequest = {
 				verdict: 'safe' | 'unsafe'
 				message?: string
diff --git a/packages/app-lib/src/api/instance/lifecycle.rs b/packages/app-lib/src/api/instance/lifecycle.rs
index 44c1d3d32f..0139b6b5f7 100644
--- a/packages/app-lib/src/api/instance/lifecycle.rs
+++ b/packages/app-lib/src/api/instance/lifecycle.rs
@@ -61,11 +61,16 @@ pub async fn edit(
     let state = State::get().await?;
     crate::state::edit_instance(instance_id, patch, &state.pool).await?;
 
-    crate::state::get_instance(instance_id, &state.pool)
+    let instance = crate::state::get_instance(instance_id, &state.pool)
         .await?
         .ok_or_else(|| {
-            crate::ErrorKind::InputError("Unknown instance".to_string()).into()
-        })
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+                .as_error()
+        })?;
+
+    emit_instance(&instance.instance.id, InstancePayloadType::Edited).await?;
+
+    Ok(instance)
 }
 
 pub async fn edit_icon(
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 4a0343aaec..81df354664 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -64,6 +64,7 @@ pub enum FeatureFlag {
     I18nDebug,
     ShowInstancePlayTime,
     SkipNonEssentialWarnings,
+    AdvancedFiltersCollapsed,
 }
 
 impl Settings {
diff --git a/packages/blog/changelog.ts b/packages/blog/changelog.ts
index 47cd3b2091..1917b4f835 100644
--- a/packages/blog/changelog.ts
+++ b/packages/blog/changelog.ts
@@ -10,6 +10,50 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2026-07-08T22:58:25+00:00`,
+		product: 'web',
+		body: `## Changed
+- Revised design for the project download modal.`,
+	},
+	{
+		date: `2026-07-08T15:05:35+00:00`,
+		product: 'app',
+		version: '0.15.9',
+		body: `## Added
+- Added new advanced filter category to Discover content.
+- Added options to exclude plugins and data packs from mod search
+- Added options to exclude mods and plugins from data pack search
+
+## Fixed
+- Instance edits not appearing to be immediately saved.`,
+	},
+	{
+		date: `2026-07-08T15:05:35+00:00`,
+		product: 'web',
+		body: `## Added
+- Added new advanced filter category to Discover content.
+- Added options to exclude plugins and data packs from mod search
+- Added options to exclude mods and data packs from plugin search
+- Added options to exclude mods and plugins from data pack search`,
+	},
+	{
+		date: `2026-07-06T22:19:13+00:00`,
+		product: 'app',
+		version: '0.15.8',
+		body: `## Changed
+- Updated the version pages to use the new design.
+
+## Fixed
+- Fixed project and version links from an instance not being aware of the instance you're coming from.
+- Fixed Files tab preloading files which weren't actually editable/viewable which caused a memory leak.`,
+	},
+	{
+		date: `2026-07-06T22:19:13+00:00`,
+		product: 'hosting',
+		body: `## Fixed
+- Fixed Files tab preloading files which weren't actually editable/viewable which caused a memory leak.`,
+	},
 	{
 		date: `2026-07-05T01:48:48+00:00`,
 		product: 'app',
diff --git a/packages/daedalus/src/modded.rs b/packages/daedalus/src/modded.rs
index c306b651ef..6d121b357e 100644
--- a/packages/daedalus/src/modded.rs
+++ b/packages/daedalus/src/modded.rs
@@ -10,10 +10,73 @@ pub const CURRENT_FABRIC_FORMAT_VERSION: usize = 0;
 /// The latest version of the format the fabric model structs deserialize to
 pub const CURRENT_FORGE_FORMAT_VERSION: usize = 0;
 /// The latest version of the format the quilt model structs deserialize to
-pub const CURRENT_QUILT_FORMAT_VERSION: usize = 0;
+pub const CURRENT_QUILT_FORMAT_VERSION: usize = 1;
 /// The latest version of the format the neoforge model structs deserialize to
 pub const CURRENT_NEOFORGE_FORMAT_VERSION: usize = 0;
 
+/// Metadata for locating and caching a loader manifest.
+#[derive(Debug, Clone)]
+pub struct LoaderManifestMetadata {
+    /// The canonical loader name used in launcher-meta paths.
+    pub loader: String,
+    /// The latest manifest format version for this loader.
+    pub format_version: usize,
+    /// The cache key that includes the loader format version.
+    pub cache_key: String,
+    /// The launcher-meta path to the manifest.
+    pub path: String,
+}
+
+/// Returns metadata for the latest manifest format for the provided loader.
+pub fn loader_manifest_metadata(loader: &str) -> LoaderManifestMetadata {
+    let format_version = current_loader_manifest_format_version(loader);
+    let cache_key = format!("{loader}-v{format_version}");
+    let path = format!("{loader}/v{format_version}/manifest.json");
+
+    LoaderManifestMetadata {
+        loader: loader.to_string(),
+        format_version,
+        cache_key,
+        path,
+    }
+}
+
+/// Returns loader manifest metadata from a versioned cache key.
+pub fn loader_manifest_metadata_from_cache_key(
+    cache_key: &str,
+) -> LoaderManifestMetadata {
+    if let Some((loader, format_version)) =
+        cache_key.rsplit_once("-v").and_then(|(loader, version)| {
+            version
+                .parse::<usize>()
+                .ok()
+                .map(|version| (loader, version))
+        })
+    {
+        let cache_key = format!("{loader}-v{format_version}");
+        let path = format!("{loader}/v{format_version}/manifest.json");
+
+        LoaderManifestMetadata {
+            loader: loader.to_string(),
+            format_version,
+            cache_key,
+            path,
+        }
+    } else {
+        loader_manifest_metadata(cache_key)
+    }
+}
+
+fn current_loader_manifest_format_version(loader: &str) -> usize {
+    match loader {
+        "fabric" => CURRENT_FABRIC_FORMAT_VERSION,
+        "forge" => CURRENT_FORGE_FORMAT_VERSION,
+        "quilt" => CURRENT_QUILT_FORMAT_VERSION,
+        "neo" => CURRENT_NEOFORGE_FORMAT_VERSION,
+        _ => 0,
+    }
+}
+
 /// The dummy replace string library names, inheritsFrom, and version names should be replaced with
 pub const DUMMY_REPLACE_STRING: &str = "${modrinth.gameVersion}";
 
@@ -188,19 +251,36 @@ pub fn merge_partial_version(
 pub struct Manifest {
     /// The game versions the mod loader supports
     pub game_versions: Vec<Version>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    /// Groups of game versions that share compatible loader version profiles
+    pub version_groups: Vec<VersionGroup>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
 ///  A game version of Minecraft
 pub struct Version {
     /// The minecraft version ID
     pub id: String,
     /// Whether the release is stable or not
     pub stable: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    /// The loader profile group for this Minecraft version
+    pub version_group: Option<String>,
     /// A map that contains loader versions for the game version
     pub loaders: Vec<LoaderVersion>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
+/// A group of Minecraft versions that share loader version profiles
+pub struct VersionGroup {
+    /// The version group ID
+    pub id: String,
+    /// The loader versions for this version group
+    pub loaders: Vec<LoaderVersion>,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 /// A version of a Minecraft mod loader
 pub struct LoaderVersion {
diff --git a/packages/ui/src/components/external_files/AddFilesToAttributionGroupModal.vue b/packages/ui/src/components/external_files/AddFilesToAttributionGroupModal.vue
index 7ef1466574..68c0940d39 100644
--- a/packages/ui/src/components/external_files/AddFilesToAttributionGroupModal.vue
+++ b/packages/ui/src/components/external_files/AddFilesToAttributionGroupModal.vue
@@ -38,7 +38,7 @@ const messages = defineMessages({
 	},
 	addFilesModalSearchPlaceholder: {
 		id: 'external-files.permissions-card.add-files-modal.search-placeholder',
-		defaultMessage: 'Search files…',
+		defaultMessage: 'Search files...',
 	},
 	addFilesModalNoSearchResults: {
 		id: 'external-files.permissions-card.add-files-modal.no-search-results',
diff --git a/packages/ui/src/components/external_files/AddToExistingExternalProjectModal.vue b/packages/ui/src/components/external_files/AddToExistingExternalProjectModal.vue
index 0c6365c6fd..5f8f2a5f4d 100644
--- a/packages/ui/src/components/external_files/AddToExistingExternalProjectModal.vue
+++ b/packages/ui/src/components/external_files/AddToExistingExternalProjectModal.vue
@@ -216,7 +216,7 @@ defineExpose({ show, hide })
 							:icon="SearchIcon"
 							type="text"
 							autocomplete="off"
-							placeholder="Search external projects…"
+							placeholder="Search external projects..."
 							clearable
 							wrapper-class="flex-1 min-w-[12rem]"
 							:disabled="addFilesMutation.isPending.value"
@@ -237,14 +237,14 @@ defineExpose({ show, hide })
 						>
 							<span class="text-contrast font-semibold">
 								<template v-if="searchNeedsInput"> Enter a search term to get started </template>
-								<template v-else-if="isLoading"> Loading external projects… </template>
+								<template v-else-if="isLoading"> Loading external projects...</template>
 								<template v-else> No projects matched that search </template>
 							</span>
 							<span class="text-secondary text-sm">
 								<template v-if="searchNeedsInput">
 									Type at least 3 characters of a project's title to begin browsing.
 								</template>
-								<template v-else-if="isLoading"> Loading external projects… </template>
+								<template v-else-if="isLoading"> Loading external projects...</template>
 								<template v-else> No projects matched that search </template>
 							</span>
 						</div>
diff --git a/packages/ui/src/components/search/SearchSidebarFilter.vue b/packages/ui/src/components/search/SearchSidebarFilter.vue
index 3fe20ce923..99ca2b54ec 100644
--- a/packages/ui/src/components/search/SearchSidebarFilter.vue
+++ b/packages/ui/src/components/search/SearchSidebarFilter.vue
@@ -71,83 +71,105 @@
 		</template>
 		<template v-else #default>
 			<slot name="prefix" />
-			<StyledInput
-				v-if="filterType.searchable"
-				:id="`search-${filterType.id}`"
-				v-model="query"
-				:icon="SearchIcon"
-				type="text"
-				:placeholder="formatMessage(messages.searchPlaceholder)"
-				autocomplete="off"
-				clearable
-				size="small"
-				input-class="!bg-button-bg"
-				wrapper-class="mx-2 my-1 w-[calc(100%-1rem)]"
-			/>
-
-			<ScrollablePanel :class="{ 'h-[16rem]': scrollable }" :disable-scrolling="!scrollable">
-				<div :class="innerPanelClass ? innerPanelClass : ''" class="flex flex-col gap-1">
-					<template v-if="groupedOptions">
-						<SearchFilterGroup
-							v-for="[groupName, options] in groupedOptions"
-							:key="`${filterType.id}-group-${groupName}`"
-							:group-name="groupName"
-							:options="options"
-							:supports-negative-filter="filterType.supports_negative_filter"
-							:included="isIncluded"
-							:excluded="isExcluded"
-							@toggle="toggleFilter"
-							@toggle-exclude="toggleNegativeFilter"
-						/>
-					</template>
-					<template v-else>
-						<SearchFilterOption
-							v-for="option in visibleOptions"
-							:key="`${filterType.id}-${option}`"
-							:option="option"
-							:included="isIncluded(option)"
-							:excluded="isExcluded(option)"
-							:supports-negative-filter="filterType.supports_negative_filter"
-							:class="{
-								'mr-3': scrollable,
-							}"
-							@toggle="toggleFilter"
-							@toggle-exclude="toggleNegativeFilter"
+			<div
+				v-if="filterType.display === 'toggle'"
+				:class="innerPanelClass ? innerPanelClass : ''"
+				class="flex flex-col gap-3"
+			>
+				<label
+					v-for="option in filterType.options"
+					:key="`${filterType.id}-toggle-${option.id}`"
+					class="flex cursor-pointer items-center justify-between text-secondary gap-3 font-semibold"
+				>
+					<span class="text-sm">{{ option.formatted_name ?? option.id }}</span>
+					<Toggle
+						:model-value="isExcluded(option)"
+						small
+						class="shrink-0"
+						@update:model-value="toggleNegativeFilter(option)"
+					/>
+				</label>
+			</div>
+			<template v-if="filterType.display !== 'toggle'">
+				<StyledInput
+					v-if="filterType.searchable"
+					:id="`search-${filterType.id}`"
+					v-model="query"
+					:icon="SearchIcon"
+					type="text"
+					:placeholder="formatMessage(messages.searchPlaceholder)"
+					autocomplete="off"
+					clearable
+					size="small"
+					input-class="!bg-button-bg"
+					wrapper-class="mx-2 my-1 w-[calc(100%-1rem)]"
+				/>
+				<ScrollablePanel :class="{ 'h-[16rem]': scrollable }" :disable-scrolling="!scrollable">
+					<div :class="innerPanelClass ? innerPanelClass : ''" class="flex flex-col gap-1">
+						<template v-if="groupedOptions">
+							<SearchFilterGroup
+								v-for="[groupName, options] in groupedOptions"
+								:key="`${filterType.id}-group-${groupName}`"
+								:group-name="groupName"
+								:options="options"
+								:supports-negative-filter="filterType.supports_negative_filter"
+								:included="isIncluded"
+								:excluded="isExcluded"
+								@toggle="toggleFilter"
+								@toggle-exclude="toggleNegativeFilter"
+							/>
+						</template>
+						<template v-else>
+							<SearchFilterOption
+								v-for="option in visibleOptions"
+								:key="`${filterType.id}-${option}`"
+								:option="option"
+								:included="isIncluded(option)"
+								:excluded="isExcluded(option)"
+								:supports-negative-filter="filterType.supports_negative_filter"
+								:class="{
+									'mr-3': scrollable,
+								}"
+								@toggle="toggleFilter"
+								@toggle-exclude="toggleNegativeFilter"
+							>
+								<slot name="option" :filter="filterType" :option="option">
+									<span
+										v-if="option.icon"
+										class="inline-flex items-center justify-center shrink-0 h-4 w-4"
+										:style="iconStyle(option)"
+									>
+										<div
+											v-if="typeof option.icon === 'string'"
+											class="h-4 w-4"
+											v-html="option.icon"
+										/>
+										<component :is="option.icon" v-else class="h-4 w-4" />
+									</span>
+									<span class="truncate text-sm" :style="iconStyle(option)">
+										{{ option.formatted_name ?? option.id }}
+									</span>
+								</slot>
+							</SearchFilterOption>
+						</template>
+						<button
+							v-if="filterType.display === 'expandable'"
+							class="flex bg-transparent text-secondary border-none cursor-pointer !w-full items-center gap-2 truncate rounded-xl px-2 py-1 text-sm font-semibold transition-all hover:text-contrast focus-visible:text-contrast active:scale-[0.98]"
+							@click="showMore = !showMore"
 						>
-							<slot name="option" :filter="filterType" :option="option">
-								<span
-									v-if="option.icon"
-									class="inline-flex items-center justify-center shrink-0 h-4 w-4"
-									:style="iconStyle(option)"
-								>
-									<div
-										v-if="typeof option.icon === 'string'"
-										class="h-4 w-4"
-										v-html="option.icon"
-									/>
-									<component :is="option.icon" v-else class="h-4 w-4" />
-								</span>
-								<span class="truncate text-sm" :style="iconStyle(option)">
-									{{ option.formatted_name ?? option.id }}
-								</span>
-							</slot>
-						</SearchFilterOption>
-					</template>
-					<button
-						v-if="filterType.display === 'expandable'"
-						class="flex bg-transparent text-secondary border-none cursor-pointer !w-full items-center gap-2 truncate rounded-xl px-2 py-1 text-sm font-semibold transition-all hover:text-contrast focus-visible:text-contrast active:scale-[0.98]"
-						@click="showMore = !showMore"
-					>
-						<DropdownIcon
-							class="h-4 w-4 transition-transform"
-							:class="{ 'rotate-180': showMore }"
-						/>
-						<span class="truncate text-sm">
-							{{ showMore ? formatMessage(messages.showFewer) : formatMessage(messages.showMore) }}
-						</span>
-					</button>
-				</div>
-			</ScrollablePanel>
+							<DropdownIcon
+								class="h-4 w-4 transition-transform"
+								:class="{ 'rotate-180': showMore }"
+							/>
+							<span class="truncate text-sm">
+								{{
+									showMore ? formatMessage(messages.showFewer) : formatMessage(messages.showMore)
+								}}
+							</span>
+						</button>
+					</div>
+				</ScrollablePanel>
+			</template>
 			<div :class="innerPanelClass ? innerPanelClass : ''" class="empty:hidden">
 				<Checkbox
 					v-for="group in filterType.toggle_groups"
@@ -191,6 +213,7 @@ import { defineMessages, useVIntl } from '../../composables/i18n'
 import type { FilterOption, FilterType, FilterValue } from '../../utils/search'
 import Accordion from '../base/Accordion.vue'
 import ButtonStyled from '../base/ButtonStyled.vue'
+import Toggle from '../base/Toggle.vue'
 import { Checkbox, ScrollablePanel, StyledInput } from '../index'
 import SearchFilterGroup from './SearchFilterGroup.vue'
 import SearchFilterOption from './SearchFilterOption.vue'
diff --git a/packages/ui/src/layouts/shared/browse-tab/providers/browse-manager.ts b/packages/ui/src/layouts/shared/browse-tab/providers/browse-manager.ts
index c609d75ada..9d3133c91b 100644
--- a/packages/ui/src/layouts/shared/browse-tab/providers/browse-manager.ts
+++ b/packages/ui/src/layouts/shared/browse-tab/providers/browse-manager.ts
@@ -73,6 +73,7 @@ export interface BrowseManagerContext {
 	showServerOnly?: ComputedRef<boolean>
 	serverOnlyLabel?: ComputedRef<string>
 	hiddenFilterTypes?: ComputedRef<string[]>
+	advancedFiltersCollapsed?: Ref<boolean>
 	onInstalled?: (projectId: string) => void
 
 	displayMode?: Ref<'list' | 'grid' | 'gallery'> | ComputedRef<'list' | 'grid' | 'gallery'>
diff --git a/packages/ui/src/layouts/shared/browse-tab/sidebar.vue b/packages/ui/src/layouts/shared/browse-tab/sidebar.vue
index a18fb7300c..29a78996ed 100644
--- a/packages/ui/src/layouts/shared/browse-tab/sidebar.vue
+++ b/packages/ui/src/layouts/shared/browse-tab/sidebar.vue
@@ -17,6 +17,14 @@ const isApp = computed(() => ctx.variant === 'app')
 const lockedMessages = computed(() => toValue(ctx.lockedFilterMessages))
 const hiddenFilterTypes = computed(() => ctx.hiddenFilterTypes?.value ?? [])
 
+const advancedFiltersCollapsed = computed(() => ctx.advancedFiltersCollapsed?.value ?? true)
+
+function setAdvancedFiltersCollapsed(collapsed: boolean) {
+	if (ctx.advancedFiltersCollapsed) {
+		ctx.advancedFiltersCollapsed.value = collapsed
+	}
+}
+
 function closeFiltersMenu() {
 	if (ctx.filtersMenuOpen) {
 		ctx.filtersMenuOpen.value = false
@@ -49,6 +57,9 @@ function hasProvidedFilter(filterId: string): boolean {
 }
 
 function getFilterOpenByDefault(filterId: string): boolean {
+	if (filterId === 'advanced') {
+		return !advancedFiltersCollapsed.value
+	}
 	if (hasProvidedFilter(filterId)) {
 		return true
 	}
@@ -188,6 +199,8 @@ function getFilterOpenByDefault(filterId: string): boolean {
 				:content-class="contentClass"
 				:inner-panel-class="innerPanelClass"
 				:open-by-default="getFilterOpenByDefault(filter.id)"
+				@on-open="() => filter.id === 'advanced' && setAdvancedFiltersCollapsed(false)"
+				@on-close="() => filter.id === 'advanced' && setAdvancedFiltersCollapsed(true)"
 			>
 				<template #header>
 					<h3 :class="isApp ? 'text-base m-0' : 'm-0 text-lg font-semibold'">
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index f7a3a0dd92..440fb5f958 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -221,6 +221,9 @@
   "button.open-folder": {
     "defaultMessage": "Open folder"
   },
+  "button.open-in-browser": {
+    "defaultMessage": "Open in browser"
+  },
   "button.open-in-folder": {
     "defaultMessage": "Open in folder"
   },
@@ -290,6 +293,9 @@
   "button.stop": {
     "defaultMessage": "Stop"
   },
+  "button.switch-to-version": {
+    "defaultMessage": "Switch to version"
+  },
   "button.switch-version": {
     "defaultMessage": "Switch version"
   },
@@ -912,7 +918,7 @@
     "defaultMessage": "No files match your search."
   },
   "external-files.permissions-card.add-files-modal.search-placeholder": {
-    "defaultMessage": "Search files…"
+    "defaultMessage": "Search files..."
   },
   "external-files.permissions-card.add-files-modal.selected-count": {
     "defaultMessage": "{count, plural, one {# file selected} other {# files selected}}"
@@ -3566,6 +3572,18 @@
   "search.filter.option.show_more": {
     "defaultMessage": "Show more"
   },
+  "search.filter_type.advanced": {
+    "defaultMessage": "Advanced"
+  },
+  "search.filter_type.advanced.exclude_datapack": {
+    "defaultMessage": "Exclude data packs"
+  },
+  "search.filter_type.advanced.exclude_mod": {
+    "defaultMessage": "Exclude mods"
+  },
+  "search.filter_type.advanced.exclude_plugin": {
+    "defaultMessage": "Exclude plugins"
+  },
   "search.filter_type.environment": {
     "defaultMessage": "Environment"
   },
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index 34692b20e6..143c798efa 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -207,6 +207,10 @@ export const commonMessages = defineMessages({
 		id: 'button.open-folder',
 		defaultMessage: 'Open folder',
 	},
+	openInBrowserButton: {
+		id: 'button.open-in-browser',
+		defaultMessage: 'Open in browser',
+	},
 	openInModrinthButton: {
 		id: 'button.open-in-modrinth',
 		defaultMessage: 'Open in Modrinth',
@@ -545,6 +549,10 @@ export const commonMessages = defineMessages({
 		id: 'button.copy-link',
 		defaultMessage: 'Copy link',
 	},
+	switchToVersionButton: {
+		id: 'button.switch-to-version',
+		defaultMessage: 'Switch to version',
+	},
 	switchVersionButton: {
 		id: 'button.switch-version',
 		defaultMessage: 'Switch version',
diff --git a/packages/ui/src/utils/search.ts b/packages/ui/src/utils/search.ts
index ea18519f96..5422a9b7fc 100644
--- a/packages/ui/src/utils/search.ts
+++ b/packages/ui/src/utils/search.ts
@@ -46,7 +46,7 @@ export type FilterType = {
 	ordering?: number
 } & (
 	| {
-			display: 'all' | 'scrollable' | 'none'
+			display: 'all' | 'scrollable' | 'none' | 'toggle'
 	  }
 	| {
 			display: 'expandable'
@@ -112,6 +112,12 @@ export interface SortType {
 
 const PLUGIN_PLATFORMS = ['bungeecord', 'waterfall', 'velocity', 'geyser']
 
+const PROJECT_TYPE_EXCLUSION_FILTERS: Partial<Record<ProjectType, ProjectType[]>> = {
+	mod: ['plugin', 'datapack'],
+	plugin: ['mod', 'datapack'],
+	datapack: ['mod', 'plugin'],
+}
+
 export function useSearch(
 	projectTypes: Ref<ProjectType[]>,
 	tags: Ref<Tags>,
@@ -143,6 +149,34 @@ export function useSearch(
 		return formatCategory(formatMessage, categoryName)
 	}
 
+	const formatExcludeProjectTypeLabel = (projectType: ProjectType): string => {
+		switch (projectType) {
+			case 'mod':
+				return formatMessage(
+					defineMessage({
+						id: 'search.filter_type.advanced.exclude_mod',
+						defaultMessage: 'Exclude mods',
+					}),
+				)
+			case 'plugin':
+				return formatMessage(
+					defineMessage({
+						id: 'search.filter_type.advanced.exclude_plugin',
+						defaultMessage: 'Exclude plugins',
+					}),
+				)
+			case 'datapack':
+				return formatMessage(
+					defineMessage({
+						id: 'search.filter_type.advanced.exclude_datapack',
+						defaultMessage: 'Exclude data packs',
+					}),
+				)
+			default:
+				return projectType
+		}
+	}
+
 	const filters = computed(() => {
 		const categoryFilters: Record<string, FilterType> = {}
 		for (const category of sortedCategories(tags.value, formatCategoryName, locale.value)) {
@@ -171,6 +205,15 @@ export function useSearch(
 			})
 		}
 
+		const excludeableProjectTypes: ProjectType[] = []
+		for (const projectType of projectTypes.value) {
+			for (const target of PROJECT_TYPE_EXCLUSION_FILTERS[projectType] ?? []) {
+				if (!excludeableProjectTypes.includes(target)) {
+					excludeableProjectTypes.push(target)
+				}
+			}
+		}
+
 		const filterTypes: FilterType[] = [
 			...Object.values(categoryFilters),
 			{
@@ -429,6 +472,26 @@ export function useSearch(
 				options: [],
 				allows_custom_options: 'and',
 			},
+			{
+				id: 'advanced',
+				formatted_name: formatMessage(
+					defineMessage({
+						id: 'search.filter_type.advanced',
+						defaultMessage: 'Advanced',
+					}),
+				),
+				supported_project_types: ['mod', 'plugin', 'datapack'],
+				display: 'toggle',
+				query_param: 'a',
+				searchable: false,
+				ordering: -1000,
+				options: excludeableProjectTypes.map((target) => ({
+					id: target,
+					formatted_name: formatExcludeProjectTypeLabel(target),
+					method: 'and',
+					value: `all_project_types:${mapProjectTypeToSearch(target)}`,
+				})),
+			},
 		]
 
 		return filterTypes
@@ -460,6 +523,9 @@ export function useSearch(
 				console.error(`Filter type ${filterValue.type} not found`)
 				continue
 			}
+			if (type.id === 'advanced') {
+				continue
+			}
 			let option = type?.options.find((option) => option.id === filterValue.option)
 			if (!option && type.allows_custom_options) {
 				option = {
@@ -550,6 +616,15 @@ export function useSearch(
 			parts.push(`project_types IN [${quoted}]`)
 		}
 
+		const excludedProjectTypes = filterValues
+			.filter((filterValue) => filterValue.type === 'advanced')
+			.map((filterValue) =>
+				formatSearchFilterValue(mapProjectTypeToSearch(filterValue.option as ProjectType)),
+			)
+		if (excludedProjectTypes.length > 0) {
+			parts.push(`all_project_types NOT IN [${excludedProjectTypes.join(', ')}]`)
+		}
+
 		return parts.join(' AND ')
 	})