diff --git a/apps/frontend/src/components/project-review/disclosures/view.vue b/apps/frontend/src/components/project-review/disclosures/view.vue
index bc185c38149..488a09d6a02 100644
--- a/apps/frontend/src/components/project-review/disclosures/view.vue
+++ b/apps/frontend/src/components/project-review/disclosures/view.vue
@@ -292,7 +292,7 @@ const sections = computed(() =>
 	@apply grid min-w-0 grid-cols-1 gap-1.5;
 }
 .disclosure-fields dt {
-	@apply text-sm font-semibold text-secondary;
+	@apply text-sm font-medium text-secondary;
 }
 .disclosure-fields dd {
 	@apply m-0 min-w-0 break-words leading-normal text-primary;
@@ -313,7 +313,7 @@ const sections = computed(() =>
 }
 @container disclosure-view (min-width: 32rem) {
 	.disclosure-fields {
-		@apply gap-2;
+		@apply gap-2.5;
 	}
 	.disclosure-fields > div {
 		@apply grid-cols-[142px_minmax(0,1fr)] gap-x-3;
diff --git a/apps/frontend/src/components/project-review/kdb-chip.vue b/apps/frontend/src/components/project-review/kdb-chip.vue
index 9ac0f4c1f9b..a601811cb3f 100644
--- a/apps/frontend/src/components/project-review/kdb-chip.vue
+++ b/apps/frontend/src/components/project-review/kdb-chip.vue
@@ -3,7 +3,12 @@
 		v-for="(shortcut, index) in shortcuts"
 		:key="index"
 		:aria-label="shortcut.label"
-		class="flex h-[18px] min-w-[18px] shrink-0 items-center justify-center rounded border border-solid border-surface-4 bg-surface-3 px-0.5 font-sans text-[10px] font-medium text-primary"
+		class="flex min-w-[18px] shrink-0 items-center justify-center rounded font-sans font-medium text-primary"
+		:class="{
+			'h-auto border-none bg-transparent !p-0 !text-sm shadow-none': tooltipContent,
+			'h-[18px] border border-solid border-surface-4 bg-surface-3 px-0.5 text-[10px]':
+				!tooltipContent,
+		}"
 		v-bind="$attrs"
 	>
 		{{ shortcut.text }}
@@ -17,7 +22,10 @@ import { computed, onMounted, ref } from 'vue'
 import { useModerationKeybinds, useModerationSettings } from '~/composables/moderation'
 
 defineOptions({ inheritAttrs: false })
-const props = defineProps<{ keybind: string }>()
+const props = defineProps<{
+	keybind: string
+	tooltipContent?: boolean
+}>()
 const keybinds = useModerationKeybinds()
 const settings = useModerationSettings()
 const isMac = ref(false)
@@ -25,7 +33,11 @@ onMounted(() => {
 	isMac.value = navigator.platform.toUpperCase().includes('MAC')
 })
 const shortcuts = computed(() => {
-	if (!settings.value.get(moderationSettings.General.ShowShortcutKeybindHints)) return []
+	if (
+		!props.tooltipContent &&
+		!settings.value.get(moderationSettings.General.ShowShortcutKeybindHints)
+	)
+		return []
 	const binding = [...keybinds.value].find(([id]) => id === props.keybind)?.[1]
 	return (
 		binding?.keybind.map((definition) => {
diff --git a/apps/frontend/src/components/project-review/project-info/project/icon.vue b/apps/frontend/src/components/project-review/project-info/project/icon.vue
index c99601f9c7c..cc888b188bc 100644
--- a/apps/frontend/src/components/project-review/project-info/project/icon.vue
+++ b/apps/frontend/src/components/project-review/project-info/project/icon.vue
@@ -1,5 +1,8 @@
 <template>
 	<Section heading="Icon" :target="{ kind: 'icon' }">
+		<template #heading-after>
+			<KbdChip keybind="review-toggle-icon" class="ml-1" />
+		</template>
 		<template #right>
 			<EditButton v-if="!editing" section="Icon" @click="startEditing" />
 		</template>
@@ -12,7 +15,7 @@
 				aria-label="View enlarged project icon"
 				@click="viewer?.show(0)"
 			>
-				<Avatar :src="project.raw_icon_url || iconUrl" :alt="project.name" size="5rem" no-shadow />
+				<Avatar :key="iconUrl" :src="iconUrl" :alt="project.name" size="5rem" no-shadow />
 			</button>
 			<Avatar v-else :alt="project.name" size="5rem" no-shadow />
 			<ImageViewerEditor
@@ -41,6 +44,7 @@ import { useModerationKeybinds } from '~/composables/moderation'
 import { injectProjectReviewPageContext } from '~/providers/project-review'
 
 import ImageViewerActions from '../../image-viewer-actions.vue'
+import KbdChip from '../../kdb-chip.vue'
 import { useReviewShortcut } from '../../shortcuts'
 import EditButton from '../edit/button.vue'
 import IconEdit from '../edit/icon.vue'
diff --git a/apps/frontend/src/components/project-review/project-info/project/license.vue b/apps/frontend/src/components/project-review/project-info/project/license.vue
index 1639b4de602..f2a33bf3078 100644
--- a/apps/frontend/src/components/project-review/project-info/project/license.vue
+++ b/apps/frontend/src/components/project-review/project-info/project/license.vue
@@ -22,7 +22,7 @@
 					}}
 				</span>
 				<TagItem
-					v-if="licenseRequiresSource(project.license.id)"
+					v-if="promptSourceRequired(project.license.id, project.project_types)"
 					v-tooltip="'License requires source code.'"
 					class="!border-orange !bg-surface-4 !px-1.5 !py-0.5 !text-orange"
 				>
@@ -48,7 +48,7 @@
 
 <script setup lang="ts">
 import { ExternalIcon, TagCategoryScrollTextIcon } from '@modrinth/assets'
-import { licenseRequiresSource } from '@modrinth/moderation'
+import { promptSourceRequired } from '@modrinth/moderation'
 import { TagItem } from '@modrinth/ui'
 import { computed, useTemplateRef } from 'vue'
 
diff --git a/apps/frontend/src/components/project-review/project-info/project/links.vue b/apps/frontend/src/components/project-review/project-info/project/links.vue
index 5a7cef447c0..b7b2fb97438 100644
--- a/apps/frontend/src/components/project-review/project-info/project/links.vue
+++ b/apps/frontend/src/components/project-review/project-info/project/links.vue
@@ -16,7 +16,11 @@
 					<h4 class="m-0 flex items-center gap-2 text-sm font-medium text-secondary">
 						{{ link.label }}
 						<TagItem
-							v-if="link.key === 'source' && project && licenseRequiresSource(project.license.id)"
+							v-if="
+								link.key === 'source' &&
+								project &&
+								promptSourceRequired(project.license.id, project.project_types)
+							"
 							v-tooltip="'License requires source code.'"
 							class="!border-orange !bg-surface-4 !px-1.5 !py-0.5 !text-orange"
 						>
@@ -86,7 +90,7 @@ import {
 	TriangleAlertIcon,
 	WikiIcon,
 } from '@modrinth/assets'
-import { licenseRequiresSource } from '@modrinth/moderation'
+import { promptSourceRequired } from '@modrinth/moderation'
 import { injectModrinthClient, TagItem } from '@modrinth/ui'
 import { useQuery } from '@tanstack/vue-query'
 import { computed, ref, useTemplateRef, watch } from 'vue'
diff --git a/apps/frontend/src/components/project-review/queue-bar.vue b/apps/frontend/src/components/project-review/queue-bar.vue
index 22214445788..c96ed079337 100644
--- a/apps/frontend/src/components/project-review/queue-bar.vue
+++ b/apps/frontend/src/components/project-review/queue-bar.vue
@@ -74,15 +74,20 @@
 							:flip="false"
 							theme="tooltip"
 							:distance="4"
+							panel-class="!p-0"
 						>
 							<span tabindex="0" class="cursor-default pb-1 pt-1.5 text-xs">
 								{{ column.label }}
 								<span class="ml-1 tabular-nums text-primary">{{ column.count }}</span>
 							</span>
 							<template #popper>
-								<div class="flex max-w-80 flex-col gap-2 py-1">
+								<div class="flex max-w-80 flex-col gap-2 p-2.5 pt-3.5">
 									<span class="font-semibold">{{ column.heading }}</span>
-									<QueueProjectList :project-ids="column.projects" :empty-message="column.empty" />
+									<QueueProjectList
+										v-model:search="queueSearches[column.label]"
+										:project-ids="column.projects"
+										:empty-message="column.empty"
+									/>
 								</div>
 							</template>
 						</FloatingMenu>
@@ -90,21 +95,47 @@
 				</div>
 			</div>
 			<div class="flex items-center gap-1">
-				<button type="button" class="queue-action" :disabled="busy" @click="exit">Exit</button>
+				<Tooltip :delay="750">
+					<template #popper>
+						<div class="flex items-center gap-2">
+							<KbdChip keybind="review-exit" tooltip-content />
+						</div>
+					</template>
+					<button type="button" class="queue-action" :disabled="busy" @click="exit">Exit</button>
+				</Tooltip>
 				<span class="mx-1.5 h-5 w-px bg-divider" aria-hidden="true" />
-				<button type="button" class="queue-action" :disabled="disabled || !canGoBack" @click="back">
-					<LeftArrowIcon class="mb-px" />
-					Back
-				</button>
-				<button
-					type="button"
-					class="queue-action"
-					:disabled="disabled || (!inQueue && !completed)"
-					@click="next"
-				>
-					{{ completed ? (remaining.length ? 'Next' : 'Finish') : 'Skip' }}
-					<RightArrowIcon class="mb-px" />
-				</button>
+				<Tooltip :delay="750">
+					<template #popper>
+						<div class="flex items-center gap-2">
+							<KbdChip keybind="review-back" tooltip-content />
+						</div>
+					</template>
+					<button
+						type="button"
+						class="queue-action"
+						:disabled="disabled || !canGoBack"
+						@click="back"
+					>
+						<LeftArrowIcon class="mb-px" />
+						Back
+					</button>
+				</Tooltip>
+				<Tooltip :delay="750">
+					<template #popper>
+						<div class="flex items-center gap-2">
+							<KbdChip keybind="skip-project" tooltip-content />
+						</div>
+					</template>
+					<button
+						type="button"
+						class="queue-action"
+						:disabled="disabled || (!inQueue && !completed)"
+						@click="next"
+					>
+						{{ completed ? (remaining.length ? 'Next' : 'Finish') : 'Skip' }}
+						<RightArrowIcon class="mb-px" />
+					</button>
+				</Tooltip>
 			</div>
 		</nav>
 	</footer>
@@ -150,7 +181,14 @@ import {
 	RotateCounterClockwiseIcon,
 	SettingsIcon,
 } from '@modrinth/assets'
-import { AutoLink, Button, FloatingMenu, TabbedModal, type TabbedModalTab } from '@modrinth/ui'
+import {
+	AutoLink,
+	Button,
+	FloatingMenu,
+	TabbedModal,
+	type TabbedModalTab,
+	Tooltip,
+} from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 import ModerationAppearance from '~/components/ui/moderation/settings/ModerationAppearance.vue'
@@ -158,6 +196,7 @@ import ModerationKeybinds from '~/components/ui/moderation/settings/ModerationKe
 import ModerationSettings from '~/components/ui/moderation/settings/ModerationSettings.vue'
 import { injectProjectReviewPageContext } from '~/providers/project-review'
 
+import KbdChip from './kdb-chip.vue'
 import { injectProjectReviewContext } from './layout/context'
 import QueueProjectList from './queue-project-list.vue'
 import { useReviewShortcut } from './shortcuts'
@@ -216,9 +255,13 @@ const {
 } = navigation
 
 const disabled = computed(() => busy.value || isLoading.value || !queue.hydrated)
+const queueSearches = ref<Record<string, string>>({
+	Complete: '',
+	Skipped: '',
+	Remaining: '',
+})
 const queueColumns = computed(() => {
 	const current = queue.currentQueue
-	const completedIds = new Set(current.completed)
 	const skippedIds = new Set(current.skipped)
 	return [
 		{
@@ -226,7 +269,7 @@ const queueColumns = computed(() => {
 			heading: 'Completed projects',
 			empty: 'No completed projects yet',
 			count: current.completed.length,
-			projects: current.projectOrder.filter((id) => completedIds.has(id)),
+			projects: [...current.completed].reverse(),
 		},
 		{
 			label: 'Skipped',
diff --git a/apps/frontend/src/components/project-review/queue-project-list.vue b/apps/frontend/src/components/project-review/queue-project-list.vue
index 720be5fc904..de4575a67b4 100644
--- a/apps/frontend/src/components/project-review/queue-project-list.vue
+++ b/apps/frontend/src/components/project-review/queue-project-list.vue
@@ -1,30 +1,30 @@
 <template>
-	<div class="flex w-72 max-w-[80vw] flex-col gap-2 py-1">
+	<div
+		class="flex max-h-[60dvh] w-72 max-w-[80vw] flex-col gap-2.5"
+		:class="{ 'h-[296px]': projectIds.length > 6 }"
+	>
 		<Input
 			v-if="projectIds.length > 6"
 			v-model="search"
+			class="shrink-0"
 			placeholder="Search..."
 			aria-label="Search"
 			size="small"
 		/>
-		<div
-			v-bind="containerProps"
-			class="max-h-[60dvh] overscroll-contain"
-			:style="{ height: `${Math.min(filteredIds.length, 8) * 32}px` }"
-		>
+		<div v-bind="containerProps" class="min-h-0 flex-1 overscroll-contain">
+			<span v-if="indexing" class="text-xs text-secondary">Searching projects…</span>
+			<span v-else-if="indexError && search.trim()" class="pt-1 text-xs text-secondary"
+				>Could not load project data</span
+			>
+			<span v-if="!filteredIds.length && !indexing" class="pt-1 text-secondary">{{
+				search.trim() ? 'No matching projects' : emptyMessage
+			}}</span>
 			<div v-bind="wrapperProps">
 				<div v-for="item in list" :key="item.data" class="flex h-8 items-center">
 					<QueueProjectPreview :project-id="item.data" />
 				</div>
 			</div>
 		</div>
-		<span v-if="indexing" class="text-xs text-secondary">Searching projects…</span>
-		<span v-else-if="indexError && search.trim()" class="text-xs text-secondary"
-			>Could not load project data</span
-		>
-		<span v-if="!filteredIds.length && !indexing" class="text-secondary">{{
-			search.trim() ? 'No matching projects' : emptyMessage
-		}}</span>
 	</div>
 </template>
 
@@ -32,7 +32,7 @@
 import { injectModrinthClient, Input } from '@modrinth/ui'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { refDebounced, useVirtualList } from '@vueuse/core'
-import { computed, onScopeDispose, ref, shallowRef, watch } from 'vue'
+import { computed, onScopeDispose, shallowRef, watch } from 'vue'
 
 import {
 	type QueueProjectPreview as ProjectPreview,
@@ -49,7 +49,7 @@ const props = defineProps<{
 const client = injectModrinthClient()
 const queryClient = useQueryClient()
 
-const search = ref('')
+const search = defineModel<string>('search', { default: '' })
 const debouncedSearch = refDebounced(search, 250)
 const projects = shallowRef(new Map<string, ProjectPreview>())
 
diff --git a/apps/frontend/src/components/project-review/review-outcome-buttons/index.vue b/apps/frontend/src/components/project-review/review-outcome-buttons/index.vue
index 9fa34144508..24db064e093 100644
--- a/apps/frontend/src/components/project-review/review-outcome-buttons/index.vue
+++ b/apps/frontend/src/components/project-review/review-outcome-buttons/index.vue
@@ -7,22 +7,27 @@
 		<span v-if="sendIssuesAsThreadMessage" class="w-full text-xs text-secondary">
 			Send issues as thread message
 		</span>
-		<Button
-			v-for="action in actions"
-			:key="action.status"
-			class="grow"
-			:type="action.type"
-			:color="action.color"
-			:disabled="!actionAvailable(action.status)"
-			@click="submitDecisionAndContinue(action.status)"
-		>
-			<SpinnerIcon
-				v-if="loadingAction === action.status || advancingAction === action.status"
-				class="animate-spin"
-				aria-hidden="true"
-			/>
-			{{ action.label }}
-		</Button>
+		<Tooltip v-for="action in actions" :key="action.status" :delay="750" class="grow">
+			<template #popper>
+				<div class="flex items-center gap-2">
+					<KbdChip :keybind="action.keybind" tooltip-content />
+				</div>
+			</template>
+			<Button
+				class="w-full"
+				:type="action.type"
+				:color="action.color"
+				:disabled="!actionAvailable(action.status)"
+				@click="submitDecisionAndContinue(action.status)"
+			>
+				<SpinnerIcon
+					v-if="loadingAction === action.status || advancingAction === action.status"
+					class="animate-spin"
+					aria-hidden="true"
+				/>
+				{{ action.label }}
+			</Button>
+		</Tooltip>
 		<TeleportOverflowMenu label="More options" :options="overflowActions" :circular="false">
 			<MoreHorizontalIcon aria-hidden="true" />
 			<template #send-to-review>
@@ -46,7 +51,7 @@ import {
 	SpinnerIcon,
 } from '@modrinth/assets'
 import { moderationSettings } from '@modrinth/moderation'
-import { Button, TeleportOverflowMenu } from '@modrinth/ui'
+import { Button, TeleportOverflowMenu, Tooltip } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 import { useModerationSettings } from '~/composables/moderation'
@@ -54,6 +59,7 @@ import { injectProjectReviewPageContext } from '~/providers/project-review'
 import { injectReviewMessages } from '~/providers/project-review/review-messages'
 import { injectReviewSubmission } from '~/providers/project-review/review-submission'
 
+import KbdChip from '../kdb-chip.vue'
 import { useReviewShortcut } from '../shortcuts'
 import ModerationLockedCard from './moderation-locked-card.vue'
 
@@ -79,18 +85,21 @@ const actions = computed(() => [
 			? project.value!.requested_status!
 			: ('approved' as const),
 		label: 'Approve',
+		keybind: 'approve-project',
 		type: 'colored' as const,
 		color: 'green' as const,
 	},
 	{
 		status: 'withheld' as const,
 		label: 'Withhold',
+		keybind: 'withhold-project',
 		type: 'outlined' as const,
 		color: 'orange' as const,
 	},
 	{
 		status: 'rejected' as const,
 		label: 'Reject',
+		keybind: 'reject-project',
 		type: 'outlined' as const,
 		color: 'red' as const,
 	},
diff --git a/apps/frontend/src/components/project-review/review-panel/controls/index.vue b/apps/frontend/src/components/project-review/review-panel/controls/index.vue
index 90139557e4d..c5ced96a069 100644
--- a/apps/frontend/src/components/project-review/review-panel/controls/index.vue
+++ b/apps/frontend/src/components/project-review/review-panel/controls/index.vue
@@ -8,7 +8,7 @@
 			<p v-if="section.label" class="m-0 font-semibold text-contrast">
 				{{ section.label }}
 			</p>
-			<div class="flex flex-wrap gap-2">
+			<div data-review-control-row class="flex flex-wrap gap-2">
 				<template
 					v-for="control in section.controls"
 					:key="`${control.type}:${control.issueId}:${control.type === 'toggle' ? (control.id ?? '') : control.key}`"
diff --git a/apps/frontend/src/components/project-review/review-panel/popover.vue b/apps/frontend/src/components/project-review/review-panel/popover.vue
index 0e3fe9269dc..6b8f235cff6 100644
--- a/apps/frontend/src/components/project-review/review-panel/popover.vue
+++ b/apps/frontend/src/components/project-review/review-panel/popover.vue
@@ -8,8 +8,12 @@
 			:aria-label="titleId ? undefined : label"
 			:data-review-panel="anchor.id"
 			tabindex="-1"
-			class="review-popover z-[100] box-border flex w-[28rem] max-w-[calc(100vw-1rem)] flex-col gap-2 overflow-y-auto rounded-xl border-solid p-2.5 pb-3 text-sm text-primary"
-			:style="[floatingStyles, appearanceStyle, { width: maxWidth }]"
+			class="review-popover z-[100] box-border flex w-max min-w-[min(280px,calc(100vw-1rem))] flex-col gap-2 overflow-y-auto rounded-xl border-solid p-2.5 pb-3 text-sm text-primary"
+			:style="[
+				floatingStyles,
+				appearanceStyle,
+				{ maxWidth: `min(${maxWidth ?? '28rem'}, calc(100vw - 1rem))` },
+			]"
 			@pointerenter="setPopoverHovered(anchor.id, true)"
 			@pointerleave="setPopoverHovered(anchor.id, false)"
 			@focusin="cancelClose"
@@ -17,7 +21,7 @@
 			@keydown="onKeydown"
 			@click="retainExternalLink(anchor.id, $event)"
 		>
-			<div class="flex items-center justify-between gap-3">
+			<div ref="header" class="flex items-center justify-between gap-3">
 				<slot name="title" />
 				<div class="flex shrink-0 items-center gap-1">
 					<IconButton
@@ -47,6 +51,7 @@
 import { autoUpdate, flip, offset, shift, size, useFloating } from '@floating-ui/vue'
 import { PinIcon, XIcon } from '@modrinth/assets'
 import { IconButton } from '@modrinth/ui'
+import { useEventListener, useMutationObserver } from '@vueuse/core'
 import { computed, nextTick, onBeforeUnmount, shallowRef, watch } from 'vue'
 
 import { useFloatingReviewPanelAppearance } from '~/composables/floating-review-panel-appearance'
@@ -74,11 +79,17 @@ const {
 	retainExternalLink,
 } = injectReviewContext()
 const element = shallowRef<HTMLElement | null>(null)
+const header = shallowRef<HTMLElement | null>(null)
 const reference = computed(() => props.anchor.element)
-const { floatingStyles, isPositioned } = useFloating(reference, element, {
+const viewport = computed(() => element.value?.ownerDocument.defaultView)
+let widthDirty = true
+const { floatingStyles, isPositioned, update } = useFloating(reference, element, {
 	placement: 'right-start',
 	strategy: 'fixed',
-	whileElementsMounted: autoUpdate,
+	whileElementsMounted: (reference, floating, update) => {
+		widthDirty = true
+		return autoUpdate(reference, floating, update)
+	},
 	middleware: [
 		offset(10),
 		flip({
@@ -92,10 +103,56 @@ const { floatingStyles, isPositioned } = useFloating(reference, element, {
 			padding: 8,
 			apply: ({ availableHeight, elements }) => {
 				elements.floating.style.maxHeight = `${Math.max(0, availableHeight)}px`
+				if (widthDirty) {
+					widthDirty = false
+					fitContentWidth(elements.floating)
+				}
 			},
 		}),
 	],
 })
+useMutationObserver(element, invalidateWidth, {
+	childList: true,
+	characterData: true,
+	subtree: true,
+})
+useEventListener(viewport, 'resize', invalidateWidth)
+useEventListener(() => viewport.value?.visualViewport, 'resize', invalidateWidth)
+watch([() => props.maxWidth, () => appearanceStyle.value.borderWidth], invalidateWidth, {
+	flush: 'post',
+})
+
+function invalidateWidth() {
+	if (widthDirty) return
+	widthDirty = true
+	update()
+}
+
+function fitContentWidth(popover: HTMLElement) {
+	popover.style.width = 'max-content'
+	const rows = popover.querySelectorAll<HTMLElement>('[data-review-control-row]')
+	const view = popover.ownerDocument.defaultView
+	if (!rows.length || !header.value || !view) return
+
+	const outerWidth = popover.getBoundingClientRect().width
+	const headerChildren = Array.from(header.value.children)
+	const headerGap = Number.parseFloat(view.getComputedStyle(header.value).columnGap) || 0
+	let width =
+		outerWidth -
+		header.value.getBoundingClientRect().width +
+		headerChildren.reduce((total, child) => total + child.getBoundingClientRect().width, 0) +
+		headerGap * Math.max(0, headerChildren.length - 1)
+
+	for (const row of rows) {
+		const bounds = row.getBoundingClientRect()
+		const right = Math.max(
+			bounds.left,
+			...Array.from(row.children, (child) => child.getBoundingClientRect().right),
+		)
+		width = Math.max(width, outerWidth - bounds.width + right - bounds.left)
+	}
+	popover.style.width = `${Math.ceil(width)}px`
+}
 
 function dismiss() {
 	if (active.value?.id === props.anchor.id) close()
diff --git a/apps/frontend/src/components/project-review/versions/version-card.vue b/apps/frontend/src/components/project-review/versions/version-card.vue
index 3642d50476f..19e3e48fe84 100644
--- a/apps/frontend/src/components/project-review/versions/version-card.vue
+++ b/apps/frontend/src/components/project-review/versions/version-card.vue
@@ -116,7 +116,7 @@
 			</div>
 			<Accordion
 				ref="detailsAccordion"
-				button-class="w-fit cursor-pointer border-0 bg-transparent py-2 text-left text-sm font-medium hover:[&>div]:brightness-125 [&>div>svg]:ml-0 [&>div>svg]:size-4"
+				button-class="w-fit cursor-pointer border-0 bg-transparent py-2 text-left text-sm font-medium hover:[&>div]:brightness-125 [&>div>svg]:ml-0 [&>div>svg]:size-4 [&>div>svg]:text-secondary"
 				:open-by-default="expanded"
 				overflow-visible
 				@on-open="!expanded && emit('toggle')"
@@ -127,11 +127,11 @@
 				</template>
 				<div
 					:id="`review-version-${version.id}`"
-					class="mb-3 grid min-w-0 grid-cols-1 items-start gap-5 @[40rem]/review-version:grid-cols-[minmax(0,2fr)_minmax(0,3fr)] @[48rem]/review-version:gap-8"
+					class="mb-3 grid min-w-0 grid-cols-1 items-start gap-5 text-sm @[40rem]/review-version:grid-cols-[minmax(0,2fr)_minmax(0,3fr)] @[48rem]/review-version:gap-8"
 				>
 					<section class="min-w-0">
 						<dl
-							class="m-0 mt-1 grid min-w-0 grid-cols-[minmax(0,max-content)_minmax(0,1fr)] items-baseline gap-x-4 gap-y-3"
+							class="m-0 mt-1 grid min-w-0 grid-cols-[minmax(0,max-content)_minmax(0,1fr)] items-baseline gap-x-9 gap-y-2.5"
 						>
 							<dt class="font-medium text-secondary">Version Number</dt>
 							<dd class="m-0 min-w-0 break-all">
diff --git a/apps/frontend/src/components/ui/moderation/settings/ModerationSettings.vue b/apps/frontend/src/components/ui/moderation/settings/ModerationSettings.vue
index 1e2d6f31fe1..865b4087bb1 100644
--- a/apps/frontend/src/components/ui/moderation/settings/ModerationSettings.vue
+++ b/apps/frontend/src/components/ui/moderation/settings/ModerationSettings.vue
@@ -93,6 +93,7 @@ const groups = [
 		title: messages.appearance,
 		settings: [
 			general.GalleryColumns,
+			general.SortDisclosuresByActiveFirst,
 			general.ExpandVersionDetailsByDefault,
 			general.ExpandVersionDependenciesByDefault,
 			general.ExpandVersionChangelogByDefault,
diff --git a/apps/frontend/src/components/ui/project-settings/disclosures/DisclosureCards.vue b/apps/frontend/src/components/ui/project-settings/disclosures/DisclosureCards.vue
index 8eb1b904db4..c7aa9de083a 100644
--- a/apps/frontend/src/components/ui/project-settings/disclosures/DisclosureCards.vue
+++ b/apps/frontend/src/components/ui/project-settings/disclosures/DisclosureCards.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
+import { moderationSettings } from '@modrinth/moderation'
 import { computed, ref } from 'vue'
 
 import DisclosureView from '~/components/project-review/disclosures/view.vue'
 import ReviewPanel from '~/components/project-review/review-panel/index.vue'
+import { useModerationSettings } from '~/composables/moderation'
 import { injectReviewPanels } from '~/providers/project-review/review-panels'
 
 import AdvertisingDisclosureCard from './AdvertisingDisclosureCard.vue'
@@ -33,6 +35,7 @@ const { current, disclosureUpdateProps, setDisclosureLockStatus, isDisclosureVis
 	props.editor
 provideDisclosureDraft(current)
 const panels = injectReviewPanels(null)
+const settings = useModerationSettings()
 const editingTypes = ref(new Set<DisclosureType>())
 
 function toggleEditing(type: DisclosureType) {
@@ -122,7 +125,8 @@ const cards = computed(() => {
 		},
 	] satisfies { type: DisclosureType; key: string; enabled: boolean }[]
 	const filtered = visible.filter(({ type }) => isDisclosureVisible(type))
-	return props.variant === 'review'
+	return props.variant === 'review' &&
+		settings.value.get(moderationSettings.General.SortDisclosuresByActiveFirst)
 		? filtered.sort((a, b) => Number(b.enabled) - Number(a.enabled))
 		: filtered
 })
diff --git a/apps/frontend/src/components/ui/project-settings/disclosures/ProjectReviewDisclosureCard.vue b/apps/frontend/src/components/ui/project-settings/disclosures/ProjectReviewDisclosureCard.vue
index 8b6c96820c9..e8fba9b7977 100644
--- a/apps/frontend/src/components/ui/project-settings/disclosures/ProjectReviewDisclosureCard.vue
+++ b/apps/frontend/src/components/ui/project-settings/disclosures/ProjectReviewDisclosureCard.vue
@@ -106,6 +106,6 @@ const isToggleLocked = computed(() => !!props.disabled || (!!props.toggleDisable
 <style scoped>
 .disclosure-details :deep(label.font-semibold.text-contrast),
 .disclosure-details :deep(p.font-semibold.text-contrast) {
-	@apply text-sm text-secondary;
+	@apply text-sm font-medium text-secondary;
 }
 </style>
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 8f2ef19e2f2..81b6f929b44 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -3855,7 +3855,7 @@
     "message": "Edit project"
   },
   "project.actions.open-in-modview": {
-    "message": "Open in modview"
+    "message": "Modview"
   },
   "project.actions.project-page": {
     "message": "Project page"
diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue
index 0a4e7e42a8d..5b37a07385d 100644
--- a/apps/frontend/src/pages/[type]/[project].vue
+++ b/apps/frontend/src/pages/[type]/[project].vue
@@ -868,7 +868,7 @@ const messages = defineMessages({
 	},
 	openInModview: {
 		id: 'project.actions.open-in-modview',
-		defaultMessage: 'Open in modview',
+		defaultMessage: 'Modview',
 	},
 	viewDependents: {
 		id: 'project.actions.view-dependents',
diff --git a/apps/frontend/src/providers/project-review/prefetch.ts b/apps/frontend/src/providers/project-review/prefetch.ts
index 2b3048fff43..afa15ce19b8 100644
--- a/apps/frontend/src/providers/project-review/prefetch.ts
+++ b/apps/frontend/src/providers/project-review/prefetch.ts
@@ -6,6 +6,13 @@ import { projectQueryOptions, warmProjectCheckCaches } from '~/composables/queri
 
 import { reviewQueryOptions } from './queries'
 
+async function prefetchIcon(url: string | null | undefined) {
+	if (!import.meta.client || !url) return
+	const image = new Image()
+	image.src = url
+	await image.decode()
+}
+
 export async function prefetchReviewProject(
 	id: string,
 	client: AbstractModrinthClient,
@@ -33,6 +40,7 @@ export async function prefetchReviewProject(
 			if (!isCurrent()) return
 			warmProjectCheckCaches(queryClient, project)
 			await Promise.allSettled([
+				prefetchIcon(project.raw_icon_url || project.icon_url),
 				project.thread_id
 					? queryClient.prefetchQuery(reviewQueryOptions.thread(project.thread_id, client))
 					: undefined,
diff --git a/packages/moderation/src/data/issues/component-builders/targets.ts b/packages/moderation/src/data/issues/component-builders/targets.ts
index d453ad394a6..6b3c4a12e6f 100644
--- a/packages/moderation/src/data/issues/component-builders/targets.ts
+++ b/packages/moderation/src/data/issues/component-builders/targets.ts
@@ -104,6 +104,13 @@ function textTarget(original: string, suggestion: string | null | undefined) {
 	return { original, ...(suggestion === undefined ? {} : { suggestion }) }
 }
 
+function optionalTextTarget(
+	original: string | null | undefined,
+	suggestion: string | null | undefined,
+) {
+	return { original: original ?? null, ...(suggestion === undefined ? {} : { suggestion }) }
+}
+
 export const issueTargets = {
 	markAddressed: (): IssueAction => () => ({ type: 'mark_addressed' }),
 	modifyTitle:
@@ -187,12 +194,70 @@ export const issueTargets = {
 				auto_resolve: autoResolve,
 			},
 		}),
+	modifyGalleryImage:
+		(
+			imageId: WithContext<number>,
+			fields: { name?: Suggestion; description?: Suggestion } = {},
+		): IssueAction =>
+		(ctx) => {
+			const id = typeof imageId === 'function' ? imageId(ctx) : imageId
+			const image = ctx.projectV3.gallery.find((image) => image.id === id)
+			if (!image) throw new Error(`Gallery image ${id} was not found`)
+			return {
+				type: 'modify_gallery_image',
+				value: {
+					image_id: id,
+					original_url: image.url,
+					...('name' in fields
+						? { name: optionalTextTarget(image.name, resolveSuggestion(fields.name, ctx)) }
+						: {}),
+					...('description' in fields
+						? {
+								description: optionalTextTarget(
+									image.description,
+									resolveSuggestion(fields.description, ctx),
+								),
+							}
+						: {}),
+				},
+			}
+		},
+	removeGalleryImages:
+		(imageIds: WithContext<number[]>): IssueAction =>
+		(ctx) => {
+			const ids = typeof imageIds === 'function' ? imageIds(ctx) : imageIds
+			return {
+				type: 'remove_gallery_images',
+				value: {
+					image_ids: ids,
+					original_images: ctx.projectV3.gallery.flatMap((image) =>
+						image.id !== undefined && ids.includes(image.id)
+							? [
+									{
+										id: image.id,
+										url: image.url,
+										...(image.name === undefined ? {} : { name: image.name }),
+									},
+								]
+							: [],
+					),
+				},
+			}
+		},
 	addDisclosures:
 		(disclosureTypes: Labrinth.Projects.v3.ProjectDisclosureType[]): IssueAction =>
 		() => ({
 			type: 'add_project_disclosures',
 			value: { disclosure_types: disclosureTypes },
 		}),
+	removeDisclosures:
+		(disclosureTypes: WithContext<Labrinth.Projects.v3.ProjectDisclosureType[]>): IssueAction =>
+		(ctx) => ({
+			type: 'remove_project_disclosures',
+			value: {
+				disclosure_types: typeof disclosureTypes === 'function' ? disclosureTypes(ctx) : disclosureTypes,
+			},
+		}),
 	modifyDisclosure:
 		(disclosureType: Labrinth.Projects.v3.ProjectDisclosureType): IssueAction =>
 		({ disclosures }) => {
@@ -218,6 +283,39 @@ export const issueTargets = {
 				value: { disclosure_type: disclosureType, metadata: { original } },
 			} as Labrinth.Threads.v3.ModifyDisclosureTarget
 		},
+	modifyDisclosureNote:
+		(
+			disclosureType: Labrinth.Projects.v3.ProjectDisclosureType,
+			suggestion?: Suggestion,
+		): IssueAction =>
+		(ctx) => {
+			const disclosure = ctx.disclosures.find(
+				(disclosure) => disclosure.type === disclosureType && !disclosure.deleted_at,
+			)
+			return {
+				type: 'modify_project_disclosure_note',
+				value: {
+					disclosure_type: disclosureType,
+					note: optionalTextTarget(
+						disclosure && 'note' in disclosure ? disclosure.note : null,
+						resolveSuggestion(suggestion, ctx),
+					),
+				},
+			}
+		},
+	modifyTeamMemberRole:
+		(member: WithContext<Labrinth.Projects.v3.TeamMember>, suggestion?: Suggestion): IssueAction =>
+		(ctx) => {
+			const resolved = typeof member === 'function' ? member(ctx) : member
+			return {
+				type: 'modify_team_member_role',
+				value: {
+					team_id: resolved.team_id,
+					user_id: resolved.user.id,
+					role: textTarget(resolved.role, resolveSuggestion(suggestion, ctx)),
+				},
+			}
+		},
 	modifyServerLanguages:
 		(suggestion?: WithContext<string[] | null | undefined>): IssueAction =>
 		(ctx) => {
@@ -230,6 +328,18 @@ export const issueTargets = {
 				},
 			}
 		},
+	modifyServerAddress:
+		(platform: 'minecraft_java' | 'minecraft_bedrock', suggestion?: Suggestion): IssueAction =>
+		(ctx) => ({
+			type: 'modify_server_address',
+			value: {
+				platform,
+				address: textTarget(
+					ctx.projectV3[`${platform}_server`]?.address ?? '',
+					resolveSuggestion(suggestion, ctx),
+				),
+			},
+		}),
 	acknowledge:
 		(mode: 'checkbox' | 'reply'): IssueAction =>
 		() => ({
diff --git a/packages/moderation/src/data/issues/disclosures.ts b/packages/moderation/src/data/issues/disclosures.ts
index b745ca4d4a5..0a6e894dd54 100644
--- a/packages/moderation/src/data/issues/disclosures.ts
+++ b/packages/moderation/src/data/issues/disclosures.ts
@@ -1,7 +1,7 @@
 import type { Labrinth } from '@modrinth/api-client'
 import { TriangleAlertIcon } from '@modrinth/assets'
 
-import { anyDisclosureHasText } from '../../utils'
+import { disclosureExists, disclosureHasText } from '../../utils'
 import disclosuresHeaderMessage from '../messages/checklist/messages/disclosures/header.md'
 import disclosuresHeaderListlessMessage from '../messages/checklist/messages/disclosures/header-listless.md'
 import missingAdsMessage from '../messages/checklist/messages/disclosures/missing-disclosures/ads.md'
@@ -21,38 +21,108 @@ import missingTelemetryMessage from '../messages/checklist/messages/disclosures/
 import missingTelemetryAlwaysMessage from '../messages/checklist/messages/disclosures/missing-disclosures/telemetry/consent-model/always.md'
 import missingTelemetryOptInMessage from '../messages/checklist/messages/disclosures/missing-disclosures/telemetry/consent-model/opt-in.md'
 import missingTelemetryOptOutMessage from '../messages/checklist/messages/disclosures/missing-disclosures/telemetry/consent-model/opt-out.md'
-import misusedAdsMessage from '../messages/checklist/messages/disclosures/misused-disclosures/ads.md'
-import misusedAiMessage from '../messages/checklist/messages/disclosures/misused-disclosures/ai/ai.md'
-import misusedAiFunctionalityMessage from '../messages/checklist/messages/disclosures/misused-disclosures/ai/ai-functionality.md'
-import misusedAiAssetsMessage from '../messages/checklist/messages/disclosures/misused-disclosures/ai/ai-usages/assets.md'
-import misusedAiCodeMessage from '../messages/checklist/messages/disclosures/misused-disclosures/ai/ai-usages/code.md'
-import misusedAiTextMessage from '../messages/checklist/messages/disclosures/misused-disclosures/ai/ai-usages/text.md'
-import misusedAiListIntroMessage from '../messages/checklist/messages/disclosures/misused-disclosures/ai/list-intro.md'
-import misusedArchiveMessage from '../messages/checklist/messages/disclosures/misused-disclosures/archive.md'
-import misusedDerivativeContentMessage from '../messages/checklist/messages/disclosures/misused-disclosures/derivative-content.md'
+import listItemAdsMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/ads.md'
+import listItemAiMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/ai/ai.md'
+import listItemAiFunctionalityMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-functionality.md'
+import listItemAiAssetsMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-usages/assets.md'
+import listItemAiCodeMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-usages/code.md'
+import listItemAiTextMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-usages/text.md'
+import listItemAiListIntroMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/ai/list-intro.md'
+import listItemArchiveMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/archive.md'
+import listItemDerivativeContentMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/derivative-content.md'
 import misusedListIntroMessage from '../messages/checklist/messages/disclosures/misused-disclosures/list-intro.md'
-import misusedPaidFeaturesMessage from '../messages/checklist/messages/disclosures/misused-disclosures/paid-features.md'
-import misusedPhotosensitivityMessage from '../messages/checklist/messages/disclosures/misused-disclosures/photosensitivity.md'
-import misusedSystemInteractionsMessage from '../messages/checklist/messages/disclosures/misused-disclosures/system-interactions.md'
-import misusedTelemetryMessage from '../messages/checklist/messages/disclosures/misused-disclosures/telemetry.md'
-import nonEnglishMessage from '../messages/checklist/messages/disclosures/non-english.md'
+import listItemPaidFeaturesMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/paid-features.md'
+import listItemPhotosensitivityMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/photosensitivity.md'
+import listItemSystemInteractionsMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/system-interactions.md'
+import listItemTelemetryMessage from '../messages/checklist/messages/disclosures/disclosure-list-items/telemetry.md'
+import nonEnglishListIntroMessage from '../messages/checklist/messages/disclosures/non-english-disclosures/list-intro.md'
+import formattingListIntroMessage from '../messages/checklist/messages/disclosures/formatting-disclosures/list-intro.md'
 import { issue, panel, section, toggle } from './component-builders/builders'
 import { issueLocation } from './component-builders/locations'
 import { issueTargets } from './component-builders/targets'
+import type { IssueAction } from './component-builders/types'
 
 const DISCLOSURES_MAX_WIDTH = '400px'
 
+type DisclosureType = (typeof disclosureTypes)[keyof typeof disclosureTypes]
+type DisclosureTypeOption = (typeof disclosureOptions)[keyof typeof disclosureOptions]
+type DisclosureIssueType = (typeof disclosureIssueTypes)[keyof typeof disclosureIssueTypes]
+
+const disclosureIssueTypes = {
+	missing: { type: 'missing', label: 'Missing' },
+	misused: { type: 'misused', label: 'Misused' },
+	nonEnglish: { type: 'non_english', label: 'Non-English' },
+	formatting: { type: 'formatting', label: 'Formatting' },
+}
+
+const disclosureOptions = {
+	aiAssets: { type: 'assets', label: 'AI Assets' },
+	aiCode: { type: 'code', label: 'AI Code' },
+	aiText: { type: 'text', label: 'AI Text' },
+	consentIn: { type: 'opt_in', label: 'Telemetry: Opt-in' },
+	consentOut: { type: 'opt_out', label: 'Telemetry: Opt-out' },
+	consentAlways: { type: 'always', label: 'Telemetry: Always' },
+}
+
 const disclosureTypes = {
-	ai: 'ai_content',
-	'ai-functionality': 'ai_functionality',
-	ads: 'advertisements',
-	'paid-features': 'paid_features',
-	telemetry: 'telemetry',
-	'derivative-content': 'derivative_work',
-	photosensitivity: 'epilepsy_triggers',
-	'system-interactions': 'system_interactions',
-	archive: 'archived',
-} satisfies Record<string, Labrinth.Projects.v3.ProjectDisclosureType>
+	aic: {
+		type: 'ai_content',
+		label: 'AI Content',
+		options: [disclosureOptions.aiAssets, disclosureOptions.aiCode, disclosureOptions.aiText],
+	},
+	aif: {
+		type: 'ai_functionality',
+		label: 'AI Functionality',
+	},
+	ads: {
+		type: 'advertisements',
+		label: 'Advertisements',
+	},
+	paid: {
+		type: 'paid_features',
+		label: 'Paid Features',
+	},
+	telemetry: {
+		type: 'telemetry',
+		label: 'Telemetry',
+		options: [
+			disclosureOptions.consentIn,
+			disclosureOptions.consentOut,
+			disclosureOptions.consentAlways,
+		],
+	},
+	derivative: {
+		type: 'derivative_work',
+		label: 'Derivative Content',
+	},
+	photosensitivity: {
+		type: 'epilepsy_triggers',
+		label: 'Photosensitivity',
+	},
+	system: {
+		type: 'system_interactions',
+		label: 'System Interactions',
+	},
+	archive: {
+		type: 'archived',
+		label: 'Archive',
+	},
+} satisfies Record<
+	string,
+	{
+		type: Labrinth.Projects.v3.ProjectDisclosureType
+		label: string
+		options?: DisclosureTypeOption[]
+	}
+>
+
+function getDisclosureToggleID(disclosureType: string, issueType: string, option?: string) {
+	return disclosureType === 'any'
+		? `disclosures-${issueType}`
+		: option
+			? `${disclosureType}-disclosure-${issueType}-${option}`
+			: `${disclosureType}-disclosure-${issueType}`
+}
 
 export const disclosuresIssue = issue({
 	id: 'disclosures',
@@ -60,136 +130,195 @@ export const disclosuresIssue = issue({
 	title: 'Invalid disclosures',
 	category: 'Disclosures',
 	actions: ({ selected }) => {
-		const missingTypes = Object.entries(disclosureTypes).flatMap(([field, type]) =>
-			selected.toggleIds.includes(`${field}-disclosure-missing`) ? [type] : [],
-		)
-		return [
-			...(missingTypes.length ? [issueTargets.addDisclosures(missingTypes)] : []),
-			...Object.entries(disclosureTypes).flatMap(([field, type]) =>
-				selected.toggleIds.includes(`${field}-disclosure-misused`)
-					? [issueTargets.modifyDisclosure(type)]
-					: [],
-			),
-		]
+		const actions: IssueAction[] = []
+
+		const toggleIds = new Set(selected.toggleIds)
+
+		for (const disclosureType of Object.values(disclosureTypes)) {
+			for (const issueType of Object.values(disclosureIssueTypes)) {
+				const toggleId = getDisclosureToggleID(disclosureType.type, issueType.type)
+
+				if (!toggleIds.has(toggleId)) continue
+
+				switch (issueType.type) {
+					case disclosureIssueTypes.missing.type:
+						actions.push(issueTargets.addDisclosures([disclosureType.type]))
+						break
+					case disclosureIssueTypes.misused.type:
+						actions.push(issueTargets.modifyDisclosure(disclosureType.type))
+						break
+					default:
+						actions.push(issueTargets.markAddressed())
+						break
+				}
+			}
+		}
+
+		return actions
 	},
+
 	message: ({ selected }) => {
 		const toggleIds = new Set(selected.toggleIds)
 		const missingParts: string[] = []
 		const misusedParts: string[] = []
+		const nonEnglishParts: string[] = []
+		const formattingParts: string[] = []
 
-		for (const field of [
-			'ai',
-			'ai-functionality',
-			'ads',
-			'paid-features',
-			'telemetry',
-			'derivative-content',
-			'photosensitivity',
-			'system-interactions',
-			'archive',
-		] as const) {
-			const missingSelected = toggleIds.has(`${field}-disclosure-missing`)
-			const misusedSelected = toggleIds.has(`${field}-disclosure-misused`)
-			if (!missingSelected && !misusedSelected) continue
-
-			let missingMessage: string
-			let misusedMessage: string
-			switch (field) {
-				case 'ai':
-					missingMessage = missingAiMessage
-					misusedMessage = misusedAiMessage
-					break
-				case 'ai-functionality':
-					missingMessage = missingAiFunctionalityMessage
-					misusedMessage = misusedAiFunctionalityMessage
-					break
-				case 'ads':
-					missingMessage = missingAdsMessage
-					misusedMessage = misusedAdsMessage
-					break
-				case 'paid-features':
-					missingMessage = missingPaidFeaturesMessage
-					misusedMessage = misusedPaidFeaturesMessage
-					break
-				case 'telemetry':
-					missingMessage = missingTelemetryMessage
-					misusedMessage = misusedTelemetryMessage
-					break
-				case 'derivative-content':
-					missingMessage = missingDerivativeContentMessage
-					misusedMessage = misusedDerivativeContentMessage
-					break
-				case 'photosensitivity':
-					missingMessage = missingPhotosensitivityMessage
-					misusedMessage = misusedPhotosensitivityMessage
-					break
-				case 'system-interactions':
-					missingMessage = missingSystemInteractionsMessage
-					misusedMessage = misusedSystemInteractionsMessage
-					break
-				case 'archive':
-					missingMessage = missingArchiveMessage
-					misusedMessage = misusedArchiveMessage
-					break
-				default:
-					continue
-			}
+		for (const disclosureType of Object.values(disclosureTypes) as DisclosureType[]) {
+			for (const issueType of Object.values(disclosureIssueTypes) as DisclosureIssueType[]) {
+				const toggleId = getDisclosureToggleID(disclosureType.type, issueType.type)
 
-			if (missingSelected) {
-				missingParts.push(missingMessage)
-				if (field === 'ai') {
-					const usages: string[] = []
-					if (toggleIds.has('ai-disclosure-missing-code')) usages.push(missingAiCodeMessage)
-					if (toggleIds.has('ai-disclosure-missing-assets')) usages.push(missingAiAssetsMessage)
-					if (toggleIds.has('ai-disclosure-missing-text')) usages.push(missingAiTextMessage)
-					if (usages.length) missingParts.push(missingAiListIntroMessage, ...usages)
-				}
-				if (field === 'telemetry') {
-					if (toggleIds.has('telemetry-disclosure-missing-opt-in')) {
-						missingParts.push(missingTelemetryOptInMessage)
+				if (!toggleIds.has(toggleId)) continue
+
+				let message: string
+
+				if (issueType.type === disclosureIssueTypes.missing.type) {
+					switch (disclosureType) {
+						case disclosureTypes.aic:
+							message = missingAiMessage
+							break
+						case disclosureTypes.aif:
+							message = missingAiFunctionalityMessage
+							break
+						case disclosureTypes.ads:
+							message = missingAdsMessage
+							break
+						case disclosureTypes.paid:
+							message = missingPaidFeaturesMessage
+							break
+						case disclosureTypes.telemetry:
+							message = missingTelemetryMessage
+							break
+						case disclosureTypes.derivative:
+							message = missingDerivativeContentMessage
+							break
+						case disclosureTypes.photosensitivity:
+							message = missingPhotosensitivityMessage
+							break
+						case disclosureTypes.system:
+							message = missingSystemInteractionsMessage
+							break
+						case disclosureTypes.archive:
+							message = missingArchiveMessage
+							break
+						default:
+							continue
 					}
-					if (toggleIds.has('telemetry-disclosure-missing-opt-out')) {
-						missingParts.push(missingTelemetryOptOutMessage)
+
+					missingParts.push(message)
+
+					if (disclosureType === disclosureTypes.aic) {
+						const usages: string[] = []
+						if (toggleIds.has('ai_content-disclosure-missing-code'))
+							usages.push(missingAiCodeMessage)
+						if (toggleIds.has('ai_content-disclosure-missing-assets'))
+							usages.push(missingAiAssetsMessage)
+						if (toggleIds.has('ai_content-disclosure-missing-text'))
+							usages.push(missingAiTextMessage)
+						if (usages.length) missingParts.push(missingAiListIntroMessage, ...usages)
 					}
-					if (toggleIds.has('telemetry-disclosure-missing-always')) {
-						missingParts.push(missingTelemetryAlwaysMessage)
+
+					if (disclosureType === disclosureTypes.telemetry) {
+						if (toggleIds.has('telemetry-disclosure-missing-opt-in')) {
+							missingParts.push(missingTelemetryOptInMessage)
+						}
+						if (toggleIds.has('telemetry-disclosure-missing-opt-out')) {
+							missingParts.push(missingTelemetryOptOutMessage)
+						}
+						if (toggleIds.has('telemetry-disclosure-missing-always')) {
+							missingParts.push(missingTelemetryAlwaysMessage)
+						}
 					}
-				}
-			}
+				} else {
+					switch (disclosureType) {
+						case disclosureTypes.aic:
+							message = listItemAiMessage
+							break
+						case disclosureTypes.aif:
+							message = listItemAiFunctionalityMessage
+							break
+						case disclosureTypes.ads:
+							message = listItemAdsMessage
+							break
+						case disclosureTypes.paid:
+							message = listItemPaidFeaturesMessage
+							break
+						case disclosureTypes.telemetry:
+							message = listItemTelemetryMessage
+							break
+						case disclosureTypes.derivative:
+							message = listItemDerivativeContentMessage
+							break
+						case disclosureTypes.photosensitivity:
+							message = listItemPhotosensitivityMessage
+							break
+						case disclosureTypes.system:
+							message = listItemSystemInteractionsMessage
+							break
+						case disclosureTypes.archive:
+							message = listItemArchiveMessage
+							break
+						default:
+							continue
+					}
+
+					switch (issueType) {
+						case disclosureIssueTypes.misused:
+							misusedParts.push(message)
+
+							if (disclosureType === disclosureTypes.aic) {
+								const usages: string[] = []
+								if (toggleIds.has('ai-disclosure-misused-code')) usages.push(listItemAiCodeMessage)
+								if (toggleIds.has('ai-disclosure-misused-assets'))
+									usages.push(listItemAiAssetsMessage)
+								if (toggleIds.has('ai-disclosure-misused-text')) usages.push(listItemAiTextMessage)
+								if (usages.length) misusedParts.push(listItemAiListIntroMessage, ...usages)
+							}
+							break
+
+						case disclosureIssueTypes.nonEnglish:
+							nonEnglishParts.push(message)
+							break
 
-			if (misusedSelected) {
-				misusedParts.push(misusedMessage)
-				if (field === 'ai') {
-					const usages: string[] = []
-					if (toggleIds.has('ai-disclosure-misused-code')) usages.push(misusedAiCodeMessage)
-					if (toggleIds.has('ai-disclosure-misused-assets')) usages.push(misusedAiAssetsMessage)
-					if (toggleIds.has('ai-disclosure-misused-text')) usages.push(misusedAiTextMessage)
-					if (usages.length) misusedParts.push(misusedAiListIntroMessage, ...usages)
+						case disclosureIssueTypes.formatting:
+							formattingParts.push(message)
+							break
+					}
 				}
 			}
 		}
 
 		const groups: string[] = []
-		if (
-			!missingParts.length &&
-			!misusedParts.length &&
-			(selected.toggleIds.includes('disclosures-missing') ||
-				selected.toggleIds.includes('disclosures-misused') ||
-				selected.toggleIds.length === 0)
-		) {
+
+		if (selected.toggleIds.includes('disclosures-issues')) {
 			return disclosuresHeaderListlessMessage
 		}
+
 		if (missingParts.length) {
 			const body = missingParts.map((part) => part.trimEnd()).join('\n')
 			groups.push(`${missingListIntroMessage.trim()}\n\n${body}`)
 		}
+
 		if (misusedParts.length) {
 			const body = misusedParts.map((part) => part.trimEnd()).join('\n')
 			groups.push(`${misusedListIntroMessage.trim()}\n\n${body}`)
 		}
+
+		if (nonEnglishParts.length) {
+			const body = nonEnglishParts.map((part) => part.trimEnd()).join('\n')
+			groups.push(`${nonEnglishListIntroMessage.trim()}\n\n${body}`)
+		}
+
+		if (formattingParts.length) {
+			const body = formattingParts.map((part) => part.trimEnd()).join('\n')
+			groups.push(`${formattingListIntroMessage.trim()}\n\n${body}`)
+		}
+
 		return groups.length ? [disclosuresHeaderMessage.trim(), ...groups].join('\n\n') : ''
 	},
+
 	suggestedStatus: ({ selected }) => {
+		// TODO: account for new types etc etc
 		const toggleIds = new Set(selected.toggleIds)
 		const rejected = ['telemetry', 'derivative-content', 'photosensitivity', 'system-interactions']
 		if (
@@ -211,128 +340,124 @@ export const disclosuresIssue = issue({
 	},
 })
 
-export const disclosuresNonEnglishIssue = issue({
-	id: 'disclosures-non-english',
-	locations: [issueLocation('disclosures')],
-	title: 'Non-English disclosure information',
-	category: 'Disclosures',
-	message: nonEnglishMessage,
-	suggestedStatus: 'flagged',
-})
-
-export const aiDisclosureReviewPanel = panel({
-	title: 'AI Usage',
-	hint: 'Has this project accurately disclosed this content?',
+export const disclosuresReviewPanel = panel({
+	title: 'Disclosures',
+	hint: 'Does this project provide accurate disclosure information?',
 	icon: TriangleAlertIcon,
 	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
-	maxWidth: DISCLOSURES_MAX_WIDTH,
 }).content(
 	toggle({
 		issue: disclosuresIssue,
-		id: 'ai-disclosure-missing',
-		label: 'Missing',
-		issueCardDisplay: {
-			label: 'AI Usage',
-			group: 'Missing',
-		},
+		id: 'disclosures-issues',
+		label: 'Incorrect',
+		disabled: ({ selected }) => selected.toggleIds.some((id) => id.includes('-disclosure-')),
 	}),
-	toggle({
+)
+
+function disclosureIssueToggle(
+	disclosureType: DisclosureType,
+	issueType: DisclosureIssueType,
+	option?: DisclosureTypeOption,
+) {
+	const toggleLabel = option ? `${issueType.label}: ${option.label}` : issueType.label
+	const groupLabel = option ? `${disclosureType.label}: ${option.label}` : disclosureType.label
+
+	return toggle({
 		issue: disclosuresIssue,
-		id: 'ai-disclosure-misused',
-		shown: ({ disclosures }) =>
-			disclosures.some((disclosure) => disclosure.type === 'ai_content' && !disclosure.deleted_at),
-		label: 'Misused',
+		id: getDisclosureToggleID(disclosureType.type, issueType.type, option?.type),
+		label: toggleLabel,
 		issueCardDisplay: {
-			label: 'AI Usage',
-			group: 'Misused',
+			label: groupLabel,
+			group: issueType.label,
 		},
-	}),
+		unselectToggles: ['disclosures-issues'],
+		shown: ({ disclosures }) => {
+			if (!option) {
+				if (issueType === disclosureIssueTypes.missing) {
+					return !disclosureExists(disclosures, disclosureType.type)
+				} else if (issueType === disclosureIssueTypes.misused) {
+					return disclosureExists(disclosures, disclosureType.type)
+				} else if (
+					issueType === disclosureIssueTypes.nonEnglish ||
+					issueType === disclosureIssueTypes.formatting
+				) {
+					const disclosure = disclosures.find(
+						(disclosure) => disclosure.type === disclosureType.type,
+					)
+					return disclosure ? disclosureHasText(disclosure) : false
+				}
+			} else if (disclosureType === disclosureTypes.aic) {
+				if (issueType === disclosureIssueTypes.missing) {
+					// TODO: make these only show if the specific use is correct
+					return true
+				} else if (issueType === disclosureIssueTypes.misused) {
+					return true
+				}
+			} else if (disclosureType === disclosureTypes.telemetry) {
+				return true
+			}
+
+			return true
+		},
+	})
+}
+
+export const aiDisclosureReviewPanel = panel({
+	title: 'AI Usage',
+	hint: 'Has this project accurately disclosed this content?',
+	icon: TriangleAlertIcon,
+	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
+	maxWidth: DISCLOSURES_MAX_WIDTH,
+}).content(
+	disclosureIssueToggle(disclosureTypes.aic, disclosureIssueTypes.missing),
+	disclosureIssueToggle(disclosureTypes.aic, disclosureIssueTypes.misused),
+	disclosureIssueToggle(disclosureTypes.aic, disclosureIssueTypes.nonEnglish),
+	disclosureIssueToggle(disclosureTypes.aic, disclosureIssueTypes.formatting),
 	section({
 		label: 'Type of missing disclosure?',
-		shown: ({ selected }) => selected.toggleIds.includes('ai-disclosure-missing'),
+		shown: ({ selected }) =>
+			selected.toggleIds.includes(
+				getDisclosureToggleID(disclosureTypes.aic.type, disclosureIssueTypes.missing.type),
+			),
 	}).content(
-		toggle({
-			issue: disclosuresIssue,
-			id: 'ai-disclosure-missing-code',
-			label: 'Code',
-			issueCardDisplay: {
-				label: 'AI Usage: Code',
-				group: 'Missing',
-			},
-		}),
-		toggle({
-			issue: disclosuresIssue,
-			id: 'ai-disclosure-missing-assets',
-			label: 'Assets',
-			issueCardDisplay: {
-				label: 'AI Usage: Assets',
-				group: 'Missing',
-			},
-		}),
-		toggle({
-			issue: disclosuresIssue,
-			id: 'ai-disclosure-missing-text',
-			label: 'Text',
-			issueCardDisplay: {
-				label: 'AI Usage: Text',
-				group: 'Missing',
-			},
-		}),
+		disclosureIssueToggle(
+			disclosureTypes.aic,
+			disclosureIssueTypes.missing,
+			disclosureOptions.aiCode,
+		),
+		disclosureIssueToggle(
+			disclosureTypes.aic,
+			disclosureIssueTypes.missing,
+			disclosureOptions.aiAssets,
+		),
+		disclosureIssueToggle(
+			disclosureTypes.aic,
+			disclosureIssueTypes.missing,
+			disclosureOptions.aiText,
+		),
 	),
 	section({
 		label: 'Type of misused disclosure?',
-		shown: ({ disclosures, selected }) =>
-			selected.toggleIds.includes('ai-disclosure-misused') &&
-			disclosures.some((disclosure) => disclosure.type === 'ai_content' && !disclosure.deleted_at),
+		shown: ({ selected }) =>
+			selected.toggleIds.includes(
+				getDisclosureToggleID(disclosureTypes.aic.type, disclosureIssueTypes.misused.type),
+			),
 	}).content(
-		toggle({
-			issue: disclosuresIssue,
-			id: 'ai-disclosure-misused-code',
-			shown: ({ disclosures }) =>
-				disclosures.some(
-					(disclosure) =>
-						disclosure.type === 'ai_content' &&
-						!disclosure.deleted_at &&
-						disclosure.uses.includes('code'),
-				),
-			label: 'Code',
-			issueCardDisplay: {
-				label: 'AI Usage: Code',
-				group: 'Misused',
-			},
-		}),
-		toggle({
-			issue: disclosuresIssue,
-			id: 'ai-disclosure-misused-assets',
-			shown: ({ disclosures }) =>
-				disclosures.some(
-					(disclosure) =>
-						disclosure.type === 'ai_content' &&
-						!disclosure.deleted_at &&
-						disclosure.uses.includes('assets'),
-				),
-			label: 'Assets',
-			issueCardDisplay: {
-				label: 'AI Usage: Assets',
-				group: 'Misused',
-			},
-		}),
-		toggle({
-			issue: disclosuresIssue,
-			id: 'ai-disclosure-misused-text',
-			shown: ({ disclosures }) =>
-				disclosures.some(
-					(disclosure) =>
-						disclosure.type === 'ai_content' &&
-						!disclosure.deleted_at &&
-						disclosure.uses.includes('text'),
-				),
-			label: 'Text',
-			issueCardDisplay: {
-				label: 'AI Usage: Text',
-				group: 'Misused',
-			},
-		}),
+		disclosureIssueToggle(
+			disclosureTypes.aic,
+			disclosureIssueTypes.misused,
+			disclosureOptions.aiCode,
+		),
+		disclosureIssueToggle(
+			disclosureTypes.aic,
+			disclosureIssueTypes.misused,
+			disclosureOptions.aiAssets,
+		),
+		disclosureIssueToggle(
+			disclosureTypes.aic,
+			disclosureIssueTypes.misused,
+			disclosureOptions.aiText,
+		),
 	),
 )
 
@@ -343,28 +468,10 @@ export const aiFunctionalityDisclosureReviewPanel = panel({
 	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
 	maxWidth: DISCLOSURES_MAX_WIDTH,
 }).content(
-	toggle({
-		issue: disclosuresIssue,
-		id: 'ai-functionality-disclosure-missing',
-		label: 'Missing',
-		issueCardDisplay: {
-			label: 'AI Functionality',
-			group: 'Missing',
-		},
-	}),
-	toggle({
-		issue: disclosuresIssue,
-		id: 'ai-functionality-disclosure-misused',
-		shown: ({ disclosures }) =>
-			disclosures.some(
-				(disclosure) => disclosure.type === 'ai_functionality' && !disclosure.deleted_at,
-			),
-		label: 'Misused',
-		issueCardDisplay: {
-			label: 'AI Functionality',
-			group: 'Misused',
-		},
-	}),
+	disclosureIssueToggle(disclosureTypes.aif, disclosureIssueTypes.missing),
+	disclosureIssueToggle(disclosureTypes.aif, disclosureIssueTypes.misused),
+	disclosureIssueToggle(disclosureTypes.aif, disclosureIssueTypes.nonEnglish),
+	disclosureIssueToggle(disclosureTypes.aif, disclosureIssueTypes.formatting),
 )
 
 export const adsDisclosureReviewPanel = panel({
@@ -374,28 +481,10 @@ export const adsDisclosureReviewPanel = panel({
 	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
 	maxWidth: DISCLOSURES_MAX_WIDTH,
 }).content(
-	toggle({
-		issue: disclosuresIssue,
-		id: 'ads-disclosure-missing',
-		label: 'Missing',
-		issueCardDisplay: {
-			label: 'Advertisements',
-			group: 'Missing',
-		},
-	}),
-	toggle({
-		issue: disclosuresIssue,
-		id: 'ads-disclosure-misused',
-		shown: ({ disclosures }) =>
-			disclosures.some(
-				(disclosure) => disclosure.type === 'advertisements' && !disclosure.deleted_at,
-			),
-		label: 'Misused',
-		issueCardDisplay: {
-			label: 'Advertisements',
-			group: 'Misused',
-		},
-	}),
+	disclosureIssueToggle(disclosureTypes.ads, disclosureIssueTypes.missing),
+	disclosureIssueToggle(disclosureTypes.ads, disclosureIssueTypes.misused),
+	disclosureIssueToggle(disclosureTypes.ads, disclosureIssueTypes.nonEnglish),
+	disclosureIssueToggle(disclosureTypes.ads, disclosureIssueTypes.formatting),
 )
 
 export const paidFeaturesDisclosureReviewPanel = panel({
@@ -405,28 +494,10 @@ export const paidFeaturesDisclosureReviewPanel = panel({
 	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
 	maxWidth: DISCLOSURES_MAX_WIDTH,
 }).content(
-	toggle({
-		issue: disclosuresIssue,
-		id: 'paid-features-disclosure-missing',
-		label: 'Missing',
-		issueCardDisplay: {
-			label: 'Paid Features',
-			group: 'Missing',
-		},
-	}),
-	toggle({
-		issue: disclosuresIssue,
-		id: 'paid-features-disclosure-misused',
-		shown: ({ disclosures }) =>
-			disclosures.some(
-				(disclosure) => disclosure.type === 'paid_features' && !disclosure.deleted_at,
-			),
-		label: 'Misused',
-		issueCardDisplay: {
-			label: 'Paid Features',
-			group: 'Misused',
-		},
-	}),
+	disclosureIssueToggle(disclosureTypes.paid, disclosureIssueTypes.missing),
+	disclosureIssueToggle(disclosureTypes.paid, disclosureIssueTypes.misused),
+	disclosureIssueToggle(disclosureTypes.paid, disclosureIssueTypes.nonEnglish),
+	disclosureIssueToggle(disclosureTypes.paid, disclosureIssueTypes.formatting),
 )
 
 export const telemetryDisclosureReviewPanel = panel({
@@ -436,28 +507,12 @@ export const telemetryDisclosureReviewPanel = panel({
 	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
 	maxWidth: DISCLOSURES_MAX_WIDTH,
 }).content(
-	toggle({
-		issue: disclosuresIssue,
-		id: 'telemetry-disclosure-missing',
-		label: 'Missing',
-		issueCardDisplay: {
-			label: 'Telemetry',
-			group: 'Missing',
-		},
-	}),
-	toggle({
-		issue: disclosuresIssue,
-		id: 'telemetry-disclosure-misused',
-		shown: ({ disclosures }) =>
-			disclosures.some((disclosure) => disclosure.type === 'telemetry' && !disclosure.deleted_at),
-		label: 'Misused',
-		issueCardDisplay: {
-			label: 'Telemetry',
-			group: 'Misused',
-		},
-	}),
+	disclosureIssueToggle(disclosureTypes.telemetry, disclosureIssueTypes.missing),
+	disclosureIssueToggle(disclosureTypes.telemetry, disclosureIssueTypes.misused),
+	disclosureIssueToggle(disclosureTypes.telemetry, disclosureIssueTypes.nonEnglish),
+	disclosureIssueToggle(disclosureTypes.telemetry, disclosureIssueTypes.formatting),
 	section({
-		label: 'What is the telemetry’s consent model?',
+		label: "What is the telemetry's consent model?",
 		shown: ({ selected }) => selected.toggleIds.includes('telemetry-disclosure-missing'),
 	}).content(
 		toggle({
@@ -509,28 +564,10 @@ export const derivativeContentDisclosureReviewPanel = panel({
 	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
 	maxWidth: DISCLOSURES_MAX_WIDTH,
 }).content(
-	toggle({
-		issue: disclosuresIssue,
-		id: 'derivative-content-disclosure-missing',
-		label: 'Missing',
-		issueCardDisplay: {
-			label: 'Derivative Content',
-			group: 'Missing',
-		},
-	}),
-	toggle({
-		issue: disclosuresIssue,
-		id: 'derivative-content-disclosure-misused',
-		shown: ({ disclosures }) =>
-			disclosures.some(
-				(disclosure) => disclosure.type === 'derivative_work' && !disclosure.deleted_at,
-			),
-		label: 'Misused',
-		issueCardDisplay: {
-			label: 'Derivative Content',
-			group: 'Misused',
-		},
-	}),
+	disclosureIssueToggle(disclosureTypes.derivative, disclosureIssueTypes.missing),
+	disclosureIssueToggle(disclosureTypes.derivative, disclosureIssueTypes.misused),
+	disclosureIssueToggle(disclosureTypes.derivative, disclosureIssueTypes.nonEnglish),
+	disclosureIssueToggle(disclosureTypes.derivative, disclosureIssueTypes.formatting),
 )
 
 export const photosensitivityDisclosureReviewPanel = panel({
@@ -540,28 +577,10 @@ export const photosensitivityDisclosureReviewPanel = panel({
 	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
 	maxWidth: DISCLOSURES_MAX_WIDTH,
 }).content(
-	toggle({
-		issue: disclosuresIssue,
-		id: 'photosensitivity-disclosure-missing',
-		label: 'Missing',
-		issueCardDisplay: {
-			label: 'Photosensitivity',
-			group: 'Missing',
-		},
-	}),
-	toggle({
-		issue: disclosuresIssue,
-		id: 'photosensitivity-disclosure-misused',
-		shown: ({ disclosures }) =>
-			disclosures.some(
-				(disclosure) => disclosure.type === 'epilepsy_triggers' && !disclosure.deleted_at,
-			),
-		label: 'Misused',
-		issueCardDisplay: {
-			label: 'Photosensitivity',
-			group: 'Misused',
-		},
-	}),
+	disclosureIssueToggle(disclosureTypes.photosensitivity, disclosureIssueTypes.missing),
+	disclosureIssueToggle(disclosureTypes.photosensitivity, disclosureIssueTypes.misused),
+	disclosureIssueToggle(disclosureTypes.photosensitivity, disclosureIssueTypes.nonEnglish),
+	disclosureIssueToggle(disclosureTypes.photosensitivity, disclosureIssueTypes.formatting),
 )
 
 export const systemInteractionsDisclosureReviewPanel = panel({
@@ -571,28 +590,10 @@ export const systemInteractionsDisclosureReviewPanel = panel({
 	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
 	maxWidth: DISCLOSURES_MAX_WIDTH,
 }).content(
-	toggle({
-		issue: disclosuresIssue,
-		id: 'system-interactions-disclosure-missing',
-		label: 'Missing',
-		issueCardDisplay: {
-			label: 'System Interactions',
-			group: 'Missing',
-		},
-	}),
-	toggle({
-		issue: disclosuresIssue,
-		id: 'system-interactions-disclosure-misused',
-		shown: ({ disclosures }) =>
-			disclosures.some(
-				(disclosure) => disclosure.type === 'system_interactions' && !disclosure.deleted_at,
-			),
-		label: 'Misused',
-		issueCardDisplay: {
-			label: 'System Interactions',
-			group: 'Misused',
-		},
-	}),
+	disclosureIssueToggle(disclosureTypes.system, disclosureIssueTypes.missing),
+	disclosureIssueToggle(disclosureTypes.system, disclosureIssueTypes.misused),
+	disclosureIssueToggle(disclosureTypes.system, disclosureIssueTypes.nonEnglish),
+	disclosureIssueToggle(disclosureTypes.system, disclosureIssueTypes.formatting),
 )
 
 export const archiveDisclosureReviewPanel = panel({
@@ -602,48 +603,8 @@ export const archiveDisclosureReviewPanel = panel({
 	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
 	maxWidth: DISCLOSURES_MAX_WIDTH,
 }).content(
-	toggle({
-		issue: disclosuresIssue,
-		id: 'archive-disclosure-missing',
-		label: 'Missing',
-		issueCardDisplay: {
-			label: 'Archive',
-			group: 'Missing',
-		},
-	}),
-	toggle({
-		issue: disclosuresIssue,
-		id: 'archive-disclosure-misused',
-		shown: ({ disclosures }) =>
-			disclosures.some((disclosure) => disclosure.type === 'archived' && !disclosure.deleted_at),
-		label: 'Misused',
-		issueCardDisplay: {
-			label: 'Archive',
-			group: 'Misused',
-		},
-	}),
-)
-
-export const disclosuresReviewPanel = panel({
-	title: 'Disclosures',
-	hint: 'Has this project selected all proper content disclosures?',
-	icon: TriangleAlertIcon,
-	guidanceUrl: 'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892',
-}).content(
-	toggle({
-		issue: disclosuresIssue,
-		id: 'disclosures-missing',
-		label: 'Missing',
-	}),
-	toggle({
-		issue: disclosuresIssue,
-		id: 'disclosures-misused',
-		shown: ({ disclosures }) => disclosures.some((disclosure) => !disclosure.deleted_at),
-		label: 'Misused',
-	}),
-	toggle({
-		issue: disclosuresNonEnglishIssue,
-		label: 'Non-English',
-		shown: ({ disclosures }) => anyDisclosureHasText(disclosures),
-	}),
+	disclosureIssueToggle(disclosureTypes.archive, disclosureIssueTypes.missing),
+	disclosureIssueToggle(disclosureTypes.archive, disclosureIssueTypes.misused),
+	disclosureIssueToggle(disclosureTypes.archive, disclosureIssueTypes.nonEnglish),
+	disclosureIssueToggle(disclosureTypes.archive, disclosureIssueTypes.formatting),
 )
diff --git a/packages/moderation/src/data/issues/gallery.ts b/packages/moderation/src/data/issues/gallery.ts
index 00a276873e8..1b6f4e97e5e 100644
--- a/packages/moderation/src/data/issues/gallery.ts
+++ b/packages/moderation/src/data/issues/gallery.ts
@@ -34,14 +34,7 @@ export const galleryNotRelevantIssue = issue({
 		const imageIds = projectV3.gallery.flatMap((image) =>
 			image.id !== undefined && keys.has(String(image.id)) ? [image.id] : [],
 		)
-		return imageIds.length
-			? [
-					() => ({
-						type: 'remove_gallery_images',
-						value: { image_ids: imageIds },
-					}),
-				]
-			: []
+		return imageIds.length ? [issueTargets.removeGalleryImages(imageIds)] : []
 	},
 	message: (context) => {
 		const entries = selectedGalleryImages(context).map(
diff --git a/packages/moderation/src/data/issues/license.ts b/packages/moderation/src/data/issues/license.ts
index 62515aa91df..1bd724a8734 100644
--- a/packages/moderation/src/data/issues/license.ts
+++ b/packages/moderation/src/data/issues/license.ts
@@ -32,31 +32,27 @@ export const licenseNoSourceIssue = issue({
 	suggestedStatus: 'rejected',
 })
 
-export const sourceRequiredSection = section({
+export const sourceRequiredToggle = toggle({
+	issue: licenseNoSourceIssue,
+	label: 'No Source',
 	shown: (ctx) =>
 		!ctx.projectV3.minecraft_server &&
 		promptSourceRequired(ctx.projectV3.license.id, ctx.projectV3.project_types),
+})
+
+export const sourceRequiredExtrasSection = section({
+	label: 'Additional reason for source requirements?',
+	shown: (ctx) => ctx.selected.issueIds.includes(licenseNoSourceIssue.id),
 }).content(
 	toggle({
 		shown: (ctx) => !ctx.projectV3.minecraft_server,
 		issue: licenseNoSourceIssue,
-		label: 'No Source',
-	}),
-	section({
-		label: 'Additional reason for source requirements?',
-		shown: (ctx) =>
-			!ctx.projectV3.minecraft_server && ctx.selected.issueIds.includes(licenseNoSourceIssue.id),
-	}).content(
-		toggle({
-			shown: (ctx) => !ctx.projectV3.minecraft_server,
-			issue: licenseNoSourceIssue,
+		label: 'No Source: Fork',
+		id: 'license-fork',
+		issueCardDisplay: {
 			label: 'No Source: Fork',
-			id: 'license-fork',
-			issueCardDisplay: {
-				label: 'No Source: Fork',
-			},
-		}),
-	),
+		},
+	}),
 )
 
 export const licenseReviewPanel = panel({
@@ -83,5 +79,6 @@ export const licenseReviewPanel = panel({
 			label: 'Invalid Link: Custom License',
 		},
 	}),
-	sourceRequiredSection,
+	sourceRequiredToggle,
+	sourceRequiredExtrasSection,
 )
diff --git a/packages/moderation/src/data/issues/rules.ts b/packages/moderation/src/data/issues/rules.ts
index c2793f79af7..7a4246145d0 100644
--- a/packages/moderation/src/data/issues/rules.ts
+++ b/packages/moderation/src/data/issues/rules.ts
@@ -32,6 +32,7 @@ import serverSideOptOutMessage from '../messages/checklist/messages/rules/server
 import { issue, panel, section, select, toggle } from './component-builders/builders'
 import { selectedGalleryImages } from './component-builders/gallery-images'
 import { IssuePriority } from './component-builders/priority'
+import { issueTargets } from './component-builders/targets'
 import type { IssueAction } from './component-builders/types'
 
 const escapeHtml = md().utils.escapeHtml
@@ -83,21 +84,13 @@ export const rulesAiImagesIssue = issue({
 		)
 		const actions: IssueAction[] = []
 		if (selected.toggleIds.includes('description-ai-images')) {
-			actions.push(() => ({
-				type: 'modify_description',
-				value: { original: projectV3.description },
-			}))
+			actions.push(issueTargets.modifyDescription())
 		}
 		if (selected.toggleIds.includes('icon-ai-images')) {
-			actions.push(() => ({
-				type: 'remove_icon',
-			}))
+			actions.push(issueTargets.removeIcon())
 		}
 		if (imageIds.length) {
-			actions.push(() => ({
-				type: 'remove_gallery_images',
-				value: { image_ids: imageIds },
-			}))
+			actions.push(issueTargets.removeGalleryImages(imageIds))
 		}
 		return actions
 	},
diff --git a/packages/moderation/src/data/issues/versions.ts b/packages/moderation/src/data/issues/versions.ts
index 8d4d1539267..416c5b0b8cd 100644
--- a/packages/moderation/src/data/issues/versions.ts
+++ b/packages/moderation/src/data/issues/versions.ts
@@ -16,7 +16,7 @@ import unsupportedMessage from '../messages/checklist/messages/versions/unsuppor
 import vanillaAssetsMessage from '../messages/checklist/messages/versions/vanilla-assets.md'
 import { issue, panel, section, select, text, toggle } from './component-builders/builders'
 import { issueLocation } from './component-builders/locations'
-import { sourceRequiredSection } from './license'
+import { sourceRequiredExtrasSection, sourceRequiredToggle } from './license'
 
 export const versionsIncorrectAdditionalFilesIssue = issue({
 	id: 'versions-incorrect-additional-files',
@@ -144,6 +144,8 @@ export const versionsReviewPanel = panel({
 		issue: metadataDependenciesIssue,
 		label: 'Dependencies',
 	}),
+	sourceRequiredToggle,
+	sourceRequiredExtrasSection,
 	section({
 		shown: (ctx) => ctx.selected.issueIds.includes(versionsIncorrectProjectTypeIssue.id),
 	}).content(
@@ -210,6 +212,7 @@ export const versionsReviewPanel = panel({
 			],
 		}),
 	),
+
 	section({
 		shown: (ctx) => ctx.selected.issueIds.includes(versionsUnsupportedIssue.id),
 	}).content(
@@ -220,5 +223,4 @@ export const versionsReviewPanel = panel({
 			required: true,
 		}),
 	),
-	sourceRequiredSection,
 )
diff --git a/packages/moderation/src/data/message-library.ts b/packages/moderation/src/data/message-library.ts
index 9d4c5d86e59..fcf3d10c8d0 100644
--- a/packages/moderation/src/data/message-library.ts
+++ b/packages/moderation/src/data/message-library.ts
@@ -11,7 +11,7 @@ import demonetizedModpack from './messages/checklist/messages/status-alerts/demo
 import privateProject from './messages/checklist/messages/status-alerts/private-use/project.md'
 import privateServer from './messages/checklist/messages/status-alerts/private-use/server.md'
 import serverUse from './messages/checklist/messages/status-alerts/server-use.md'
-import temporaryServer from './messages/checklist/messages/status-alerts/temporary-server.md'
+// import temporaryServer from './messages/checklist/messages/status-alerts/temporary-server.md'
 
 export interface MessageTemplate {
 	label: string
@@ -81,15 +81,6 @@ export const messageLibrary: readonly MessageLibraryEntry[] = [
 		shown: ({ project }) => project.status === 'approved',
 		fields: [{ token: '%STATUS%', label: 'What status is the project being set to?' }],
 	},
-	{
-		label: 'Temporary server',
-		body: temporaryServer,
-		shown: ({ project }) =>
-			!!project.minecraft_server &&
-			['aternos', 'minekeep', 'minehut'].some((host) =>
-				project.minecraft_java_server?.address?.includes(host),
-			),
-	},
 	{ label: 'Account issues', body: account },
 ]
 
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ads.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ads.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ads.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ads.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/ai-functionality.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-functionality.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/ai-functionality.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-functionality.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/ai-usages/assets.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-usages/assets.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/ai-usages/assets.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-usages/assets.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/ai-usages/code.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-usages/code.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/ai-usages/code.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-usages/code.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/ai-usages/text.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-usages/text.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/ai-usages/text.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/ai-usages/text.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/ai.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/ai.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/ai.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/ai.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/list-intro.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/list-intro.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/ai/list-intro.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/ai/list-intro.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/archive.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/archive.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/archive.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/archive.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/derivative-content.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/derivative-content.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/derivative-content.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/derivative-content.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/paid-features.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/paid-features.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/paid-features.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/paid-features.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/photosensitivity.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/photosensitivity.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/photosensitivity.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/photosensitivity.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/system-interactions.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/system-interactions.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/system-interactions.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/system-interactions.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/telemetry.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry.md
similarity index 100%
rename from packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/telemetry.md
rename to packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry.md
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry/consent-model/always.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry/consent-model/always.md
new file mode 100644
index 00000000000..c3c21806a84
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry/consent-model/always.md
@@ -0,0 +1 @@
+    - [Always active](%DISCLOSURES_FAQ_TELEMETRY_CONSENT_LINK%).
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry/consent-model/opt-in.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry/consent-model/opt-in.md
new file mode 100644
index 00000000000..36fc2bd34c2
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry/consent-model/opt-in.md
@@ -0,0 +1 @@
+    - [Opt In](%DISCLOSURES_FAQ_TELEMETRY_CONSENT_LINK%).
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry/consent-model/opt-out.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry/consent-model/opt-out.md
new file mode 100644
index 00000000000..505e8c1bd8d
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/disclosures/disclosure-list-items/telemetry/consent-model/opt-out.md
@@ -0,0 +1 @@
+    - [Opt Out](%DISCLOSURES_FAQ_TELEMETRY_CONSENT_LINK%).
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/formatting-disclosures/list-intro.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/formatting-disclosures/list-intro.md
new file mode 100644
index 00000000000..507189fac58
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/disclosures/formatting-disclosures/list-intro.md
@@ -0,0 +1 @@
+**These disclosures appear to contain mis-formatted or unreadable text:**
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/missing-disclosures/list-intro.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/missing-disclosures/list-intro.md
index fa727a26f8d..c1612f387c0 100644
--- a/packages/moderation/src/data/messages/checklist/messages/disclosures/missing-disclosures/list-intro.md
+++ b/packages/moderation/src/data/messages/checklist/messages/disclosures/missing-disclosures/list-intro.md
@@ -1 +1 @@
-**These disclosures appear to be missing:**
+**Please provide accurate disclosure information for:**
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/missing-disclosures/missing-disclosures-header.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/missing-disclosures/missing-disclosures-header.md
deleted file mode 100644
index b925cf78bc7..00000000000
--- a/packages/moderation/src/data/messages/checklist/messages/disclosures/missing-disclosures/missing-disclosures-header.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## Missing Content Disclosures
-
-%R5.9%, we ask that you ensure all applicable %PROJECT_CONTENT_DISCLOSURES_FLINK% are filled out with accurate information. \
-For additional information and guidance, please refer to our %DISCLOSURES_FAQ_FLINK%.
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/misused-disclosures-header.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/misused-disclosures-header.md
deleted file mode 100644
index 6e0720e1ae5..00000000000
--- a/packages/moderation/src/data/messages/checklist/messages/disclosures/misused-disclosures/misused-disclosures-header.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## Misused Disclosures
-
-%R5.9%, we ask that you ensure all %PROJECT_CONTENT_DISCLOSURES_FLINK% are filled out accurately and appropriately with information directly relevant to the disclosure's purpose and your project's content. \
-For additional information and guidance, please refer to our %DISCLOSURES_FAQ_FLINK%.
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/non-english-disclosures/list-intro.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/non-english-disclosures/list-intro.md
new file mode 100644
index 00000000000..dbef79e55cb
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/disclosures/non-english-disclosures/list-intro.md
@@ -0,0 +1 @@
+**Please ensure these disclosures are written in English:**
diff --git a/packages/moderation/src/data/messages/checklist/messages/disclosures/non-english.md b/packages/moderation/src/data/messages/checklist/messages/disclosures/non-english.md
deleted file mode 100644
index 54b94b91a42..00000000000
--- a/packages/moderation/src/data/messages/checklist/messages/disclosures/non-english.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## Non-English Disclosure Information
-
-%R2.2%, we ask that you ensure all %PROJECT_CONTENT_DISCLOSURES_FLINK% are written in English.
-
-Please refer to our %DISCLOSURES_FAQ_FLINK% for more info.
diff --git a/packages/moderation/src/data/settings.ts b/packages/moderation/src/data/settings.ts
index 4dc3b250063..2012a5ea2df 100644
--- a/packages/moderation/src/data/settings.ts
+++ b/packages/moderation/src/data/settings.ts
@@ -2,6 +2,13 @@ import { setting } from '../types/settings.ts'
 
 const settings = {
 	General: {
+		SortDisclosuresByActiveFirst: setting.asToggle({
+			type: 'toggle',
+			id: 'sort-disclosures-by-active-first',
+			title: 'Sort disclosures by active first',
+			description: 'Show active disclosures before inactive disclosures in project review.',
+			default: true,
+		}),
 		GalleryColumns: setting.asEnum({
 			type: 'enum',
 			id: 'gallery-columns',
diff --git a/packages/moderation/src/utils.ts b/packages/moderation/src/utils.ts
index bc8faa74b6e..4888efc8da8 100644
--- a/packages/moderation/src/utils.ts
+++ b/packages/moderation/src/utils.ts
@@ -106,28 +106,37 @@ export function isTempHostAddress(address: string): boolean {
 	)
 }
 
+export function disclosureExists(
+	disclosures: readonly Labrinth.Projects.v3.ProjectDisclosureData[],
+	type: string,
+): boolean {
+	return disclosures.some((disclosure) => disclosure.type === type && !disclosure.deleted_at)
+}
+
 export function anyDisclosureHasText(
 	disclosures: readonly Labrinth.Projects.v3.ProjectDisclosureData[],
 ): boolean {
-	return disclosures.some((disclosure) => {
-		if (disclosure.deleted_at) return false
-		if ('note' in disclosure && disclosure.note?.trim()) return true
-
-		switch (disclosure.type) {
-			case 'derivative_work':
-				return disclosure.sources.some((source) =>
-					[source.label, source.link, source.note].some((text) => text?.trim()),
-				)
-			case 'telemetry':
-				return disclosure.data_collected.some((text) => text.trim())
-			case 'paid_features':
-				return disclosure.features.some((text) => text.trim())
-			case 'system_interactions':
-				return disclosure.interactions.some((text) => text.trim())
-			default:
-				return false
-		}
-	})
+	return disclosures.some((disclosure) => disclosureHasText(disclosure))
+}
+
+export function disclosureHasText(disclosure: Labrinth.Projects.v3.ProjectDisclosureData): boolean {
+	if (disclosure.deleted_at) return false
+	if ('note' in disclosure && disclosure.note?.trim()) return true
+
+	switch (disclosure.type) {
+		case 'derivative_work':
+			return disclosure.sources.some((source) =>
+				[source.label, source.link, source.note].some((text) => text?.trim()),
+			)
+		case 'telemetry':
+			return disclosure.data_collected.some((text) => text.trim())
+		case 'paid_features':
+			return disclosure.features.some((text) => text.trim())
+		case 'system_interactions':
+			return disclosure.interactions.some((text) => text.trim())
+		default:
+			return false
+	}
 }
 
 export function projectHasCustomServerModpack(projectV3: Labrinth.Projects.v3.Project): boolean {
diff --git a/packages/ui/src/components/floating/Tooltip.vue b/packages/ui/src/components/floating/Tooltip.vue
index 33d2782da49..31285101684 100644
--- a/packages/ui/src/components/floating/Tooltip.vue
+++ b/packages/ui/src/components/floating/Tooltip.vue
@@ -42,6 +42,7 @@ const SIDES = {
 
 const props = withDefaults(
 	defineProps<{
+		delay?: number
 		disabled?: boolean
 		animated?: boolean
 		showArrow?: boolean
@@ -53,7 +54,13 @@ const props = withDefaults(
 		content?: TooltipContent | null
 		panelClass?: string
 	}>(),
-	{ disabled: false, animated: true, showArrow: true, theme: 'tooltip', placement: 'top' },
+	{
+		disabled: false,
+		animated: true,
+		showArrow: true,
+		theme: 'tooltip',
+		placement: 'top',
+	},
 )
 
 const slots = useSlots()
@@ -121,6 +128,7 @@ watch(
 	[
 		trigger,
 		() => props.disabled,
+		() => props.delay,
 		() => props.open,
 		() => props.placement,
 		() => props.theme,
@@ -167,6 +175,7 @@ function syncSource() {
 		return
 	}
 	bindTooltipSource(el, {
+		delay: props.delay,
 		placement: props.placement,
 		theme: props.theme,
 		getText: () => props.text ?? null,