From 1dd7e3bcdcb5547b157506d77a6ce7a85b1dd184 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Thu, 30 Oct 2025 16:05:23 -0700
Subject: [PATCH 01/64] add changelog

---
 packages/utils/changelog.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 41b3f3ce..1b01dbe1 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,19 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-10-30T16:30:00-07:00`,
+		product: 'app',
+		version: '0.10.16',
+		body: `## Security fixes
+- Fixed a security vulnerability with .mrpack import zip parsing.
+
+## Improvements
+- Fixed stacking multiple instance wrapper commands.
+- Fixed instance-provided filters still showing as locked in the filters bar even when the filter is unlocked.
+- Fixed "Friends" title showing up in the sidebar twice when you have no friends.
+- Fixed the "Add friends" button not working properly.`,
+	},
 	{
 		date: `2025-10-26T18:30:00-07:00`,
 		product: 'app',

From 00f9cf0e2c3dd7977c7aade66ee447ababff576b Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Thu, 30 Oct 2025 16:28:18 -0700
Subject: [PATCH 02/64] Fix inconsistent PAT display order (#4662)

* Fix inconsistent PAT display order
Closes #4661

* Fix side effect in computed property

* Fix lint

---------

Co-authored-by: Calum H. <contact@cal.engineer>
---
 apps/frontend/src/pages/settings/pats.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/frontend/src/pages/settings/pats.vue b/apps/frontend/src/pages/settings/pats.vue
index 00e62ca9..bf55bb70 100644
--- a/apps/frontend/src/pages/settings/pats.vue
+++ b/apps/frontend/src/pages/settings/pats.vue
@@ -100,7 +100,7 @@
 				</template>
 			</IntlFormatted>
 		</p>
-		<div v-for="(pat, index) in pats" :key="pat.id" class="universal-card recessed token">
+		<div v-for="(pat, index) in displayPats" :key="pat.id" class="universal-card recessed token">
 			<div>
 				<div>
 					<strong>{{ pat.name }}</strong>
@@ -332,6 +332,9 @@ const deletePatIndex = ref(null)
 const loading = ref(false)
 
 const { data: pats, refresh } = await useAsyncData('pat', () => useBaseFetch('pat'))
+const displayPats = computed(() => {
+	return pats.value.toSorted((a, b) => new Date(b.created) - new Date(a.created))
+})
 
 async function createPat() {
 	startLoading()

From 4c1020d2bacd299267647142a37b5eeaacfceff9 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 31 Oct 2025 02:36:52 -0700
Subject: [PATCH 03/64] Revert "fix: firefox backup download issues (#4679)"
 (#4683)

This reverts commit c74460fffa80eb30c14716044cc917f5c579046e.
---
 .../src/components/ui/servers/BackupItem.vue  | 89 ++++---------------
 .../composables/servers/modules/backups.ts    | 83 -----------------
 apps/frontend/src/locales/en-US/index.json    |  6 --
 .../src/pages/servers/manage/[id]/backups.vue |  1 -
 4 files changed, 15 insertions(+), 164 deletions(-)

diff --git a/apps/frontend/src/components/ui/servers/BackupItem.vue b/apps/frontend/src/components/ui/servers/BackupItem.vue
index b8e170ca..6e910066 100644
--- a/apps/frontend/src/components/ui/servers/BackupItem.vue
+++ b/apps/frontend/src/components/ui/servers/BackupItem.vue
@@ -13,23 +13,14 @@ import {
 	TrashIcon,
 	XIcon,
 } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	commonMessages,
-	injectNotificationManager,
-	OverflowMenu,
-	ProgressBar,
-} from '@modrinth/ui'
+import { ButtonStyled, commonMessages, OverflowMenu, ProgressBar } from '@modrinth/ui'
 import type { Backup } from '@modrinth/utils'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import dayjs from 'dayjs'
-import { computed, ref } from 'vue'
-
-import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
+import { computed } from 'vue'
 
 const flags = useFeatureFlags()
 const { formatMessage } = useVIntl()
-const { addNotification } = injectNotificationManager()
 
 const emit = defineEmits<{
 	(e: 'download' | 'rename' | 'restore' | 'lock' | 'retry'): void
@@ -42,13 +33,11 @@ const props = withDefaults(
 		preview?: boolean
 		kyrosUrl?: string
 		jwt?: string
-		server?: ModrinthServer
 	}>(),
 	{
 		preview: false,
 		kyrosUrl: undefined,
 		jwt: undefined,
-		server: undefined,
 	},
 )
 
@@ -135,48 +124,7 @@ const messages = defineMessages({
 		id: 'servers.backups.item.retry',
 		defaultMessage: 'Retry',
 	},
-	downloadingBackup: {
-		id: 'servers.backups.item.downloading-backup',
-		defaultMessage: 'Downloading backup...',
-	},
-	downloading: {
-		id: 'servers.backups.item.downloading',
-		defaultMessage: 'Downloading',
-	},
 })
-
-const downloadingState = ref<{ progress: number; state: string } | undefined>(undefined)
-
-const downloading = computed(() => downloadingState.value)
-
-const handleDownload = async () => {
-	if (!props.server?.backups || downloading.value) {
-		return
-	}
-
-	downloadingState.value = { progress: 0, state: 'ongoing' }
-
-	try {
-		const download = props.server.backups.downloadBackup(props.backup.id, props.backup.name)
-
-		download.onProgress((p) => {
-			downloadingState.value = { progress: p.progress, state: 'ongoing' }
-		})
-
-		await download.promise
-
-		emit('download')
-	} catch (error) {
-		console.error('Failed to download backup:', error)
-		addNotification({
-			type: 'error',
-			title: 'Download failed',
-			text: error instanceof Error ? error.message : 'Failed to download backup',
-		})
-	} finally {
-		downloadingState.value = undefined
-	}
-}
 </script>
 <template>
 	<div
@@ -244,15 +192,6 @@ const handleDownload = async () => {
 				class="max-w-full"
 			/>
 		</div>
-		<div v-else-if="downloading" class="col-span-2 flex flex-col gap-3 text-blue">
-			{{ formatMessage(messages.downloadingBackup) }}
-			<ProgressBar
-				:progress="downloading.progress >= 0 ? downloading.progress : 0"
-				color="blue"
-				:waiting="downloading.progress <= 0"
-				class="max-w-full"
-			/>
-		</div>
 		<template v-else>
 			<div class="col-span-2">
 				{{ dayjs(backup.created_at).format('MMMM D, YYYY [at] h:mm A') }}
@@ -284,32 +223,34 @@ const handleDownload = async () => {
 				</button>
 			</ButtonStyled>
 			<template v-else>
-				<ButtonStyled v-show="!downloading">
-					<button :disabled="!server?.backups" @click="handleDownload">
+				<ButtonStyled>
+					<a
+						:class="{
+							disabled: !kyrosUrl || !jwt,
+						}"
+						:href="`https://${kyrosUrl}/modrinth/v0/backups/${backup.id}/download?auth=${jwt}`"
+						@click="() => emit('download')"
+					>
 						<DownloadIcon />
 						{{ formatMessage(commonMessages.downloadButton) }}
-					</button>
+					</a>
 				</ButtonStyled>
 				<ButtonStyled circular type="transparent">
 					<OverflowMenu
 						:options="[
-							{
-								id: 'rename',
-								action: () => emit('rename'),
-								disabled: !!restoring || !!downloading,
-							},
+							{ id: 'rename', action: () => emit('rename') },
 							{
 								id: 'restore',
 								action: () => emit('restore'),
-								disabled: !!restoring || !!downloading,
+								disabled: !!restoring,
 							},
-							{ id: 'lock', action: () => emit('lock'), disabled: !!restoring || !!downloading },
+							{ id: 'lock', action: () => emit('lock') },
 							{ divider: true },
 							{
 								id: 'delete',
 								color: 'red',
 								action: () => emit('delete'),
-								disabled: !!restoring || !!downloading,
+								disabled: !!restoring,
 							},
 						]"
 					>
diff --git a/apps/frontend/src/composables/servers/modules/backups.ts b/apps/frontend/src/composables/servers/modules/backups.ts
index ac011508..921b9a35 100644
--- a/apps/frontend/src/composables/servers/modules/backups.ts
+++ b/apps/frontend/src/composables/servers/modules/backups.ts
@@ -106,87 +106,4 @@ export class BackupsModule extends ServerModule {
 	async getAutoBackup(): Promise<AutoBackupSettings> {
 		return await useServersFetch(`servers/${this.serverId}/autobackup`)
 	}
-
-	downloadBackup(
-		backupId: string,
-		backupName: string,
-	): {
-		promise: Promise<void>
-		onProgress: (cb: (p: { loaded: number; total: number; progress: number }) => void) => void
-		cancel: () => void
-	} {
-		const progressSubject = new EventTarget()
-		const abortController = new AbortController()
-
-		const downloadPromise = new Promise<void>((resolve, reject) => {
-			const auth = this.server.general?.node
-			if (!auth?.instance || !auth?.token) {
-				reject(new Error('Missing authentication credentials'))
-				return
-			}
-
-			const xhr = new XMLHttpRequest()
-
-			xhr.addEventListener('progress', (e) => {
-				if (e.lengthComputable) {
-					const progress = e.loaded / e.total
-					progressSubject.dispatchEvent(
-						new CustomEvent('progress', {
-							detail: { loaded: e.loaded, total: e.total, progress },
-						}),
-					)
-				} else {
-					// progress = -1 to indicate indeterminate size
-					progressSubject.dispatchEvent(
-						new CustomEvent('progress', {
-							detail: { loaded: e.loaded, total: 0, progress: -1 },
-						}),
-					)
-				}
-			})
-
-			xhr.onload = () => {
-				if (xhr.status >= 200 && xhr.status < 300) {
-					try {
-						const blob = xhr.response
-						const url = window.URL.createObjectURL(blob)
-						const a = document.createElement('a')
-						a.href = url
-						a.download = `${backupName}.zip`
-						document.body.appendChild(a)
-						a.click()
-						document.body.removeChild(a)
-						window.URL.revokeObjectURL(url)
-						resolve()
-					} catch (error) {
-						reject(error)
-					}
-				} else {
-					reject(new Error(`Download failed with status ${xhr.status}`))
-				}
-			}
-
-			xhr.onerror = () => reject(new Error('Download failed'))
-			xhr.onabort = () => reject(new Error('Download cancelled'))
-
-			xhr.open(
-				'GET',
-				`https://${auth.instance}/modrinth/v0/backups/${backupId}/download?auth=${auth.token}`,
-			)
-			xhr.responseType = 'blob'
-			xhr.send()
-
-			abortController.signal.addEventListener('abort', () => xhr.abort())
-		})
-
-		return {
-			promise: downloadPromise,
-			onProgress: (cb: (p: { loaded: number; total: number; progress: number }) => void) => {
-				progressSubject.addEventListener('progress', ((e: CustomEvent) => {
-					cb(e.detail)
-				}) as EventListener)
-			},
-			cancel: () => abortController.abort(),
-		}
-	}
 }
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index c2e4902d..087870e3 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -1934,12 +1934,6 @@
   "servers.backups.item.creating-backup": {
     "message": "Creating backup..."
   },
-  "servers.backups.item.downloading": {
-    "message": "Downloading"
-  },
-  "servers.backups.item.downloading-backup": {
-    "message": "Downloading backup..."
-  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Failed to create backup"
   },
diff --git a/apps/frontend/src/pages/servers/manage/[id]/backups.vue b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
index 56d85946..091f036b 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/backups.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
@@ -105,7 +105,6 @@
 				v-for="backup in backups"
 				:key="`backup-${backup.id}`"
 				:backup="backup"
-				:server="props.server"
 				:kyros-url="props.server.general?.node.instance"
 				:jwt="props.server.general?.node.token"
 				@download="() => triggerDownloadAnimation()"

From b7f0988399a3cb9a33b8384ac019de8f08fce3d1 Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Fri, 31 Oct 2025 12:04:01 -0700
Subject: [PATCH 04/64] Decouple project deletion from thread deletion (#4673)

* Decouple project deletion from thread deletion

* Allow a thread to exist without a project

* attempt 2

* Modify migration to set orphaned threads' mods to NULL instead of removing constraint entirely

* Use mod PAT for mod threads
---
 ...0125413_decouple_threads_from_projects.sql |  5 +++
 .../src/database/models/project_item.rs       |  3 --
 apps/labrinth/tests/project.rs                | 44 +++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 apps/labrinth/migrations/20251030125413_decouple_threads_from_projects.sql

diff --git a/apps/labrinth/migrations/20251030125413_decouple_threads_from_projects.sql b/apps/labrinth/migrations/20251030125413_decouple_threads_from_projects.sql
new file mode 100644
index 00000000..dd5bcc23
--- /dev/null
+++ b/apps/labrinth/migrations/20251030125413_decouple_threads_from_projects.sql
@@ -0,0 +1,5 @@
+ALTER TABLE threads
+DROP CONSTRAINT threads_mod_id_fkey,
+ADD CONSTRAINT threads_mod_id_fkey
+FOREIGN KEY (mod_id) REFERENCES mods(id)
+ON DELETE SET NULL;
diff --git a/apps/labrinth/src/database/models/project_item.rs b/apps/labrinth/src/database/models/project_item.rs
index 362907bd..3ed30b17 100644
--- a/apps/labrinth/src/database/models/project_item.rs
+++ b/apps/labrinth/src/database/models/project_item.rs
@@ -384,9 +384,6 @@ impl DBProject {
             .execute(&mut **transaction)
             .await?;
 
-            models::DBThread::remove_full(project.thread_id, transaction)
-                .await?;
-
             sqlx::query!(
                 "
                 UPDATE reports
diff --git a/apps/labrinth/tests/project.rs b/apps/labrinth/tests/project.rs
index 893988a9..c337da78 100644
--- a/apps/labrinth/tests/project.rs
+++ b/apps/labrinth/tests/project.rs
@@ -1355,6 +1355,50 @@ async fn projects_various_visibility() {
     .await;
 }
 
+#[actix_rt::test]
+async fn test_thread_deleted_with_project() {
+    with_test_environment(
+        None,
+        |test_env: TestEnvironment<ApiV3>| async move {
+            let api = &test_env.api;
+
+            let alpha_project_id = &test_env.dummy.project_alpha.project_id;
+            let alpha_thread_id = &test_env.dummy.project_alpha.thread_id;
+
+            // Verify the thread exists initially
+            let resp = api.get_thread(alpha_thread_id, USER_USER_PAT).await;
+            assert_status!(&resp, StatusCode::OK);
+
+            // Write a message to the thread to confirm it's working
+            let resp = api
+                .write_to_thread(
+                    alpha_thread_id,
+                    "text",
+                    "Test message before project deletion",
+                    USER_USER_PAT,
+                )
+                .await;
+            assert_status!(&resp, StatusCode::NO_CONTENT);
+
+            // Check that the thread exists before project deletion
+            // Use a moderator PAT since moderation threads are not visible to users
+            let resp = api.get_thread(alpha_thread_id, MOD_USER_PAT).await;
+            assert_status!(&resp, StatusCode::OK);
+
+            // Delete the project
+            let resp =
+                api.remove_project(alpha_project_id, USER_USER_PAT).await;
+            assert_status!(&resp, StatusCode::NO_CONTENT);
+
+            // Check that the thread still exists after project deletion
+            // Also use mod PAT here
+            let resp = api.get_thread(alpha_thread_id, MOD_USER_PAT).await;
+            assert_status!(&resp, StatusCode::OK);
+        },
+    )
+    .await;
+}
+
 // Route tests:
 // TODO: Missing routes on projects
 // TODO: using permissions/scopes, can we SEE projects existence that we are not allowed to? (ie 401 instead of 404)

From 40cbe92dbc33dc1c55a7dbc72171cd9a5c2b28f2 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Sun, 2 Nov 2025 11:32:18 -0800
Subject: [PATCH 05/64] Affiliates frontend (#4380)

* Begin affiliates frontend

* Significant work on hooking up affiliates ui

* Clean up server nodes menu

* affiliates work

* update affiliate time

* oops

* fix local import

* fix local import x2

* remove line in dashboard

* lint
---
 apps/frontend/src/composables/affiliates.ts   |  22 ++
 apps/frontend/src/layouts/default.vue         |  32 +-
 apps/frontend/src/locales/en-US/index.json    |  33 ++
 apps/frontend/src/pages/admin/affiliates.vue  | 281 ++++++++++++++++++
 .../src/pages/admin/servers/nodes.vue         |   1 +
 apps/frontend/src/pages/dashboard.vue         |  17 +-
 .../src/pages/dashboard/affiliate-links.vue   | 202 +++++++++++++
 apps/frontend/src/pages/servers/index.vue     |  21 +-
 apps/frontend/src/pages/user/[id].vue         | 120 ++++++--
 packages/assets/external/facebook.svg         |   1 +
 packages/assets/external/instagram.svg        |   1 +
 packages/assets/external/reels.svg            |   3 +
 packages/assets/external/snapchat.svg         |   1 +
 packages/assets/external/threads.svg          |   1 +
 packages/assets/external/tiktok.svg           |   1 +
 packages/assets/external/twitch.svg           |   1 +
 packages/assets/external/youtubegaming.svg    |   1 +
 packages/assets/external/youtubeshorts.svg    |   1 +
 packages/assets/generated-icons.ts            |   6 +
 packages/assets/icons/affiliate.svg           |  11 +
 packages/assets/icons/circle-user.svg         |   1 +
 packages/assets/icons/user-search.svg         |   1 +
 packages/assets/index.ts                      |  20 +-
 .../affiliate/AffiliateLinkCard.vue           |  72 +++++
 .../affiliate/AffiliateLinkCreateModal.vue    | 165 ++++++++++
 .../ui/src/components/base/AutoBrandIcon.vue  | 153 ++++++++++
 .../billing/ModrinthServersPurchaseModal.vue  |   3 +
 packages/ui/src/components/index.ts           |   5 +
 packages/ui/src/composables/stripe.ts         |   9 +
 packages/ui/src/locales/en-US/index.json      |  39 +++
 packages/ui/src/utils/billing.ts              |   1 +
 packages/ui/src/utils/common-messages.ts      |   4 +
 packages/utils/types.ts                       |   9 +
 33 files changed, 1202 insertions(+), 37 deletions(-)
 create mode 100644 apps/frontend/src/composables/affiliates.ts
 create mode 100644 apps/frontend/src/pages/admin/affiliates.vue
 create mode 100644 apps/frontend/src/pages/dashboard/affiliate-links.vue
 create mode 100644 packages/assets/external/facebook.svg
 create mode 100644 packages/assets/external/instagram.svg
 create mode 100644 packages/assets/external/reels.svg
 create mode 100644 packages/assets/external/snapchat.svg
 create mode 100644 packages/assets/external/threads.svg
 create mode 100644 packages/assets/external/tiktok.svg
 create mode 100644 packages/assets/external/twitch.svg
 create mode 100644 packages/assets/external/youtubegaming.svg
 create mode 100644 packages/assets/external/youtubeshorts.svg
 create mode 100644 packages/assets/icons/affiliate.svg
 create mode 100644 packages/assets/icons/circle-user.svg
 create mode 100644 packages/assets/icons/user-search.svg
 create mode 100644 packages/ui/src/components/affiliate/AffiliateLinkCard.vue
 create mode 100644 packages/ui/src/components/affiliate/AffiliateLinkCreateModal.vue
 create mode 100644 packages/ui/src/components/base/AutoBrandIcon.vue

diff --git a/apps/frontend/src/composables/affiliates.ts b/apps/frontend/src/composables/affiliates.ts
new file mode 100644
index 00000000..3e23c3b3
--- /dev/null
+++ b/apps/frontend/src/composables/affiliates.ts
@@ -0,0 +1,22 @@
+export const useAffiliates = () => {
+	const affiliateCookie = useCookie('mrs_afl', {
+		maxAge: 60 * 60 * 24 * 7, // 7 days
+		sameSite: 'lax',
+		secure: true,
+		httpOnly: false,
+		path: '/',
+	})
+
+	const setAffiliateCode = (code: string) => {
+		affiliateCookie.value = code
+	}
+
+	const getAffiliateCode = (): string | undefined => {
+		return affiliateCookie.value || undefined
+	}
+
+	return {
+		setAffiliateCode,
+		getAffiliateCode,
+	}
+}
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index 3e75317b..abfefe74 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -455,6 +455,12 @@
 								link: '/admin/user_email',
 								shown: isAdmin(auth.user),
 							},
+							{
+								id: 'affiliates',
+								color: 'primary',
+								link: '/admin/affiliates',
+								shown: isAdmin(auth.user),
+							},
 							{
 								id: 'servers-notices',
 								color: 'primary',
@@ -478,7 +484,7 @@
 							<ReportIcon aria-hidden="true" /> {{ formatMessage(messages.reports) }}
 						</template>
 						<template #user-lookup>
-							<UserIcon aria-hidden="true" /> {{ formatMessage(messages.lookupByEmail) }}
+							<UserSearchIcon aria-hidden="true" /> {{ formatMessage(messages.lookupByEmail) }}
 						</template>
 						<template #file-lookup>
 							<FileIcon aria-hidden="true" /> {{ formatMessage(messages.fileLookup) }}
@@ -486,7 +492,12 @@
 						<template #servers-notices>
 							<IssuesIcon aria-hidden="true" /> {{ formatMessage(messages.manageServerNotices) }}
 						</template>
-						<template #servers-nodes> <ServerIcon aria-hidden="true" /> Server Nodes </template>
+						<template #affiliates>
+							<AffiliateIcon aria-hidden="true" /> {{ formatMessage(messages.manageAffiliates) }}
+						</template>
+						<template #servers-nodes>
+							<ServerIcon aria-hidden="true" /> Credit server nodes
+						</template>
 					</OverflowMenu>
 				</ButtonStyled>
 				<ButtonStyled type="transparent">
@@ -563,6 +574,10 @@
 					<template #organizations>
 						<OrganizationIcon aria-hidden="true" /> {{ formatMessage(messages.organizations) }}
 					</template>
+					<template #affiliate-links>
+						<AffiliateIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.affiliateLinksButton) }}
+					</template>
 					<template #revenue>
 						<CurrencyIcon aria-hidden="true" /> {{ formatMessage(messages.revenue) }}
 					</template>
@@ -850,6 +865,7 @@
 </template>
 <script setup>
 import {
+	AffiliateIcon,
 	ArrowBigUpDashIcon,
 	BellIcon,
 	BlueskyIcon,
@@ -891,6 +907,7 @@ import {
 	SunIcon,
 	TwitterIcon,
 	UserIcon,
+	UserSearchIcon,
 	XIcon,
 } from '@modrinth/assets'
 import {
@@ -903,7 +920,7 @@ import {
 	OverflowMenu,
 	PagewideBanner,
 } from '@modrinth/ui'
-import { isAdmin, isStaff } from '@modrinth/utils'
+import { isAdmin, isStaff, UserBadge } from '@modrinth/utils'
 import { IntlFormatted } from '@vintl/vintl/components'
 
 import TextLogo from '~/components/brand/TextLogo.vue'
@@ -1159,6 +1176,10 @@ const messages = defineMessages({
 		id: 'layout.action.manage-server-notices',
 		defaultMessage: 'Manage server notices',
 	},
+	manageAffiliates: {
+		id: 'layout.action.manage-affiliates',
+		defaultMessage: 'Manage affiliate links',
+	},
 	newProject: {
 		id: 'layout.action.new-project',
 		defaultMessage: 'New project',
@@ -1336,6 +1357,11 @@ const userMenuOptions = computed(() => {
 			id: 'organizations',
 			link: '/dashboard/organizations',
 		},
+		{
+			id: 'affiliate-links',
+			link: '/dashboard/affiliate-links',
+			shown: auth.value.user.badges & UserBadge.AFFILIATE,
+		},
 		{
 			id: 'revenue',
 			link: '/dashboard/revenue',
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 087870e3..62d89f13 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "Unlisted"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Create affiliate link"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Error loading affiliate links"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Your affiliate links"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "This will permanently revoke the affiliate code `{id}` and any existing links with this code that have been shared will no longer be valid."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Revoke"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "Are you sure you want to revoke your ''{title}'' affiliate link?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Search affiliate links..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "Create new"
   },
@@ -869,6 +890,9 @@
   "layout.action.lookup-by-email": {
     "message": "Lookup by email"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Manage affiliate links"
+  },
   "layout.action.manage-server-notices": {
     "message": "Manage server notices"
   },
@@ -1130,6 +1154,12 @@
   "profile.button.manage-projects": {
     "message": "Manage projects"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Remove as affiliate"
+  },
+  "profile.button.set-affiliate": {
+    "message": "Set as affiliate"
+  },
   "profile.details.label.auth-providers": {
     "message": "Auth providers"
   },
@@ -1154,6 +1184,9 @@
   "profile.error.not-found": {
     "message": "User not found"
   },
+  "profile.label.affiliate": {
+    "message": "Affiliate"
+  },
   "profile.label.badges": {
     "message": "Badges"
   },
diff --git a/apps/frontend/src/pages/admin/affiliates.vue b/apps/frontend/src/pages/admin/affiliates.vue
new file mode 100644
index 00000000..7c9155ff
--- /dev/null
+++ b/apps/frontend/src/pages/admin/affiliates.vue
@@ -0,0 +1,281 @@
+<template>
+	<AffiliateLinkCreateModal
+		ref="createModal"
+		:show-user-field="true"
+		:creating-link="creatingLink"
+		@create="createAffiliateCode"
+	/>
+	<ConfirmModal
+		ref="revokeModal"
+		:title="`Are you sure you want to revoke ${revokingAffiliateUsername}'s affiliate code?`"
+		:description="`This will permanently revoke the affiliate code \`${revokingAffiliateId}\` and make any links that this user has shared invalid.`"
+		:proceed-icon="XCircleIcon"
+		:proceed-label="`Revoke`"
+		@proceed="confirmRevokeAffiliateCode"
+	/>
+	<div class="page">
+		<div
+			class="mb-6 flex items-center gap-6 border-0 border-b-[1px] border-solid border-divider pb-6"
+		>
+			<h1 class="m-0 grow text-2xl font-extrabold">Manage affiliate links</h1>
+			<div class="flex items-center gap-2">
+				<div class="iconified-input">
+					<SearchIcon aria-hidden="true" />
+					<input
+						v-model="filterQuery"
+						class="card-shadow"
+						autocomplete="off"
+						spellcheck="false"
+						type="text"
+						:placeholder="`Search affiliates...`"
+					/>
+					<Button v-if="filterQuery" class="r-btn" @click="() => (filterQuery = '')">
+						<XIcon />
+					</Button>
+				</div>
+				<ButtonStyled color="brand">
+					<button @click="createModal?.show">
+						<PlusIcon />
+						Create affiliate code
+					</button>
+				</ButtonStyled>
+			</div>
+		</div>
+		<Admonition v-if="error" type="critical">
+			<template #header> Error loading affiliate links </template>
+			{{ error }}
+		</Admonition>
+		<div v-else-if="groupedAffiliates.length === 0" class="py-8 text-center">
+			<p class="text-secondary">No affiliate codes found.</p>
+		</div>
+		<div v-else class="space-y-4">
+			<Accordion
+				v-for="(userGroup, index) in filteredGroupedAffiliates"
+				:key="userGroup.user.id"
+				open-by-default
+				:class="{
+					'border-0 border-b-[1px] border-solid border-divider pb-4':
+						index < filteredGroupedAffiliates.length - 1,
+				}"
+				:button-class="`flex flex-col w-full gap-2 bg-transparent m-0 p-0 border-none`"
+			>
+				<template #title>
+					<div class="flex items-center gap-4">
+						<Avatar :src="userGroup.user.avatar_url" circle size="48px" />
+						<div class="flex flex-col items-start">
+							<span class="text-lg font-bold text-contrast">
+								{{ userGroup.user.username }}
+							</span>
+							<span class="text-sm text-secondary">
+								{{ userGroup.affiliates.length }} affiliate code{{
+									userGroup.affiliates.length === 1 ? '' : 's'
+								}}
+							</span>
+						</div>
+					</div>
+				</template>
+				<div class="mt-4 space-y-3">
+					<AffiliateLinkCard
+						v-for="affiliate in userGroup.affiliates"
+						:key="affiliate.id"
+						:affiliate="affiliate"
+						:created-by="getCreatedByUsername(affiliate.created_by)"
+						@revoke="revokeAffiliateCode"
+					/>
+				</div>
+			</Accordion>
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+import { PlusIcon, SearchIcon, XCircleIcon, XIcon } from '@modrinth/assets'
+import {
+	Accordion,
+	Admonition,
+	AffiliateLinkCard,
+	AffiliateLinkCreateModal,
+	Avatar,
+	Button,
+	ButtonStyled,
+	ConfirmModal,
+	injectNotificationManager,
+} from '@modrinth/ui'
+import type { AffiliateLink, User } from '@modrinth/utils'
+
+const { handleError } = injectNotificationManager()
+
+type UserGroup = {
+	user: User
+	affiliates: AffiliateLink[]
+}
+
+const createModal = useTemplateRef<typeof AffiliateLinkCreateModal>('createModal')
+const revokeModal = useTemplateRef<typeof ConfirmModal>('revokeModal')
+
+const {
+	data: affiliateCodes,
+	error,
+	refresh,
+} = await useAsyncData(
+	'AffiliateLinks',
+	() => useBaseFetch('affiliate', { method: 'GET', internal: true }) as Promise<AffiliateLink[]>,
+)
+
+const filterQuery = ref('')
+const creatingLink = ref(false)
+
+const userIds = computed(() => {
+	if (!affiliateCodes.value) {
+		return []
+	}
+	const ids = new Set<string>()
+	affiliateCodes.value.forEach((code) => {
+		ids.add(code.affiliate)
+		ids.add(code.created_by)
+	})
+	return Array.from(ids)
+})
+
+const { data: users } = await useAsyncData(
+	'admin-affiliates-bulk-users',
+	() => {
+		if (userIds.value.length === 0) return Promise.resolve([])
+		return useBaseFetch(`users?ids=${JSON.stringify(userIds.value)}`) as Promise<User[]>
+	},
+	{
+		watch: [userIds],
+	},
+)
+
+const userMap = computed(() => {
+	if (!users.value) {
+		return new Map()
+	}
+	return new Map(users.value.map((user) => [user.id, user]))
+})
+
+const groupedAffiliates = computed((): UserGroup[] => {
+	if (!affiliateCodes.value || !users.value) {
+		return []
+	}
+
+	const groups = new Map<string, UserGroup>()
+
+	affiliateCodes.value.forEach((code) => {
+		const user = userMap.value.get(code.affiliate)
+		if (!user) {
+			return
+		}
+
+		if (!groups.has(user.id)) {
+			groups.set(user.id, {
+				user,
+				affiliates: [],
+			})
+		}
+
+		groups.get(user.id)!.affiliates.push(code)
+	})
+
+	return Array.from(groups.values()).sort((a, b) => a.user.username.localeCompare(b.user.username))
+})
+
+const filteredGroupedAffiliates = computed(() => {
+	if (!filterQuery.value.trim()) {
+		return groupedAffiliates.value
+	}
+
+	const query = filterQuery.value.trim().toLowerCase()
+	return groupedAffiliates.value.filter(
+		(group) =>
+			group.user.username.toLowerCase().includes(query) ||
+			group.affiliates.some((affiliate) => affiliate.source_name.toLowerCase().includes(query)),
+	)
+})
+
+function getCreatedByUsername(createdBy: string): string {
+	const user = userMap.value.get(createdBy)
+	return user?.username || 'Unknown'
+}
+
+async function createAffiliateCode(data: { sourceName: string; username?: string }) {
+	creatingLink.value = true
+
+	try {
+		if (!data.username) {
+			// noinspection ExceptionCaughtLocallyJS
+			throw new Error('Username is required')
+		}
+
+		let user = users.value?.find((u) => u.username === data.username)
+
+		if (!user) {
+			try {
+				user = (await useBaseFetch(`user/${data.username}`)) as User
+
+				if (users.value) {
+					users.value.push(user)
+				}
+			} catch {
+				// noinspection ExceptionCaughtLocallyJS
+				throw new Error('User not found')
+			}
+		}
+
+		await useBaseFetch('affiliate', {
+			method: 'PUT',
+			body: {
+				affiliate: user.id,
+				source_name: data.sourceName,
+			},
+			internal: true,
+		})
+
+		await refresh()
+		createModal.value?.close()
+	} catch (err) {
+		handleError(err)
+	} finally {
+		creatingLink.value = false
+	}
+}
+
+const revokingAffiliateUsername = ref<string | null>(null)
+const revokingAffiliateId = ref<string | null>(null)
+
+function revokeAffiliateCode(affiliate: AffiliateLink) {
+	const user = userMap.value.get(affiliate.affiliate)
+	revokingAffiliateUsername.value = user?.username || 'Unknown'
+	revokingAffiliateId.value = affiliate.id
+	revokeModal.value?.show()
+}
+
+async function confirmRevokeAffiliateCode() {
+	if (!revokingAffiliateId.value) {
+		return
+	}
+
+	try {
+		await useBaseFetch(`affiliate/${revokingAffiliateId.value}`, {
+			method: 'DELETE',
+			internal: true,
+		})
+
+		await refresh()
+		revokeModal.value?.hide()
+		revokingAffiliateUsername.value = null
+		revokingAffiliateId.value = null
+	} catch (err) {
+		console.error('Failed to revoke affiliate code:', err)
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.page {
+	padding: 1rem;
+	margin-left: auto;
+	margin-right: auto;
+	max-width: 78.5rem;
+}
+</style>
diff --git a/apps/frontend/src/pages/admin/servers/nodes.vue b/apps/frontend/src/pages/admin/servers/nodes.vue
index 2d0eb527..a23a9293 100644
--- a/apps/frontend/src/pages/admin/servers/nodes.vue
+++ b/apps/frontend/src/pages/admin/servers/nodes.vue
@@ -8,6 +8,7 @@
 				<button @click="openBatchModal"><PlusIcon /> Batch credit</button>
 			</ButtonStyled>
 		</div>
+		<div>don't worry there's not supposed to be anything here</div>
 
 		<NewModal ref="batchModal">
 			<template #title>
diff --git a/apps/frontend/src/pages/dashboard.vue b/apps/frontend/src/pages/dashboard.vue
index 1496b6aa..f9e43449 100644
--- a/apps/frontend/src/pages/dashboard.vue
+++ b/apps/frontend/src/pages/dashboard.vue
@@ -30,6 +30,13 @@
 					>
 						<LibraryIcon aria-hidden="true" />
 					</NavStackItem>
+					<NavStackItem
+						v-if="isAffiliate"
+						link="/dashboard/affiliate-links"
+						:label="formatMessage(commonMessages.affiliateLinksButton)"
+					>
+						<AffiliateIcon aria-hidden="true" />
+					</NavStackItem>
 					<NavStackItem link="/dashboard/revenue" label="Revenue">
 						<CurrencyIcon aria-hidden="true" />
 					</NavStackItem>
@@ -41,8 +48,9 @@
 		</div>
 	</div>
 </template>
-<script setup>
+<script setup lang="ts">
 import {
+	AffiliateIcon,
 	BellIcon as NotificationsIcon,
 	ChartIcon,
 	CurrencyIcon,
@@ -53,10 +61,17 @@ import {
 	ReportIcon,
 } from '@modrinth/assets'
 import { commonMessages } from '@modrinth/ui'
+import { type User, UserBadge } from '@modrinth/utils'
 
 import NavStack from '~/components/ui/NavStack.vue'
 import NavStackItem from '~/components/ui/NavStackItem.vue'
 
+const auth = (await useAuth()) as Ref<{ user: User | null }>
+
+const isAffiliate = computed(() => {
+	return auth.value.user && auth.value.user.badges & UserBadge.AFFILIATE
+})
+
 const { formatMessage } = useVIntl()
 
 definePageMeta({
diff --git a/apps/frontend/src/pages/dashboard/affiliate-links.vue b/apps/frontend/src/pages/dashboard/affiliate-links.vue
new file mode 100644
index 00000000..b53ae3b5
--- /dev/null
+++ b/apps/frontend/src/pages/dashboard/affiliate-links.vue
@@ -0,0 +1,202 @@
+<template>
+	<AffiliateLinkCreateModal
+		ref="createModal"
+		:creating-link="creatingLink"
+		@create="createAffiliateCode"
+	/>
+	<ConfirmModal
+		ref="revokeModal"
+		:title="formatMessage(messages.revokeConfirmTitle, { title: revokingTitle })"
+		:description="formatMessage(messages.revokeConfirmBody, { id: revokingId })"
+		:proceed-icon="XCircleIcon"
+		:proceed-label="formatMessage(messages.revokeConfirmButton)"
+		@proceed="confirmRevokeAffiliateLink"
+	/>
+	<div class="page">
+		<div class="mb-6 flex items-center gap-6">
+			<h1 class="m-0 grow text-2xl font-extrabold">
+				{{ formatMessage(messages.yourAffiliateLinks) }}
+			</h1>
+			<div class="flex items-center gap-2">
+				<div class="iconified-input">
+					<SearchIcon aria-hidden="true" />
+					<input
+						v-model="filterQuery"
+						class="card-shadow"
+						autocomplete="off"
+						spellcheck="false"
+						type="text"
+						:placeholder="formatMessage(messages.searchAffiliateLinks)"
+					/>
+					<Button v-if="filterQuery" class="r-btn" @click="() => (filterQuery = '')">
+						<XIcon />
+					</Button>
+				</div>
+				<ButtonStyled color="brand">
+					<button @click="createModal?.show">
+						<PlusIcon />
+						{{ formatMessage(messages.createButton) }}
+					</button>
+				</ButtonStyled>
+			</div>
+		</div>
+		<Admonition v-if="error" type="critical">
+			<template #header>
+				{{ formatMessage(messages.errorTitle) }}
+			</template>
+			{{ error }}
+		</Admonition>
+		<div
+			v-else-if="!filteredAffiliates || filteredAffiliates.length === 0"
+			class="py-8 text-center"
+		>
+			<p class="text-secondary">No affiliate codes found.</p>
+		</div>
+		<div v-else class="space-y-3">
+			<AffiliateLinkCard
+				v-for="affiliate in filteredAffiliates"
+				:key="`affiliate-${affiliate.id}`"
+				:affiliate="affiliate"
+				@revoke="revokeAffiliateLink"
+			/>
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+import { PlusIcon, SearchIcon, XCircleIcon, XIcon } from '@modrinth/assets'
+import {
+	Admonition,
+	AffiliateLinkCard,
+	AffiliateLinkCreateModal,
+	Button,
+	ButtonStyled,
+	ConfirmModal,
+	injectNotificationManager,
+} from '@modrinth/ui'
+import type { AffiliateLink } from '@modrinth/utils'
+import { useVIntl } from '@vintl/vintl'
+
+const createModal = useTemplateRef<typeof AffiliateLinkCreateModal>('createModal')
+const revokeModal = useTemplateRef<typeof ConfirmModal>('revokeModal')
+
+const auth = await useAuth()
+
+const { handleError } = injectNotificationManager()
+
+const { formatMessage } = useVIntl()
+
+const {
+	data: affiliateLinks,
+	error,
+	refresh,
+} = await useAsyncData(
+	'affiliateLinks',
+	() => useBaseFetch('affiliate', { method: 'GET', internal: true }) as Promise<AffiliateLink[]>,
+)
+
+const filterQuery = ref('')
+const creatingLink = ref(false)
+
+const filteredAffiliates = computed(() =>
+	affiliateLinks
+		? affiliateLinks.value?.filter(
+				(link: AffiliateLink) =>
+					link.affiliate === auth.value?.user?.id &&
+					(filterQuery.value.trim()
+						? link.source_name.trim().toLowerCase().includes(filterQuery.value.trim().toLowerCase())
+						: true),
+			)
+		: [],
+)
+
+async function createAffiliateCode(data: { sourceName: string }) {
+	creatingLink.value = true
+
+	try {
+		await useBaseFetch('affiliate', {
+			method: 'PUT',
+			body: {
+				source_name: data.sourceName,
+			},
+			internal: true,
+		})
+
+		await refresh()
+		createModal.value?.close()
+	} catch (err) {
+		handleError(err)
+	} finally {
+		creatingLink.value = false
+	}
+}
+
+const revokingTitle = ref<string | null>(null)
+const revokingId = ref<string | null>(null)
+
+function revokeAffiliateLink(affiliate: AffiliateLink) {
+	revokingTitle.value = affiliate.source_name
+	revokingId.value = affiliate.id
+	revokeModal.value?.show()
+}
+
+async function confirmRevokeAffiliateLink() {
+	if (!revokingId.value) {
+		return
+	}
+
+	try {
+		await useBaseFetch(`affiliate/${revokingId.value}`, {
+			method: 'DELETE',
+			internal: true,
+		})
+
+		await refresh()
+		revokeModal.value?.hide()
+		revokingTitle.value = null
+		revokingId.value = null
+	} catch (err) {
+		console.error('Failed to revoke affiliate code:', err)
+	}
+}
+
+const messages = defineMessages({
+	createButton: {
+		id: 'dashboard.affiliate-links.create.button',
+		defaultMessage: 'Create affiliate link',
+	},
+	yourAffiliateLinks: {
+		id: 'dashboard.affiliate-links.header',
+		defaultMessage: 'Your affiliate links',
+	},
+	searchAffiliateLinks: {
+		id: 'dashboard.affiliate-links.search',
+		defaultMessage: 'Search affiliate links...',
+	},
+	errorTitle: {
+		id: 'dashboard.affiliate-links.error.title',
+		defaultMessage: 'Error loading affiliate links',
+	},
+	revokeConfirmButton: {
+		id: 'dashboard.affiliate-links.revoke-confirm.button',
+		defaultMessage: 'Revoke',
+	},
+	revokeConfirmTitle: {
+		id: 'dashboard.affiliate-links.revoke-confirm.title',
+		defaultMessage: "Are you sure you want to revoke your ''{title}'' affiliate link?",
+	},
+	revokeConfirmBody: {
+		id: 'dashboard.affiliate-links.revoke-confirm.body',
+		defaultMessage:
+			'This will permanently revoke the affiliate code `{id}` and any existing links with this code that have been shared will no longer be valid.',
+	},
+})
+</script>
+
+<style lang="scss" scoped>
+.page {
+	padding: 1rem;
+	margin-left: auto;
+	margin-right: auto;
+	max-width: 78.5rem;
+}
+</style>
diff --git a/apps/frontend/src/pages/servers/index.vue b/apps/frontend/src/pages/servers/index.vue
index c91d6eea..399ef51e 100644
--- a/apps/frontend/src/pages/servers/index.vue
+++ b/apps/frontend/src/pages/servers/index.vue
@@ -26,6 +26,7 @@
 			:regions="regions"
 			:refresh-payment-methods="fetchPaymentData"
 			:fetch-stock="fetchStock"
+			:affiliate-code="affiliateCode"
 		/>
 
 		<section
@@ -664,6 +665,25 @@ import ServerPlanSelector from '~/components/ui/servers/marketing/ServerPlanSele
 import { useServersFetch } from '~/composables/servers/servers-fetch.ts'
 import { products } from '~/generated/state.json'
 
+const route = useRoute()
+const router = useRouter()
+
+const { setAffiliateCode, getAffiliateCode } = useAffiliates()
+
+const affiliateCode = ref(route.query.afl ?? null)
+
+if (affiliateCode.value) {
+	router.replace({
+		query: {
+			...route.query,
+			afl: undefined,
+		},
+	})
+	setAffiliateCode(affiliateCode.value)
+} else {
+	affiliateCode.value = getAffiliateCode()
+}
+
 const { addNotification } = injectNotificationManager()
 const { locale, formatMessage } = useVIntl()
 const flags = useFeatureFlags()
@@ -853,7 +873,6 @@ async function fetchPaymentData() {
 
 const selectedProjectId = ref()
 
-const route = useRoute()
 const isAtCapacity = computed(
 	() => isSmallAtCapacity.value && isMediumAtCapacity.value && isLargeAtCapacity.value,
 )
diff --git a/apps/frontend/src/pages/user/[id].vue b/apps/frontend/src/pages/user/[id].vue
index 38182a89..a9491367 100644
--- a/apps/frontend/src/pages/user/[id].vue
+++ b/apps/frontend/src/pages/user/[id].vue
@@ -109,7 +109,18 @@
 						<Avatar :src="user.avatar_url" :alt="user.username" size="96px" circle />
 					</template>
 					<template #title>
-						{{ user.username }}
+						<span class="flex items-center gap-2">
+							{{ user.username }}
+							<TagItem
+								v-if="isAdminViewing && isAffiliate"
+								:style="{
+									'--_color': 'var(--color-brand)',
+									'--_bg-color': 'var(--color-brand-highlight)',
+								}"
+							>
+								<AffiliateIcon /> Affiliate
+							</TagItem>
+						</span>
 					</template>
 					<template #summary>
 						{{
@@ -191,6 +202,13 @@
 										action: () => navigateTo(`/admin/billing/${user.id}`),
 										shown: auth.user && isStaff(auth.user),
 									},
+									{
+										id: 'toggle-affiliate',
+										action: () => toggleAffiliate(user.id),
+										shown: isAdminViewing,
+										remainOnClick: true,
+										color: isAffiliate ? 'red' : 'orange',
+									},
 									{
 										id: 'open-info',
 										action: () => $refs.userDetailsModal.show(),
@@ -203,6 +221,7 @@
 									},
 								]"
 								aria-label="More options"
+								:dropdown-id="`${baseId}-more-options`"
 							>
 								<MoreVerticalIcon aria-hidden="true" />
 								<template #manage-projects>
@@ -229,6 +248,14 @@
 									<InfoIcon aria-hidden="true" />
 									{{ formatMessage(messages.infoButton) }}
 								</template>
+								<template #toggle-affiliate>
+									<AffiliateIcon aria-hidden="true" />
+									{{
+										formatMessage(
+											isAffiliate ? messages.removeAffiliateButton : messages.setAffiliateButton,
+										)
+									}}
+								</template>
 								<template #edit-role>
 									<EditIcon aria-hidden="true" />
 									{{ formatMessage(messages.editRoleButton) }}
@@ -411,6 +438,7 @@
 </template>
 <script setup>
 import {
+	AffiliateIcon,
 	BoxIcon,
 	CalendarIcon,
 	CheckIcon,
@@ -437,10 +465,11 @@ import {
 	injectNotificationManager,
 	NewModal,
 	OverflowMenu,
+	TagItem,
 	TeleportDropdownMenu,
 	useRelativeTime,
 } from '@modrinth/ui'
-import { isAdmin } from '@modrinth/utils'
+import { isAdmin, UserBadge } from '@modrinth/utils'
 import { IntlFormatted } from '@vintl/vintl/components'
 
 import TenMClubBadge from '~/assets/images/badges/10m-club.svg?component'
@@ -475,6 +504,8 @@ const formatRelativeTime = useRelativeTime()
 
 const { addNotification } = injectNotificationManager()
 
+const baseId = useId()
+
 const messages = defineMessages({
 	profileProjectsLabel: {
 		id: 'profile.label.projects',
@@ -599,6 +630,18 @@ const messages = defineMessages({
 		id: 'profile.button.info',
 		defaultMessage: 'View user details',
 	},
+	setAffiliateButton: {
+		id: 'profile.button.set-affiliate',
+		defaultMessage: 'Set as affiliate',
+	},
+	removeAffiliateButton: {
+		id: 'profile.button.remove-affiliate',
+		defaultMessage: 'Remove as affiliate',
+	},
+	affiliateLabel: {
+		id: 'profile.label.affiliate',
+		defaultMessage: 'Affiliate',
+	},
 	editRoleButton: {
 		id: 'profile.button.edit-role',
 		defaultMessage: 'Edit role',
@@ -609,38 +652,42 @@ const messages = defineMessages({
 	},
 })
 
-let user, projects, organizations, collections
+let user, projects, organizations, collections, refreshUser
 try {
-	;[{ data: user }, { data: projects }, { data: organizations }, { data: collections }] =
-		await Promise.all([
-			useAsyncData(`user/${route.params.id}`, () => useBaseFetch(`user/${route.params.id}`)),
-			useAsyncData(
-				`user/${route.params.id}/projects`,
-				() => useBaseFetch(`user/${route.params.id}/projects`),
-				{
-					transform: (projects) => {
-						for (const project of projects) {
-							project.categories = project.categories.concat(project.loaders)
-							project.project_type = data.$getProjectTypeForUrl(
-								project.project_type,
-								project.categories,
-								tags.value,
-							)
-						}
+	;[
+		{ data: user, refresh: refreshUser },
+		{ data: projects },
+		{ data: organizations },
+		{ data: collections },
+	] = await Promise.all([
+		useAsyncData(`user/${route.params.id}`, () => useBaseFetch(`user/${route.params.id}`)),
+		useAsyncData(
+			`user/${route.params.id}/projects`,
+			() => useBaseFetch(`user/${route.params.id}/projects`),
+			{
+				transform: (projects) => {
+					for (const project of projects) {
+						project.categories = project.categories.concat(project.loaders)
+						project.project_type = data.$getProjectTypeForUrl(
+							project.project_type,
+							project.categories,
+							tags.value,
+						)
+					}
 
-						return projects
-					},
+					return projects
 				},
-			),
-			useAsyncData(`user/${route.params.id}/organizations`, () =>
-				useBaseFetch(`user/${route.params.id}/organizations`, {
-					apiVersion: 3,
-				}),
-			),
-			useAsyncData(`user/${route.params.id}/collections`, () =>
-				useBaseFetch(`user/${route.params.id}/collections`, { apiVersion: 3 }),
-			),
-		])
+			},
+		),
+		useAsyncData(`user/${route.params.id}/organizations`, () =>
+			useBaseFetch(`user/${route.params.id}/organizations`, {
+				apiVersion: 3,
+			}),
+		),
+		useAsyncData(`user/${route.params.id}/collections`, () =>
+			useBaseFetch(`user/${route.params.id}/collections`, { apiVersion: 3 }),
+		),
+	])
 } catch {
 	throw createError({
 		fatal: true,
@@ -764,6 +811,17 @@ async function copyPermalink() {
 	await navigator.clipboard.writeText(`${config.public.siteUrl}/user/${user.value.id}`)
 }
 
+const isAffiliate = computed(() => user.value.badges & UserBadge.AFFILIATE)
+const isAdminViewing = computed(() => isAdmin(auth.value.user))
+
+async function toggleAffiliate(id) {
+	await useBaseFetch(`user/${id}`, {
+		method: 'PATCH',
+		body: { badges: user.value.badges ^ (1 << 7) },
+	})
+	refreshUser()
+}
+
 const navLinks = computed(() => [
 	{
 		label: formatMessage(commonMessages.allProjectType),
diff --git a/packages/assets/external/facebook.svg b/packages/assets/external/facebook.svg
new file mode 100644
index 00000000..e4eab31e
--- /dev/null
+++ b/packages/assets/external/facebook.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><title>Facebook</title><path d="M9.101 23.691v-7.98H6.627v-3.667h2.474v-1.58c0-4.085 1.848-5.978 5.858-5.978.401 0 .955.042 1.468.103a8.68 8.68 0 0 1 1.141.195v3.325a8.623 8.623 0 0 0-.653-.036 26.805 26.805 0 0 0-.733-.009c-.707 0-1.259.096-1.675.309a1.686 1.686 0 0 0-.679.622c-.258.42-.374.995-.374 1.752v1.297h3.919l-.386 2.103-.287 1.564h-3.246v8.245C19.396 23.238 24 18.179 24 12.044c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 5.628 3.874 10.35 9.101 11.647Z"/></svg>
diff --git a/packages/assets/external/instagram.svg b/packages/assets/external/instagram.svg
new file mode 100644
index 00000000..f8aedef2
--- /dev/null
+++ b/packages/assets/external/instagram.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><title>Instagram</title><path d="M7.0301.084c-1.2768.0602-2.1487.264-2.911.5634-.7888.3075-1.4575.72-2.1228 1.3877-.6652.6677-1.075 1.3368-1.3802 2.127-.2954.7638-.4956 1.6365-.552 2.914-.0564 1.2775-.0689 1.6882-.0626 4.947.0062 3.2586.0206 3.6671.0825 4.9473.061 1.2765.264 2.1482.5635 2.9107.308.7889.72 1.4573 1.388 2.1228.6679.6655 1.3365 1.0743 2.1285 1.38.7632.295 1.6361.4961 2.9134.552 1.2773.056 1.6884.069 4.9462.0627 3.2578-.0062 3.668-.0207 4.9478-.0814 1.28-.0607 2.147-.2652 2.9098-.5633.7889-.3086 1.4578-.72 2.1228-1.3881.665-.6682 1.0745-1.3378 1.3795-2.1284.2957-.7632.4966-1.636.552-2.9124.056-1.2809.0692-1.6898.063-4.948-.0063-3.2583-.021-3.6668-.0817-4.9465-.0607-1.2797-.264-2.1487-.5633-2.9117-.3084-.7889-.72-1.4568-1.3876-2.1228C21.2982 1.33 20.628.9208 19.8378.6165 19.074.321 18.2017.1197 16.9244.0645 15.6471.0093 15.236-.005 11.977.0014 8.718.0076 8.31.0215 7.0301.0839m.1402 21.6932c-1.17-.0509-1.8053-.2453-2.2287-.408-.5606-.216-.96-.4771-1.3819-.895-.422-.4178-.6811-.8186-.9-1.378-.1644-.4234-.3624-1.058-.4171-2.228-.0595-1.2645-.072-1.6442-.079-4.848-.007-3.2037.0053-3.583.0607-4.848.05-1.169.2456-1.805.408-2.2282.216-.5613.4762-.96.895-1.3816.4188-.4217.8184-.6814 1.3783-.9003.423-.1651 1.0575-.3614 2.227-.4171 1.2655-.06 1.6447-.072 4.848-.079 3.2033-.007 3.5835.005 4.8495.0608 1.169.0508 1.8053.2445 2.228.408.5608.216.96.4754 1.3816.895.4217.4194.6816.8176.9005 1.3787.1653.4217.3617 1.056.4169 2.2263.0602 1.2655.0739 1.645.0796 4.848.0058 3.203-.0055 3.5834-.061 4.848-.051 1.17-.245 1.8055-.408 2.2294-.216.5604-.4763.96-.8954 1.3814-.419.4215-.8181.6811-1.3783.9-.4224.1649-1.0577.3617-2.2262.4174-1.2656.0595-1.6448.072-4.8493.079-3.2045.007-3.5825-.006-4.848-.0608M16.953 5.5864A1.44 1.44 0 1 0 18.39 4.144a1.44 1.44 0 0 0-1.437 1.4424M5.8385 12.012c.0067 3.4032 2.7706 6.1557 6.173 6.1493 3.4026-.0065 6.157-2.7701 6.1506-6.1733-.0065-3.4032-2.771-6.1565-6.174-6.1498-3.403.0067-6.156 2.771-6.1496 6.1738M8 12.0077a4 4 0 1 1 4.008 3.9921A3.9996 3.9996 0 0 1 8 12.0077"/></svg>
diff --git a/packages/assets/external/reels.svg b/packages/assets/external/reels.svg
new file mode 100644
index 00000000..fedd451f
--- /dev/null
+++ b/packages/assets/external/reels.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 122.14 122.88" fill="currentColor">
+  <path d="M35.14 0H87c9.65 0 18.43 3.96 24.8 10.32 6.38 6.37 10.34 15.16 10.34 24.82v52.61c0 9.64-3.96 18.42-10.32 24.79l-.02.02c-6.38 6.37-15.16 10.32-24.79 10.32H35.14c-9.66 0-18.45-3.96-24.82-10.32l-.24-.27C3.86 105.95 0 97.27 0 87.74v-52.6c0-9.67 3.95-18.45 10.32-24.82S25.47 0 35.14 0zm56.37 31.02.07.11h21.6c-.87-5.68-3.58-10.78-7.48-14.69-4.8-4.8-11.42-7.78-18.7-7.78h-8.87l13.38 22.36zm-9.99.11L68.07 8.66h-29.5l13.61 22.47h29.34zm-39.41 0L28.95 9.39a26.446 26.446 0 0 0-12.51 7.05c-3.9 3.9-6.6 9.01-7.48 14.69h33.15zm71.37 8.66H8.66v47.96c0 7.17 2.89 13.7 7.56 18.48l.22.21c4.8 4.8 11.43 7.79 18.7 7.79H87c7.28 0 13.9-2.98 18.69-7.77l.02-.02c4.79-4.79 7.77-11.41 7.77-18.69V39.79zM50.95 54.95 77.78 72.4c.43.28.82.64 1.13 1.08a3.9 3.9 0 0 1-1 5.42L51.19 94.67c-.67.55-1.53.88-2.48.88a3.91 3.91 0 0 1-3.91-3.91V58.15h.02a3.902 3.902 0 0 1 6.13-3.2z"/>
+</svg>
diff --git a/packages/assets/external/snapchat.svg b/packages/assets/external/snapchat.svg
new file mode 100644
index 00000000..8bdf9f0d
--- /dev/null
+++ b/packages/assets/external/snapchat.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><title>Snapchat</title><path d="M12.206.793c.99 0 4.347.276 5.93 3.821.529 1.193.403 3.219.299 4.847l-.003.06c-.012.18-.022.345-.03.51.075.045.203.09.401.09.3-.016.659-.12 1.033-.301.165-.088.344-.104.464-.104.182 0 .359.029.509.09.45.149.734.479.734.838.015.449-.39.839-1.213 1.168-.089.029-.209.075-.344.119-.45.135-1.139.36-1.333.81-.09.224-.061.524.12.868l.015.015c.06.136 1.526 3.475 4.791 4.014.255.044.435.27.42.509 0 .075-.015.149-.045.225-.24.569-1.273.988-3.146 1.271-.059.091-.12.375-.164.57-.029.179-.074.36-.134.553-.076.271-.27.405-.555.405h-.03c-.135 0-.313-.031-.538-.074-.36-.075-.765-.135-1.273-.135-.3 0-.599.015-.913.074-.6.104-1.123.464-1.723.884-.853.599-1.826 1.288-3.294 1.288-.06 0-.119-.015-.18-.015h-.149c-1.468 0-2.427-.675-3.279-1.288-.599-.42-1.107-.779-1.707-.884-.314-.045-.629-.074-.928-.074-.54 0-.958.089-1.272.149-.211.043-.391.074-.54.074-.374 0-.523-.224-.583-.42-.061-.192-.09-.389-.135-.567-.046-.181-.105-.494-.166-.57-1.918-.222-2.95-.642-3.189-1.226-.031-.063-.052-.15-.055-.225-.015-.243.165-.465.42-.509 3.264-.54 4.73-3.879 4.791-4.02l.016-.029c.18-.345.224-.645.119-.869-.195-.434-.884-.658-1.332-.809-.121-.029-.24-.074-.346-.119-1.107-.435-1.257-.93-1.197-1.273.09-.479.674-.793 1.168-.793.146 0 .27.029.383.074.42.194.789.3 1.104.3.234 0 .384-.06.465-.105l-.046-.569c-.098-1.626-.225-3.651.307-4.837C7.392 1.077 10.739.807 11.727.807l.419-.015h.06z"/></svg>
diff --git a/packages/assets/external/threads.svg b/packages/assets/external/threads.svg
new file mode 100644
index 00000000..bd216a4f
--- /dev/null
+++ b/packages/assets/external/threads.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><title>Threads</title><path d="M12.186 24h-.007c-3.581-.024-6.334-1.205-8.184-3.509C2.35 18.44 1.5 15.586 1.472 12.01v-.017c.03-3.579.879-6.43 2.525-8.482C5.845 1.205 8.6.024 12.18 0h.014c2.746.02 5.043.725 6.826 2.098 1.677 1.29 2.858 3.13 3.509 5.467l-2.04.569c-1.104-3.96-3.898-5.984-8.304-6.015-2.91.022-5.11.936-6.54 2.717C4.307 6.504 3.616 8.914 3.589 12c.027 3.086.718 5.496 2.057 7.164 1.43 1.783 3.631 2.698 6.54 2.717 2.623-.02 4.358-.631 5.8-2.045 1.647-1.613 1.618-3.593 1.09-4.798-.31-.71-.873-1.3-1.634-1.75-.192 1.352-.622 2.446-1.284 3.272-.886 1.102-2.14 1.704-3.73 1.79-1.202.065-2.361-.218-3.259-.801-1.063-.689-1.685-1.74-1.752-2.964-.065-1.19.408-2.285 1.33-3.082.88-.76 2.119-1.207 3.583-1.291a13.853 13.853 0 0 1 3.02.142c-.126-.742-.375-1.332-.75-1.757-.513-.586-1.308-.883-2.359-.89h-.029c-.844 0-1.992.232-2.721 1.32L7.734 7.847c.98-1.454 2.568-2.256 4.478-2.256h.044c3.194.02 5.097 1.975 5.287 5.388.108.046.216.094.321.142 1.49.7 2.58 1.761 3.154 3.07.797 1.82.871 4.79-1.548 7.158-1.85 1.81-4.094 2.628-7.277 2.65Zm1.003-11.69c-.242 0-.487.007-.739.021-1.836.103-2.98.946-2.916 2.143.067 1.256 1.452 1.839 2.784 1.767 1.224-.065 2.818-.543 3.086-3.71a10.5 10.5 0 0 0-2.215-.221z"/></svg>
diff --git a/packages/assets/external/tiktok.svg b/packages/assets/external/tiktok.svg
new file mode 100644
index 00000000..f72cac1b
--- /dev/null
+++ b/packages/assets/external/tiktok.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><title>TikTok</title><path d="M12.525.02c1.31-.02 2.61-.01 3.91-.02.08 1.53.63 3.09 1.75 4.17 1.12 1.11 2.7 1.62 4.24 1.79v4.03c-1.44-.05-2.89-.35-4.2-.97-.57-.26-1.1-.59-1.62-.93-.01 2.92.01 5.84-.02 8.75-.08 1.4-.54 2.79-1.35 3.94-1.31 1.92-3.58 3.17-5.91 3.21-1.43.08-2.86-.31-4.08-1.03-2.02-1.19-3.44-3.37-3.65-5.71-.02-.5-.03-1-.01-1.49.18-1.9 1.12-3.72 2.58-4.96 1.66-1.44 3.98-2.13 6.15-1.72.02 1.48-.04 2.96-.04 4.44-.99-.32-2.15-.23-3.02.37-.63.41-1.11 1.04-1.36 1.75-.21.51-.15 1.07-.14 1.61.24 1.64 1.82 3.02 3.5 2.87 1.12-.01 2.19-.66 2.77-1.61.19-.33.4-.67.41-1.06.1-1.79.06-3.57.07-5.36.01-4.03-.01-8.05.02-12.07z"/></svg>
diff --git a/packages/assets/external/twitch.svg b/packages/assets/external/twitch.svg
new file mode 100644
index 00000000..fc495a91
--- /dev/null
+++ b/packages/assets/external/twitch.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><title>Twitch</title><path d="M11.571 4.714h1.715v5.143H11.57zm4.715 0H18v5.143h-1.714zM6 0L1.714 4.286v15.428h5.143V24l4.286-4.286h3.428L22.286 12V0zm14.571 11.143l-3.428 3.428h-3.429l-3 3v-3H6.857V1.714h13.714Z"/></svg>
diff --git a/packages/assets/external/youtubegaming.svg b/packages/assets/external/youtubegaming.svg
new file mode 100644
index 00000000..6404379d
--- /dev/null
+++ b/packages/assets/external/youtubegaming.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><title>YouTube Gaming</title><path d="M24 13.2v-6l-6-3.6-6 3.6-6-3.6-6 3.6v6l12 7.2zM8.4 10.8H6v2.4H4.8v-2.4H2.4V9.6h2.4V7.2H6v2.4h2.4zm7.2 2.4a1.2 1.2 0 01-1.2-1.2c0-.66.54-1.2 1.2-1.2.66 0 1.2.54 1.2 1.2 0 .66-.54 1.2-1.2 1.2zm3.6-2.4A1.2 1.2 0 0118 9.6c0-.66.54-1.2 1.2-1.2.66 0 1.2.54 1.2 1.2 0 .66-.54 1.2-1.2 1.2Z"/></svg>
diff --git a/packages/assets/external/youtubeshorts.svg b/packages/assets/external/youtubeshorts.svg
new file mode 100644
index 00000000..4ba1f148
--- /dev/null
+++ b/packages/assets/external/youtubeshorts.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><title>YouTube Shorts</title><path d="m18.931 9.99-1.441-.601 1.717-.913a4.48 4.48 0 0 0 1.874-6.078 4.506 4.506 0 0 0-6.09-1.874L4.792 5.929a4.504 4.504 0 0 0-2.402 4.193 4.521 4.521 0 0 0 2.666 3.904c.036.012 1.442.6 1.442.6l-1.706.901a4.51 4.51 0 0 0-2.369 3.967A4.528 4.528 0 0 0 6.93 24c.725 0 1.437-.174 2.08-.508l10.21-5.406a4.494 4.494 0 0 0 2.39-4.192 4.525 4.525 0 0 0-2.678-3.904ZM9.597 15.19V8.824l6.007 3.184z"/></svg>
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index f92d43dd..b919290f 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -1,6 +1,7 @@
 // Auto-generated icon imports and exports
 // Do not edit this file manually - run 'pnpm run fix' to regenerate
 
+import _AffiliateIcon from './icons/affiliate.svg?component'
 import _AlignLeftIcon from './icons/align-left.svg?component'
 import _ArchiveIcon from './icons/archive.svg?component'
 import _ArrowBigRightDashIcon from './icons/arrow-big-right-dash.svg?component'
@@ -30,6 +31,7 @@ import _CheckCheckIcon from './icons/check-check.svg?component'
 import _CheckCircleIcon from './icons/check-circle.svg?component'
 import _ChevronLeftIcon from './icons/chevron-left.svg?component'
 import _ChevronRightIcon from './icons/chevron-right.svg?component'
+import _CircleUserIcon from './icons/circle-user.svg?component'
 import _ClearIcon from './icons/clear.svg?component'
 import _ClientIcon from './icons/client.svg?component'
 import _ClipboardCopyIcon from './icons/clipboard-copy.svg?component'
@@ -190,6 +192,7 @@ import _UploadIcon from './icons/upload.svg?component'
 import _UserIcon from './icons/user.svg?component'
 import _UserCogIcon from './icons/user-cog.svg?component'
 import _UserPlusIcon from './icons/user-plus.svg?component'
+import _UserSearchIcon from './icons/user-search.svg?component'
 import _UserXIcon from './icons/user-x.svg?component'
 import _UsersIcon from './icons/users.svg?component'
 import _VersionIcon from './icons/version.svg?component'
@@ -202,6 +205,7 @@ import _XCircleIcon from './icons/x-circle.svg?component'
 import _ZoomInIcon from './icons/zoom-in.svg?component'
 import _ZoomOutIcon from './icons/zoom-out.svg?component'
 
+export const AffiliateIcon = _AffiliateIcon
 export const AlignLeftIcon = _AlignLeftIcon
 export const ArchiveIcon = _ArchiveIcon
 export const ArrowBigRightDashIcon = _ArrowBigRightDashIcon
@@ -231,6 +235,7 @@ export const CheckCircleIcon = _CheckCircleIcon
 export const CheckIcon = _CheckIcon
 export const ChevronLeftIcon = _ChevronLeftIcon
 export const ChevronRightIcon = _ChevronRightIcon
+export const CircleUserIcon = _CircleUserIcon
 export const ClearIcon = _ClearIcon
 export const ClientIcon = _ClientIcon
 export const ClipboardCopyIcon = _ClipboardCopyIcon
@@ -390,6 +395,7 @@ export const UpdatedIcon = _UpdatedIcon
 export const UploadIcon = _UploadIcon
 export const UserCogIcon = _UserCogIcon
 export const UserPlusIcon = _UserPlusIcon
+export const UserSearchIcon = _UserSearchIcon
 export const UserXIcon = _UserXIcon
 export const UserIcon = _UserIcon
 export const UsersIcon = _UsersIcon
diff --git a/packages/assets/icons/affiliate.svg b/packages/assets/icons/affiliate.svg
new file mode 100644
index 00000000..97551e69
--- /dev/null
+++ b/packages/assets/icons/affiliate.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+  <g>
+    <circle cx="12" cy="12" r="7"/>
+    <circle cx="12" cy="10.6" r="2.1"/>
+    <circle cx="3.7" cy="3.7" r="1.8"/>
+    <circle cx="20.3" cy="3.7" r="1.8"/>
+    <circle cx="3.7" cy="20.3" r="1.8"/>
+    <circle cx="20.3" cy="20.3" r="1.8"/>
+    <path d="M8.5 18.1v-1.2c0-.8.6-1.4 1.4-1.4h4.2c.8 0 1.4.6 1.4 1.4v1.2M17 7l2-2M5 19l2-2M17 17l2 2M5 5l2 2"/>
+  </g>
+</svg>
diff --git a/packages/assets/icons/circle-user.svg b/packages/assets/icons/circle-user.svg
new file mode 100644
index 00000000..d34434b7
--- /dev/null
+++ b/packages/assets/icons/circle-user.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-user-icon lucide-circle-user"><circle cx="12" cy="12" r="10"/><circle cx="12" cy="10" r="3"/><path d="M7 20.662V19a2 2 0 0 1 2-2h6a2 2 0 0 1 2 2v1.662"/></svg>
\ No newline at end of file
diff --git a/packages/assets/icons/user-search.svg b/packages/assets/icons/user-search.svg
new file mode 100644
index 00000000..26c73dd8
--- /dev/null
+++ b/packages/assets/icons/user-search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-user-search-icon lucide-user-search"><circle cx="10" cy="7" r="4"/><path d="M10.3 15H7a4 4 0 0 0-4 4v2"/><circle cx="17" cy="17" r="3"/><path d="m21 21-1.9-1.9"/></svg>
\ No newline at end of file
diff --git a/packages/assets/index.ts b/packages/assets/index.ts
index 18c01870..a6280039 100644
--- a/packages/assets/index.ts
+++ b/packages/assets/index.ts
@@ -23,29 +23,38 @@ import _SleepingRinthbot from './branding/rinthbot/sleeping.webp'
 import _SobbingRinthbot from './branding/rinthbot/sobbing.webp'
 import _ThinkingRinthbot from './branding/rinthbot/thinking.webp'
 import _WavingRinthbot from './branding/rinthbot/waving.webp'
+// External Icons
 import _AppleIcon from './external/apple.svg?component'
 import _BlueskyIcon from './external/bluesky.svg?component'
 import _BuyMeACoffeeIcon from './external/bmac.svg?component'
 import _CurseForgeIcon from './external/curseforge.svg?component'
 import _DiscordIcon from './external/discord.svg?component'
+import _FacebookIcon from './external/facebook.svg?component'
 import _GithubIcon from './external/github.svg?component'
+import _InstagramIcon from './external/instagram.svg?component'
 import _KoFiIcon from './external/kofi.svg?component'
 import _MastodonIcon from './external/mastodon.svg?component'
 import _OpenCollectiveIcon from './external/opencollective.svg?component'
 import _PatreonIcon from './external/patreon.svg?component'
 import _PayPalIcon from './external/paypal.svg?component'
 import _RedditIcon from './external/reddit.svg?component'
-// External Icons
+import _ReelsIcon from './external/reels.svg?component'
+import _SnapchatIcon from './external/snapchat.svg?component'
 import _SSODiscordIcon from './external/sso/discord.svg?component'
 import _SSOGitHubIcon from './external/sso/github.svg?component'
 import _SSOGitLabIcon from './external/sso/gitlab.svg?component'
 import _SSOGoogleIcon from './external/sso/google.svg?component'
 import _SSOMicrosoftIcon from './external/sso/microsoft.svg?component'
 import _SSOSteamIcon from './external/sso/steam.svg?component'
+import _ThreadsIcon from './external/threads.svg?component'
+import _TikTokIcon from './external/tiktok.svg?component'
 import _TumblrIcon from './external/tumblr.svg?component'
+import _TwitchIcon from './external/twitch.svg?component'
 import _TwitterIcon from './external/twitter.svg?component'
 import _WindowsIcon from './external/windows.svg?component'
 import _YouTubeIcon from './external/youtube.svg?component'
+import _YouTubeGaming from './external/youtubegaming.svg?component'
+import _YouTubeShortsIcon from './external/youtubeshorts.svg?component'
 
 export const ModrinthIcon = _ModrinthIcon
 export const BrowserWindowSuccessIllustration = _BrowserWindowSuccessIllustration
@@ -73,6 +82,13 @@ export const BuyMeACoffeeIcon = _BuyMeACoffeeIcon
 export const GithubIcon = _GithubIcon
 export const CurseForgeIcon = _CurseForgeIcon
 export const DiscordIcon = _DiscordIcon
+export const FacebookIcon = _FacebookIcon
+export const InstagramIcon = _InstagramIcon
+export const SnapchatIcon = _SnapchatIcon
+export const ReelsIcon = _ReelsIcon
+export const TikTokIcon = _TikTokIcon
+export const TwitchIcon = _TwitchIcon
+export const ThreadsIcon = _ThreadsIcon
 export const KoFiIcon = _KoFiIcon
 export const MastodonIcon = _MastodonIcon
 export const OpenCollectiveIcon = _OpenCollectiveIcon
@@ -83,6 +99,8 @@ export const TumblrIcon = _TumblrIcon
 export const TwitterIcon = _TwitterIcon
 export const WindowsIcon = _WindowsIcon
 export const YouTubeIcon = _YouTubeIcon
+export const YouTubeGaming = _YouTubeGaming
+export const YouTubeShortsIcon = _YouTubeShortsIcon
 
 export * from './generated-icons'
 export { default as ClassicPlayerModel } from './models/classic-player.gltf?url'
diff --git a/packages/ui/src/components/affiliate/AffiliateLinkCard.vue b/packages/ui/src/components/affiliate/AffiliateLinkCard.vue
new file mode 100644
index 00000000..f34de6cd
--- /dev/null
+++ b/packages/ui/src/components/affiliate/AffiliateLinkCard.vue
@@ -0,0 +1,72 @@
+<template>
+	<div class="card-shadow flex flex-col gap-4 rounded-2xl bg-bg-raised p-4">
+		<div class="flex items-center gap-4">
+			<div
+				class="flex items-center justify-center rounded-xl border-[1px] border-solid border-button-border bg-button-bg p-2"
+			>
+				<AutoBrandIcon :keyword="affiliate.source_name" class="h-6 w-6">
+					<AffiliateIcon />
+				</AutoBrandIcon>
+			</div>
+			<div class="flex flex-col">
+				<span class="w-fit text-lg font-bold text-contrast">
+					{{ affiliate.source_name }}
+				</span>
+				<span v-if="createdBy" class="text-sm text-secondary">
+					{{ formatMessage(messages.createdBy, { user: createdBy }) }}
+				</span>
+			</div>
+			<div class="ml-auto flex items-center gap-2">
+				<slot />
+				<ButtonStyled v-if="showRevoke" color="red" color-fill="text">
+					<button @click="emit('revoke', affiliate)">
+						<XCircleIcon />
+						{{ formatMessage(messages.revokeAffiliateLink) }}
+					</button>
+				</ButtonStyled>
+			</div>
+		</div>
+		<CopyCode :text="`https://modrinth.gg?afl=${affiliate.id}`" />
+	</div>
+</template>
+
+<script setup lang="ts">
+import { AffiliateIcon, XCircleIcon } from '@modrinth/assets'
+import type { AffiliateLink } from '@modrinth/utils'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+
+import { AutoBrandIcon, ButtonStyled, CopyCode } from '../index.ts'
+
+withDefaults(
+	defineProps<{
+		affiliate: AffiliateLink
+		showRevoke?: boolean
+		createdBy?: string
+	}>(),
+	{
+		showRevoke: true,
+		createdBy: undefined,
+	},
+)
+
+const emit = defineEmits<{
+	(e: 'revoke', affiliate: AffiliateLink): void
+}>()
+
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	viewAnalytics: {
+		id: 'affiliate.viewAnalytics',
+		defaultMessage: 'View analytics',
+	},
+	revokeAffiliateLink: {
+		id: 'affiliate.revoke',
+		defaultMessage: 'Revoke affiliate link',
+	},
+	createdBy: {
+		id: 'affiliate.createdBy',
+		defaultMessage: 'Created by {user}',
+	},
+})
+</script>
diff --git a/packages/ui/src/components/affiliate/AffiliateLinkCreateModal.vue b/packages/ui/src/components/affiliate/AffiliateLinkCreateModal.vue
new file mode 100644
index 00000000..cd77349e
--- /dev/null
+++ b/packages/ui/src/components/affiliate/AffiliateLinkCreateModal.vue
@@ -0,0 +1,165 @@
+<template>
+	<NewModal ref="modal" :header="formatMessage(messages.createHeader)">
+		<div class="flex flex-col">
+			<label v-if="showUserField" class="contents" for="create-affiliate-user-input">
+				<span class="text-lg font-semibold text-contrast mb-1">
+					{{ formatMessage(messages.createUserLabel) }}
+				</span>
+				<span class="text-secondary mb-2">{{ formatMessage(messages.createUserDescription) }}</span>
+			</label>
+			<div v-if="showUserField" class="mb-4">
+				<div class="iconified-input">
+					<UserIcon aria-hidden="true" />
+					<input
+						id="create-affiliate-user-input"
+						v-model="affiliateUsername"
+						class="card-shadow"
+						autocomplete="off"
+						spellcheck="false"
+						type="text"
+						:placeholder="formatMessage(messages.createUserPlaceholder)"
+					/>
+					<Button v-if="affiliateUsername" class="r-btn" @click="() => (affiliateUsername = '')">
+						<XIcon />
+					</Button>
+				</div>
+			</div>
+			<label class="contents" for="create-affiliate-title-input">
+				<span class="text-lg font-semibold text-contrast mb-1">
+					{{ formatMessage(messages.createTitleLabel) }}
+				</span>
+				<span class="text-secondary mb-2">{{
+					formatMessage(messages.createTitleDescription)
+				}}</span>
+			</label>
+			<div class="flex items-center gap-2">
+				<div class="iconified-input">
+					<AutoBrandIcon :keyword="affiliateLinkTitle" aria-hidden="true">
+						<AffiliateIcon />
+					</AutoBrandIcon>
+					<input
+						id="create-affiliate-title-input"
+						v-model="affiliateLinkTitle"
+						class="card-shadow"
+						autocomplete="off"
+						spellcheck="false"
+						type="text"
+						:placeholder="formatMessage(messages.createTitlePlaceholder)"
+					/>
+					<Button v-if="affiliateLinkTitle" class="r-btn" @click="() => (affiliateLinkTitle = '')">
+						<XIcon />
+					</Button>
+				</div>
+				<ButtonStyled color="brand">
+					<button :disabled="creatingLink || !canCreate" @click="createAffiliateLink">
+						<SpinnerIcon v-if="creatingLink" class="animate-spin" />
+						<PlusIcon v-else />
+						{{ formatMessage(creatingLink ? messages.creatingButton : messages.createButton) }}
+					</button>
+				</ButtonStyled>
+			</div>
+		</div>
+	</NewModal>
+</template>
+<script lang="ts"></script>
+<script setup lang="ts">
+import { AffiliateIcon, PlusIcon, SpinnerIcon, UserIcon, XIcon } from '@modrinth/assets'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { computed, ref, useTemplateRef } from 'vue'
+
+import { AutoBrandIcon, Button, ButtonStyled, NewModal } from '../index.ts'
+export type CreateAffiliateProps = { sourceName: string; username?: string }
+
+const props = withDefaults(
+	defineProps<{
+		showUserField?: boolean
+		creatingLink?: boolean
+	}>(),
+	{
+		showUserField: false,
+		creatingLink: false,
+	},
+)
+
+const emit = defineEmits<{
+	(e: 'create', data: CreateAffiliateProps): void
+}>()
+
+const modal = useTemplateRef<typeof NewModal>('modal')
+const { formatMessage } = useVIntl()
+
+const affiliateLinkTitle = ref('')
+const affiliateUsername = ref('')
+
+const canCreate = computed(() => {
+	if (props.showUserField) {
+		return affiliateLinkTitle.value.trim() && affiliateUsername.value.trim()
+	}
+	return affiliateLinkTitle.value.trim()
+})
+
+function createAffiliateLink() {
+	if (!canCreate.value) {
+		return
+	}
+
+	emit('create', {
+		sourceName: affiliateLinkTitle.value,
+		username: props.showUserField ? affiliateUsername.value : undefined,
+	})
+}
+
+function close() {
+	modal.value?.hide()
+	affiliateLinkTitle.value = ''
+	affiliateUsername.value = ''
+}
+
+function show() {
+	modal.value?.show()
+}
+
+defineExpose({
+	show,
+	close,
+})
+
+const messages = defineMessages({
+	createHeader: {
+		id: 'affiliate.create.header',
+		defaultMessage: 'Creating new affiliate code',
+	},
+	createTitleLabel: {
+		id: 'affiliate.create.title.label',
+		defaultMessage: 'Title of affiliate link',
+	},
+	createTitleDescription: {
+		id: 'affiliate.create.title.description',
+		defaultMessage: 'Give your affiliate link a name so you know where people are coming from!',
+	},
+	createTitlePlaceholder: {
+		id: 'affiliate.create.title.placeholder',
+		defaultMessage: 'e.g. YouTube',
+	},
+	createUserLabel: {
+		id: 'affiliate.create.user.label',
+		defaultMessage: 'Username',
+	},
+	createUserDescription: {
+		id: 'affiliate.create.user.description',
+		defaultMessage: 'The username of the user to create the affiliate code for',
+	},
+	createUserPlaceholder: {
+		id: 'affiliate.create.user.placeholder',
+		defaultMessage: 'Enter username...',
+	},
+	createButton: {
+		id: 'affiliate.create.button',
+		defaultMessage: 'Create affiliate link',
+	},
+	creatingButton: {
+		id: 'affiliate.creating.button',
+		defaultMessage: 'Creating affiliate link...',
+	},
+})
+</script>
diff --git a/packages/ui/src/components/base/AutoBrandIcon.vue b/packages/ui/src/components/base/AutoBrandIcon.vue
new file mode 100644
index 00000000..71cb60b1
--- /dev/null
+++ b/packages/ui/src/components/base/AutoBrandIcon.vue
@@ -0,0 +1,153 @@
+<script setup lang="ts">
+import {
+	AppleIcon,
+	BlueskyIcon,
+	BuyMeACoffeeIcon,
+	CurseForgeIcon,
+	DiscordIcon,
+	FacebookIcon,
+	GithubIcon,
+	InstagramIcon,
+	KoFiIcon,
+	MastodonIcon,
+	ModrinthIcon,
+	OpenCollectiveIcon,
+	PatreonIcon,
+	PayPalIcon,
+	RedditIcon,
+	ReelsIcon,
+	SnapchatIcon,
+	ThreadsIcon,
+	TikTokIcon,
+	TumblrIcon,
+	TwitchIcon,
+	TwitterIcon,
+	WindowsIcon,
+	YouTubeGaming,
+	YouTubeIcon,
+	YouTubeShortsIcon,
+} from '@modrinth/assets'
+import { computed } from 'vue'
+
+const props = defineProps<{
+	keyword: string
+}>()
+
+const services = [
+	{
+		icon: AppleIcon,
+		keywords: ['apple'],
+	},
+	{
+		icon: BlueskyIcon,
+		keywords: ['bluesky', 'bsky', 'blue sky'],
+	},
+	{
+		icon: BuyMeACoffeeIcon,
+		keywords: ['buymeacoffee', 'bmac', 'buy me a coffee'],
+	},
+	{
+		icon: DiscordIcon,
+		keywords: ['discord'],
+	},
+	{
+		icon: FacebookIcon,
+		keywords: ['facebook', 'fb', 'face book'],
+	},
+	{
+		icon: GithubIcon,
+		keywords: ['github', 'gh', 'git hub'],
+	},
+	{
+		icon: ThreadsIcon,
+		keywords: ['threads'],
+	},
+	{
+		icon: InstagramIcon,
+		keywords: ['instagram', 'ig', 'insta'],
+	},
+	{
+		icon: KoFiIcon,
+		keywords: ['ko-fi', 'kofi', 'ko fi'],
+	},
+	{
+		icon: MastodonIcon,
+		keywords: ['mastodon'],
+	},
+	{
+		icon: OpenCollectiveIcon,
+		keywords: ['opencollective', 'open collective'],
+	},
+	{
+		icon: PatreonIcon,
+		keywords: ['patreon'],
+	},
+	{
+		icon: PayPalIcon,
+		keywords: ['paypal', 'pay pal'],
+	},
+	{
+		icon: RedditIcon,
+		keywords: ['reddit'],
+	},
+	{
+		icon: ReelsIcon,
+		keywords: ['reels', 'instagram reels', 'facebook reels'],
+	},
+	{
+		icon: SnapchatIcon,
+		keywords: ['snapchat'],
+	},
+	{
+		icon: TikTokIcon,
+		keywords: ['tiktok', 'tik', 'tok'],
+	},
+	{
+		icon: TumblrIcon,
+		keywords: ['tumblr'],
+	},
+	{
+		icon: TwitchIcon,
+		keywords: ['twitch', 'twitch.tv'],
+	},
+	{
+		icon: WindowsIcon,
+		keywords: ['windows', 'microsoft'],
+	},
+	{
+		icon: YouTubeIcon,
+		keywords: ['youtube', 'yt'],
+	},
+	{
+		icon: YouTubeShortsIcon,
+		keywords: ['shorts', 'youtube shorts'],
+	},
+	{
+		icon: YouTubeGaming,
+		keywords: ['youtube gaming'],
+	},
+	{
+		icon: CurseForgeIcon,
+		keywords: ['curseforge', 'cf', 'curse', 'curse forge'],
+	},
+	{
+		icon: ModrinthIcon,
+		keywords: ['modrinth', 'mod rinth', 'modrith', 'mr'],
+	},
+	{
+		icon: TwitterIcon,
+		keywords: ['twitter', 'x.com', 'x'],
+	},
+]
+
+const selectedService = computed(() =>
+	services.find((service) =>
+		service.keywords.some((keyword) => props.keyword.toLowerCase().includes(keyword)),
+	),
+)
+</script>
+
+<template>
+	<component :is="selectedService?.icon" v-if="selectedService" />
+	<slot v-else />
+</template>
diff --git a/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue b/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
index a864a7d1..a8f02fd5 100644
--- a/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
+++ b/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
@@ -58,6 +58,7 @@ const props = defineProps<{
 	) => Promise<UpdatePaymentIntentResponse | CreatePaymentIntentResponse | null>
 	onError: (err: Error) => void
 	onFinalizeNoPaymentChange?: () => Promise<void>
+	affiliateCode?: string | null
 }>()
 
 const modal = useTemplateRef<InstanceType<typeof NewModal>>('modal')
@@ -66,6 +67,7 @@ const selectedInterval = ref<ServerBillingInterval>('quarterly')
 const loading = ref(false)
 const selectedRegion = ref<string>()
 const projectId = ref<string>()
+const affiliateCode = ref(props.affiliateCode ?? null)
 
 const {
 	initializeStripe,
@@ -96,6 +98,7 @@ const {
 	projectId,
 	props.initiatePayment,
 	props.onError,
+	affiliateCode,
 )
 
 const customServer = ref<boolean>(false)
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index 9f82bc74..dbff9859 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -2,6 +2,7 @@
 export { default as Accordion } from './base/Accordion.vue'
 export { default as Admonition } from './base/Admonition.vue'
 export { default as AppearingProgressBar } from './base/AppearingProgressBar.vue'
+export { default as AutoBrandIcon } from './base/AutoBrandIcon.vue'
 export { default as AutoLink } from './base/AutoLink.vue'
 export { default as Avatar } from './base/Avatar.vue'
 export { default as Badge } from './base/Badge.vue'
@@ -98,6 +99,10 @@ export { default as SearchFilterControl } from './search/SearchFilterControl.vue
 export { default as SearchFilterOption } from './search/SearchFilterOption.vue'
 export { default as SearchSidebarFilter } from './search/SearchSidebarFilter.vue'
 
+// Affiliate
+export { default as AffiliateLinkCard } from './affiliate/AffiliateLinkCard.vue'
+export { default as AffiliateLinkCreateModal } from './affiliate/AffiliateLinkCreateModal.vue'
+
 // Billing
 export { default as AddPaymentMethodModal } from './billing/AddPaymentMethodModal.vue'
 export { default as ModrinthServersPurchaseModal } from './billing/ModrinthServersPurchaseModal.vue'
diff --git a/packages/ui/src/composables/stripe.ts b/packages/ui/src/composables/stripe.ts
index 94b8e164..44172514 100644
--- a/packages/ui/src/composables/stripe.ts
+++ b/packages/ui/src/composables/stripe.ts
@@ -37,6 +37,7 @@ export const useStripe = (
 		body: CreatePaymentIntentRequest | UpdatePaymentIntentRequest,
 	) => Promise<CreatePaymentIntentResponse | UpdatePaymentIntentResponse | null>,
 	onError: (err: Error) => void,
+	affiliateCode?: Ref<string | null>,
 ) => {
 	const stripe = ref<StripeJs | null>(null)
 
@@ -229,6 +230,13 @@ export const useStripe = (
 
 			let result: BasePaymentIntentResponse | null = null
 
+			const affiliateMetadata =
+				affiliateCode && affiliateCode.value
+					? {
+							affiliate_code: affiliateCode.value,
+						}
+					: {}
+
 			const metadata: CreatePaymentIntentRequest['metadata'] = {
 				type: 'pyro',
 				server_region: region.value,
@@ -237,6 +245,7 @@ export const useStripe = (
 							project_id: project.value,
 						}
 					: {},
+				...affiliateMetadata,
 			}
 
 			if (paymentIntentId.value) {
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index d3e218e2..9aebf811 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Create affiliate link"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Creating new affiliate code"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Give your affiliate link a name so you know where people are coming from!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Title of affiliate link"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "e.g. YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "The username of the user to create the affiliate code for"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Username"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Enter username..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Created by {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Creating affiliate link..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Revoke affiliate link"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "View analytics"
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "New"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Affiliate links"
+  },
   "button.analytics": {
     "defaultMessage": "Analytics"
   },
diff --git a/packages/ui/src/utils/billing.ts b/packages/ui/src/utils/billing.ts
index a84e7ef2..f2dac64d 100644
--- a/packages/ui/src/utils/billing.ts
+++ b/packages/ui/src/utils/billing.ts
@@ -79,6 +79,7 @@ export type CreatePaymentIntentRequest = PaymentRequestType & {
 		type: 'pyro'
 		server_name?: string
 		server_region?: string
+		affiliate_code?: string
 		source:
 			| {
 					loader: Loaders
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index 46fcd35e..4546b36d 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -1,6 +1,10 @@
 import { defineMessages } from '@vintl/vintl'
 
 export const commonMessages = defineMessages({
+	affiliateLinksButton: {
+		id: 'button.affiliate-links',
+		defaultMessage: 'Affiliate links',
+	},
 	analyticsButton: {
 		id: 'button.analytics',
 		defaultMessage: 'Analytics',
diff --git a/packages/utils/types.ts b/packages/utils/types.ts
index d57ba3dd..cac71dbd 100644
--- a/packages/utils/types.ts
+++ b/packages/utils/types.ts
@@ -334,6 +334,7 @@ export enum UserBadge {
 	ALPHA_TESTER = 1 << 4,
 	CONTRIBUTOR = 1 << 5,
 	TRANSLATOR = 1 << 6,
+	AFFILIATE = 1 << 7,
 }
 
 export type UserBadges = number
@@ -597,3 +598,11 @@ export interface DelphiReport {
 	status: 'pending' | 'approved' | 'rejected'
 	content?: string
 }
+
+export type AffiliateLink = {
+	id: string
+	created_at: string
+	created_by: string
+	affiliate: string
+	source_name: string
+}

From b11934054da97b6008e41d6758aa3da1b9b3d23a Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Sun, 2 Nov 2025 11:51:48 -0800
Subject: [PATCH 06/64] Reapply "fix: firefox backup download issues (#4679)"
 (#4683) (#4704)

This reverts commit 4c1020d2bacd299267647142a37b5eeaacfceff9.
---
 .../src/components/ui/servers/BackupItem.vue  | 89 +++++++++++++++----
 .../composables/servers/modules/backups.ts    | 83 +++++++++++++++++
 apps/frontend/src/locales/en-US/index.json    |  6 ++
 .../src/pages/servers/manage/[id]/backups.vue |  1 +
 4 files changed, 164 insertions(+), 15 deletions(-)

diff --git a/apps/frontend/src/components/ui/servers/BackupItem.vue b/apps/frontend/src/components/ui/servers/BackupItem.vue
index 6e910066..b8e170ca 100644
--- a/apps/frontend/src/components/ui/servers/BackupItem.vue
+++ b/apps/frontend/src/components/ui/servers/BackupItem.vue
@@ -13,14 +13,23 @@ import {
 	TrashIcon,
 	XIcon,
 } from '@modrinth/assets'
-import { ButtonStyled, commonMessages, OverflowMenu, ProgressBar } from '@modrinth/ui'
+import {
+	ButtonStyled,
+	commonMessages,
+	injectNotificationManager,
+	OverflowMenu,
+	ProgressBar,
+} from '@modrinth/ui'
 import type { Backup } from '@modrinth/utils'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import dayjs from 'dayjs'
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
+
+import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
 
 const flags = useFeatureFlags()
 const { formatMessage } = useVIntl()
+const { addNotification } = injectNotificationManager()
 
 const emit = defineEmits<{
 	(e: 'download' | 'rename' | 'restore' | 'lock' | 'retry'): void
@@ -33,11 +42,13 @@ const props = withDefaults(
 		preview?: boolean
 		kyrosUrl?: string
 		jwt?: string
+		server?: ModrinthServer
 	}>(),
 	{
 		preview: false,
 		kyrosUrl: undefined,
 		jwt: undefined,
+		server: undefined,
 	},
 )
 
@@ -124,7 +135,48 @@ const messages = defineMessages({
 		id: 'servers.backups.item.retry',
 		defaultMessage: 'Retry',
 	},
+	downloadingBackup: {
+		id: 'servers.backups.item.downloading-backup',
+		defaultMessage: 'Downloading backup...',
+	},
+	downloading: {
+		id: 'servers.backups.item.downloading',
+		defaultMessage: 'Downloading',
+	},
 })
+
+const downloadingState = ref<{ progress: number; state: string } | undefined>(undefined)
+
+const downloading = computed(() => downloadingState.value)
+
+const handleDownload = async () => {
+	if (!props.server?.backups || downloading.value) {
+		return
+	}
+
+	downloadingState.value = { progress: 0, state: 'ongoing' }
+
+	try {
+		const download = props.server.backups.downloadBackup(props.backup.id, props.backup.name)
+
+		download.onProgress((p) => {
+			downloadingState.value = { progress: p.progress, state: 'ongoing' }
+		})
+
+		await download.promise
+
+		emit('download')
+	} catch (error) {
+		console.error('Failed to download backup:', error)
+		addNotification({
+			type: 'error',
+			title: 'Download failed',
+			text: error instanceof Error ? error.message : 'Failed to download backup',
+		})
+	} finally {
+		downloadingState.value = undefined
+	}
+}
 </script>
 <template>
 	<div
@@ -192,6 +244,15 @@ const messages = defineMessages({
 				class="max-w-full"
 			/>
 		</div>
+		<div v-else-if="downloading" class="col-span-2 flex flex-col gap-3 text-blue">
+			{{ formatMessage(messages.downloadingBackup) }}
+			<ProgressBar
+				:progress="downloading.progress >= 0 ? downloading.progress : 0"
+				color="blue"
+				:waiting="downloading.progress <= 0"
+				class="max-w-full"
+			/>
+		</div>
 		<template v-else>
 			<div class="col-span-2">
 				{{ dayjs(backup.created_at).format('MMMM D, YYYY [at] h:mm A') }}
@@ -223,34 +284,32 @@ const messages = defineMessages({
 				</button>
 			</ButtonStyled>
 			<template v-else>
-				<ButtonStyled>
-					<a
-						:class="{
-							disabled: !kyrosUrl || !jwt,
-						}"
-						:href="`https://${kyrosUrl}/modrinth/v0/backups/${backup.id}/download?auth=${jwt}`"
-						@click="() => emit('download')"
-					>
+				<ButtonStyled v-show="!downloading">
+					<button :disabled="!server?.backups" @click="handleDownload">
 						<DownloadIcon />
 						{{ formatMessage(commonMessages.downloadButton) }}
-					</a>
+					</button>
 				</ButtonStyled>
 				<ButtonStyled circular type="transparent">
 					<OverflowMenu
 						:options="[
-							{ id: 'rename', action: () => emit('rename') },
+							{
+								id: 'rename',
+								action: () => emit('rename'),
+								disabled: !!restoring || !!downloading,
+							},
 							{
 								id: 'restore',
 								action: () => emit('restore'),
-								disabled: !!restoring,
+								disabled: !!restoring || !!downloading,
 							},
-							{ id: 'lock', action: () => emit('lock') },
+							{ id: 'lock', action: () => emit('lock'), disabled: !!restoring || !!downloading },
 							{ divider: true },
 							{
 								id: 'delete',
 								color: 'red',
 								action: () => emit('delete'),
-								disabled: !!restoring,
+								disabled: !!restoring || !!downloading,
 							},
 						]"
 					>
diff --git a/apps/frontend/src/composables/servers/modules/backups.ts b/apps/frontend/src/composables/servers/modules/backups.ts
index 921b9a35..ac011508 100644
--- a/apps/frontend/src/composables/servers/modules/backups.ts
+++ b/apps/frontend/src/composables/servers/modules/backups.ts
@@ -106,4 +106,87 @@ export class BackupsModule extends ServerModule {
 	async getAutoBackup(): Promise<AutoBackupSettings> {
 		return await useServersFetch(`servers/${this.serverId}/autobackup`)
 	}
+
+	downloadBackup(
+		backupId: string,
+		backupName: string,
+	): {
+		promise: Promise<void>
+		onProgress: (cb: (p: { loaded: number; total: number; progress: number }) => void) => void
+		cancel: () => void
+	} {
+		const progressSubject = new EventTarget()
+		const abortController = new AbortController()
+
+		const downloadPromise = new Promise<void>((resolve, reject) => {
+			const auth = this.server.general?.node
+			if (!auth?.instance || !auth?.token) {
+				reject(new Error('Missing authentication credentials'))
+				return
+			}
+
+			const xhr = new XMLHttpRequest()
+
+			xhr.addEventListener('progress', (e) => {
+				if (e.lengthComputable) {
+					const progress = e.loaded / e.total
+					progressSubject.dispatchEvent(
+						new CustomEvent('progress', {
+							detail: { loaded: e.loaded, total: e.total, progress },
+						}),
+					)
+				} else {
+					// progress = -1 to indicate indeterminate size
+					progressSubject.dispatchEvent(
+						new CustomEvent('progress', {
+							detail: { loaded: e.loaded, total: 0, progress: -1 },
+						}),
+					)
+				}
+			})
+
+			xhr.onload = () => {
+				if (xhr.status >= 200 && xhr.status < 300) {
+					try {
+						const blob = xhr.response
+						const url = window.URL.createObjectURL(blob)
+						const a = document.createElement('a')
+						a.href = url
+						a.download = `${backupName}.zip`
+						document.body.appendChild(a)
+						a.click()
+						document.body.removeChild(a)
+						window.URL.revokeObjectURL(url)
+						resolve()
+					} catch (error) {
+						reject(error)
+					}
+				} else {
+					reject(new Error(`Download failed with status ${xhr.status}`))
+				}
+			}
+
+			xhr.onerror = () => reject(new Error('Download failed'))
+			xhr.onabort = () => reject(new Error('Download cancelled'))
+
+			xhr.open(
+				'GET',
+				`https://${auth.instance}/modrinth/v0/backups/${backupId}/download?auth=${auth.token}`,
+			)
+			xhr.responseType = 'blob'
+			xhr.send()
+
+			abortController.signal.addEventListener('abort', () => xhr.abort())
+		})
+
+		return {
+			promise: downloadPromise,
+			onProgress: (cb: (p: { loaded: number; total: number; progress: number }) => void) => {
+				progressSubject.addEventListener('progress', ((e: CustomEvent) => {
+					cb(e.detail)
+				}) as EventListener)
+			},
+			cancel: () => abortController.abort(),
+		}
+	}
 }
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 62d89f13..50eebb06 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -1967,6 +1967,12 @@
   "servers.backups.item.creating-backup": {
     "message": "Creating backup..."
   },
+  "servers.backups.item.downloading": {
+    "message": "Downloading"
+  },
+  "servers.backups.item.downloading-backup": {
+    "message": "Downloading backup..."
+  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Failed to create backup"
   },
diff --git a/apps/frontend/src/pages/servers/manage/[id]/backups.vue b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
index 091f036b..56d85946 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/backups.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
@@ -105,6 +105,7 @@
 				v-for="backup in backups"
 				:key="`backup-${backup.id}`"
 				:backup="backup"
+				:server="props.server"
 				:kyros-url="props.server.general?.node.instance"
 				:jwt="props.server.general?.node.token"
 				@download="() => triggerDownloadAnimation()"

From 17f395ee559dfd16e420abe8346c276354d2f949 Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Mon, 3 Nov 2025 14:19:46 -0800
Subject: [PATCH 07/64] Mural Pay integration (#4520)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip: muralpay integration

* Basic Mural Pay API bindings

* Fix clippy

* use dotenvy in muralpay example

* Refactor payout creation code

* wip: muralpay payout requests

* Mural Pay payouts work

* Fix clippy

* add mural pay fees API

* Work on payout fee API

* Fees API for more payment methods

* Fix CI

* Temporarily disable Venmo and PayPal methods from frontend

* wip: counterparties

* Start on counterparties and payment methods API

* Mural Pay multiple methods when fetching

* Don't send supported_countries to frontend

* Add countries to muralpay fiat methods

* Compile fix

* Add exchange rate info to fees endpoint

* Add fees to premium Tremendous options

* Add delivery email field to Tremendous payouts

* Add Tremendous product category to payout methods

* Add bank details API to muralpay

* Fix CI

* Fix CI

* Remove prepaid visa, compute fees properly for Tremendous methods

* Add more details to Tremendous errors

* Add fees to Mural

* Payout history route and bank details

* Re-add legacy PayPal/Venmo options for US

* move the mural bank details route

* Add utoipa support to payout endpoints

* address some PR comments

* add CORS to new utoipa routes

* Immediately approve mural payouts

* Add currency support to Tremendous payouts

* Currency forex

* add forex to tremendous fee request

* Add Mural balance to bank balance info

* Add more Tremendous currencies support

* Transaction payouts available use the correct date

* Address my own review comment

* Address PR comments

* Change Mural withdrawal limit to 3k

* maybe fix tremendous gift cards

* Change how Mural minimum withdrawals are calculated

* Tweak min/max withdrawal values

---------

Co-authored-by: Calum H. <contact@cal.engineer>
Co-authored-by: Alejandro González <me@alegon.dev>
---
 CLAUDE.md                                     |   4 +
 Cargo.lock                                    | 171 +++-
 Cargo.toml                                    |   4 +
 _typos.toml                                   |   2 +-
 apps/labrinth/.env.docker-compose             |   5 +
 apps/labrinth/.env.local                      |   5 +
 ...d4fd183fd439ddcbbac76471a9771d4f29b61.json |  28 +
 apps/labrinth/Cargo.toml                      |   3 +
 .../labrinth-seed-data-202508052143.sql       |   5 +-
 .../src/database/models/payout_item.rs        |   4 +-
 .../src/database/models/users_compliance.rs   |  11 +-
 apps/labrinth/src/lib.rs                      |   5 +
 apps/labrinth/src/models/v3/payouts.rs        | 125 ++-
 .../src/queue/{payouts.rs => payouts/mod.rs}  | 668 +++++++++-----
 apps/labrinth/src/queue/payouts/mural.rs      | 180 ++++
 apps/labrinth/src/routes/internal/mod.rs      |   4 +-
 apps/labrinth/src/routes/internal/mural.rs    |  28 +
 apps/labrinth/src/routes/mod.rs               | 145 +--
 apps/labrinth/src/routes/v3/mod.rs            |   6 +-
 apps/labrinth/src/routes/v3/payouts.rs        | 781 ++++++++++-------
 apps/labrinth/src/util/env.rs                 |   7 +
 apps/labrinth/src/util/error.rs               | 276 ++++--
 packages/muralpay/Cargo.toml                  |  43 +
 packages/muralpay/README.md                   |   5 +
 packages/muralpay/examples/muralpay.rs        | 321 +++++++
 packages/muralpay/src/account.rs              | 236 +++++
 packages/muralpay/src/counterparty.rs         | 169 ++++
 packages/muralpay/src/error.rs                | 117 +++
 packages/muralpay/src/lib.rs                  |  48 +-
 packages/muralpay/src/organization.rs         | 277 ++++++
 packages/muralpay/src/payout.rs               | 825 ++++++++++++++++++
 packages/muralpay/src/payout_method.rs        | 439 ++++++++++
 packages/muralpay/src/serde_iso3166.rs        |  24 +
 packages/muralpay/src/util.rs                 | 100 +++
 34 files changed, 4381 insertions(+), 690 deletions(-)
 create mode 100644 apps/labrinth/.sqlx/query-0a01edcb023f6fd1bdfb3a6b77ad4fd183fd439ddcbbac76471a9771d4f29b61.json
 rename apps/labrinth/src/queue/{payouts.rs => payouts/mod.rs} (68%)
 create mode 100644 apps/labrinth/src/queue/payouts/mural.rs
 create mode 100644 apps/labrinth/src/routes/internal/mural.rs
 create mode 100644 packages/muralpay/Cargo.toml
 create mode 100644 packages/muralpay/README.md
 create mode 100644 packages/muralpay/examples/muralpay.rs
 create mode 100644 packages/muralpay/src/account.rs
 create mode 100644 packages/muralpay/src/counterparty.rs
 create mode 100644 packages/muralpay/src/error.rs
 create mode 100644 packages/muralpay/src/organization.rs
 create mode 100644 packages/muralpay/src/payout.rs
 create mode 100644 packages/muralpay/src/payout_method.rs
 create mode 100644 packages/muralpay/src/serde_iso3166.rs
 create mode 100644 packages/muralpay/src/util.rs

diff --git a/CLAUDE.md b/CLAUDE.md
index d84f325e..2f6a2269 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -57,3 +57,7 @@ Use `docker exec labrinth-clickhouse clickhouse-client` to access the Clickhouse
 ### Postgres
 
 Use `docker exec labrinth-postgres psql -U postgres` to access the PostgreSQL instance.
+
+# Guidelines
+
+- Do not create new non-source code files (e.g. Bash scripts, SQL scripts) unless explicitly prompted to.
diff --git a/Cargo.lock b/Cargo.lock
index 06984400..792031ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -443,6 +443,12 @@ dependencies = [
  "derive_arbitrary",
 ]
 
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
 [[package]]
 name = "arg_enum_proc_macro"
 version = "0.3.4"
@@ -1872,7 +1878,7 @@ dependencies = [
  "bitflags 2.9.4",
  "core-foundation 0.10.1",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
@@ -2972,6 +2978,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -2979,7 +2994,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared",
+ "foreign-types-shared 0.3.1",
 ]
 
 [[package]]
@@ -2993,6 +3008,12 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -3954,6 +3975,22 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.7.0",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.17"
@@ -4609,6 +4646,7 @@ dependencies = [
  "actix-web",
  "actix-web-prom",
  "actix-ws",
+ "arc-swap",
  "argon2",
  "ariadne",
  "async-stripe",
@@ -4644,6 +4682,7 @@ dependencies = [
  "lettre",
  "meilisearch-sdk",
  "modrinth-maxmind",
+ "muralpay",
  "murmur2",
  "paste",
  "path-util",
@@ -4667,6 +4706,7 @@ dependencies = [
  "sha2",
  "spdx",
  "sqlx",
+ "strum",
  "thiserror 2.0.17",
  "tikv-jemalloc-ctl",
  "tikv-jemallocator",
@@ -5241,6 +5281,31 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "muralpay"
+version = "0.1.0"
+dependencies = [
+ "bytes",
+ "chrono",
+ "clap",
+ "color-eyre",
+ "derive_more 2.0.1",
+ "dotenvy",
+ "eyre",
+ "reqwest",
+ "rust_decimal",
+ "rust_iso3166",
+ "secrecy",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "strum",
+ "tokio",
+ "tracing-subscriber",
+ "utoipa",
+ "uuid 1.18.1",
+]
+
 [[package]]
 name = "murmur2"
 version = "0.1.0"
@@ -5277,6 +5342,23 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework 2.11.1",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "ndk"
 version = "0.9.0"
@@ -5884,12 +5966,50 @@ dependencies = [
  "pathdiff",
 ]
 
+[[package]]
+name = "openssl"
+version = "0.10.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+dependencies = [
+ "bitflags 2.9.4",
+ "cfg-if",
+ "foreign-types 0.3.2",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
+[[package]]
+name = "openssl-sys"
+version = "0.9.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -7191,11 +7311,13 @@ dependencies = [
  "http-body-util",
  "hyper 1.7.0",
  "hyper-rustls 0.27.7",
+ "hyper-tls",
  "hyper-util",
  "js-sys",
  "log",
  "mime",
  "mime_guess",
+ "native-tls",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
@@ -7207,6 +7329,7 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper",
  "tokio",
+ "tokio-native-tls",
  "tokio-rustls 0.26.4",
  "tokio-util",
  "tower 0.5.2",
@@ -7430,6 +7553,7 @@ dependencies = [
  "num-traits",
  "rand 0.8.5",
  "rkyv",
+ "rust_decimal_macros",
  "serde",
  "serde_json",
 ]
@@ -7777,6 +7901,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "secrecy"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -8387,7 +8520,7 @@ dependencies = [
  "bytemuck",
  "cfg_aliases",
  "core-graphics",
- "foreign-types",
+ "foreign-types 0.5.0",
  "js-sys",
  "log",
  "objc2 0.5.2",
@@ -8757,6 +8890,27 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "strum"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -9723,6 +9877,16 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.24.1"
@@ -10381,6 +10545,7 @@ dependencies = [
  "quote",
  "regex",
  "syn 2.0.106",
+ "uuid 1.18.1",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index d7efdc3e..0db90446 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,6 +27,7 @@ actix-rt = "2.11.0"
 actix-web = "4.11.0"
 actix-web-prom = "0.10.0"
 actix-ws = "0.3.0"
+arc-swap = "1.7.1"
 argon2 = { version = "0.5.3", features = ["std"] }
 ariadne = { path = "packages/ariadne" }
 async-compression = { version = "0.4.32", default-features = false }
@@ -109,6 +110,7 @@ maxminddb = "0.26.0"
 meilisearch-sdk = { version = "0.30.0", default-features = false }
 modrinth-maxmind = { path = "packages/modrinth-maxmind" }
 modrinth-util = { path = "packages/modrinth-util" }
+muralpay = { path = "packages/muralpay" }
 murmur2 = "0.1.0"
 native-dialog = "0.9.2"
 notify = { version = "8.2.0", default-features = false }
@@ -139,6 +141,7 @@ rust-s3 = { version = "0.37.0", default-features = false, features = [
 ] }
 rustls = "0.23.32"
 rusty-money = "0.4.1"
+secrecy = "0.10.3"
 sentry = { version = "0.45.0", default-features = false, features = [
   "backtrace",
   "contexts",
@@ -161,6 +164,7 @@ sha2 = "0.10.9"
 shlex = "1.3.0"
 spdx = "0.12.0"
 sqlx = { version = "0.8.6", default-features = false }
+strum = "0.27.2"
 sysinfo = { version = "0.37.2", default-features = false }
 tar = "0.4.44"
 tauri = "2.8.5"
diff --git a/_typos.toml b/_typos.toml
index 4dd9b96b..5961cd5d 100644
--- a/_typos.toml
+++ b/_typos.toml
@@ -9,7 +9,7 @@ extend-exclude = [
   # contains licenses like `CC-BY-ND-4.0`
   "packages/moderation/src/data/stages/license.ts",
   # contains payment card IDs like `IY1VMST1MOXS` which are flagged
-  "apps/labrinth/src/queue/payouts.rs",
+  "apps/labrinth/src/queue/payouts/mod.rs",
 ]
 
 [default.extend-words]
diff --git a/apps/labrinth/.env.docker-compose b/apps/labrinth/.env.docker-compose
index d272a7e4..2368726e 100644
--- a/apps/labrinth/.env.docker-compose
+++ b/apps/labrinth/.env.docker-compose
@@ -146,3 +146,8 @@ GOTENBERG_URL=http://labrinth-gotenberg:13000
 GOTENBERG_CALLBACK_BASE=http://host.docker.internal:8000/_internal/gotenberg
 
 ARCHON_URL=none
+
+MURALPAY_API_URL=https://api.muralpay.com
+MURALPAY_API_KEY=none
+MURALPAY_TRANSFER_API_KEY=none
+MURALPAY_SOURCE_ACCOUNT_ID=none
diff --git a/apps/labrinth/.env.local b/apps/labrinth/.env.local
index 45372c45..37358ad8 100644
--- a/apps/labrinth/.env.local
+++ b/apps/labrinth/.env.local
@@ -147,3 +147,8 @@ GOTENBERG_URL=http://localhost:13000
 GOTENBERG_CALLBACK_BASE=http://host.docker.internal:8000/_internal/gotenberg
 
 ARCHON_URL=none
+
+MURALPAY_API_URL=https://api-staging.muralpay.com
+MURALPAY_API_KEY=none
+MURALPAY_TRANSFER_API_KEY=none
+MURALPAY_SOURCE_ACCOUNT_ID=none
diff --git a/apps/labrinth/.sqlx/query-0a01edcb023f6fd1bdfb3a6b77ad4fd183fd439ddcbbac76471a9771d4f29b61.json b/apps/labrinth/.sqlx/query-0a01edcb023f6fd1bdfb3a6b77ad4fd183fd439ddcbbac76471a9771d4f29b61.json
new file mode 100644
index 00000000..33706d7a
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-0a01edcb023f6fd1bdfb3a6b77ad4fd183fd439ddcbbac76471a9771d4f29b61.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT date_available, amount\n        FROM payouts_values\n        WHERE user_id = $1\n        AND NOW() >= date_available",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "date_available",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 1,
+        "name": "amount",
+        "type_info": "Numeric"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "0a01edcb023f6fd1bdfb3a6b77ad4fd183fd439ddcbbac76471a9771d4f29b61"
+}
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index 055e2e58..9502fbdc 100644
--- a/apps/labrinth/Cargo.toml
+++ b/apps/labrinth/Cargo.toml
@@ -17,6 +17,7 @@ actix-rt = { workspace = true }
 actix-web = { workspace = true }
 actix-web-prom = { workspace = true, features = ["process"] }
 actix-ws = { workspace = true }
+arc-swap = { workspace = true }
 argon2 = { workspace = true }
 ariadne = { workspace = true }
 async-stripe = { workspace = true, features = [
@@ -70,6 +71,7 @@ json-patch = { workspace = true }
 lettre = { workspace = true }
 meilisearch-sdk = { workspace = true, features = ["reqwest"] }
 modrinth-maxmind = { workspace = true }
+muralpay = { workspace = true, features = ["utoipa"] }
 murmur2 = { workspace = true }
 paste = { workspace = true }
 path-util = { workspace = true }
@@ -110,6 +112,7 @@ sqlx = { workspace = true, features = [
   "rust_decimal",
   "tls-rustls-aws-lc-rs",
 ] }
+strum = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "sync"] }
 tokio-stream = { workspace = true }
diff --git a/apps/labrinth/fixtures/labrinth-seed-data-202508052143.sql b/apps/labrinth/fixtures/labrinth-seed-data-202508052143.sql
index 5f4b0d20..6a6dd726 100644
--- a/apps/labrinth/fixtures/labrinth-seed-data-202508052143.sql
+++ b/apps/labrinth/fixtures/labrinth-seed-data-202508052143.sql
@@ -1105,6 +1105,9 @@ COPY public.users (id, github_id, username, email, avatar_url, bio, created, rol
 \.
 
 INSERT INTO sessions (id, session, user_id, created, last_login, expires, refresh_expires, city, country, ip, os, platform, user_agent)
-VALUES (93083445641246, 'mra_admin', 103587649610509, '2025-10-20 14:58:53.128901+00', '2025-10-20 14:58:53.128901+00', '2025-11-03 14:58:53.128901+00', '2025-12-19 14:58:53.128901+00', '', '', '127.0.0.1', 'Linux', 'Chrome', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36');
+VALUES (93083445641246, 'mra_admin', 103587649610509, '2025-10-20 14:58:53.128901+00', '2025-10-20 14:58:53.128901+00', '2030-11-03 14:58:53.128901+00', '2030-12-19 14:58:53.128901+00', '', '', '127.0.0.1', 'Linux', 'Chrome', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36');
+
+INSERT INTO payouts_values (user_id, amount, created, date_available)
+VALUES (103587649610509, 1000.00000000000000000000, '2025-10-23 00:00:00+00', '2025-10-23 00:00:00+00');
 
 COMMIT;
diff --git a/apps/labrinth/src/database/models/payout_item.rs b/apps/labrinth/src/database/models/payout_item.rs
index 0f0fbfc2..d8d82b05 100644
--- a/apps/labrinth/src/database/models/payout_item.rs
+++ b/apps/labrinth/src/database/models/payout_item.rs
@@ -38,7 +38,7 @@ impl DBPayout {
             self.fee,
             self.user_id.0,
             self.status.as_str(),
-            self.method.map(|x| x.as_str()),
+            self.method.as_ref().map(|x| x.as_str()),
             self.method_address,
             self.platform_id,
         )
@@ -84,7 +84,7 @@ impl DBPayout {
             created: r.created,
             status: PayoutStatus::from_string(&r.status),
             amount: r.amount,
-            method: r.method.map(|x| PayoutMethodType::from_string(&x)),
+            method: r.method.and_then(|x| PayoutMethodType::from_string(&x)),
             method_address: r.method_address,
             platform_id: r.platform_id,
             fee: r.fee,
diff --git a/apps/labrinth/src/database/models/users_compliance.rs b/apps/labrinth/src/database/models/users_compliance.rs
index 47690ead..60b5cb1b 100644
--- a/apps/labrinth/src/database/models/users_compliance.rs
+++ b/apps/labrinth/src/database/models/users_compliance.rs
@@ -5,7 +5,16 @@ use sqlx::{query, query_scalar};
 use std::fmt;
 
 #[derive(
-    Debug, Default, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize,
+    Debug,
+    Default,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Serialize,
+    Deserialize,
+    utoipa::ToSchema,
 )]
 pub enum FormType {
     #[serde(rename = "W-8BEN")]
diff --git a/apps/labrinth/src/lib.rs b/apps/labrinth/src/lib.rs
index b35e4adf..672161b9 100644
--- a/apps/labrinth/src/lib.rs
+++ b/apps/labrinth/src/lib.rs
@@ -527,5 +527,10 @@ pub fn check_env_vars() -> bool {
 
     failed |= check_var::<String>("ARCHON_URL");
 
+    failed |= check_var::<String>("MURALPAY_API_URL");
+    failed |= check_var::<String>("MURALPAY_API_KEY");
+    failed |= check_var::<String>("MURALPAY_TRANSFER_API_KEY");
+    failed |= check_var::<String>("MURALPAY_SOURCE_ACCOUNT_ID");
+
     failed
 }
diff --git a/apps/labrinth/src/models/v3/payouts.rs b/apps/labrinth/src/models/v3/payouts.rs
index fc5dae83..24330525 100644
--- a/apps/labrinth/src/models/v3/payouts.rs
+++ b/apps/labrinth/src/models/v3/payouts.rs
@@ -1,4 +1,6 @@
-use crate::models::ids::PayoutId;
+use std::{cmp, collections::HashMap, fmt};
+
+use crate::{models::ids::PayoutId, queue::payouts::mural::MuralPayoutRequest};
 use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use rust_decimal::Decimal;
@@ -37,13 +39,47 @@ impl Payout {
     }
 }
 
-#[derive(Serialize, Deserialize, Copy, Clone, Eq, PartialEq, Debug)]
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(tag = "method", rename_all = "lowercase")]
+#[expect(
+    clippy::large_enum_variant,
+    reason = "acceptable since values of this type are not moved much"
+)]
+pub enum PayoutMethodRequest {
+    Venmo,
+    PayPal,
+    Tremendous { method_details: TremendousDetails },
+    MuralPay { method_details: MuralPayDetails },
+}
+
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Serialize,
+    Deserialize,
+    utoipa::ToSchema,
+)]
 #[serde(rename_all = "lowercase")]
 pub enum PayoutMethodType {
     Venmo,
     PayPal,
     Tremendous,
-    Unknown,
+    MuralPay,
+}
+
+impl PayoutMethodRequest {
+    pub fn method_type(&self) -> PayoutMethodType {
+        match self {
+            Self::Venmo => PayoutMethodType::Venmo,
+            Self::PayPal => PayoutMethodType::PayPal,
+            Self::Tremendous { .. } => PayoutMethodType::Tremendous,
+            Self::MuralPay { .. } => PayoutMethodType::MuralPay,
+        }
+    }
 }
 
 impl std::fmt::Display for PayoutMethodType {
@@ -52,27 +88,85 @@ impl std::fmt::Display for PayoutMethodType {
     }
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct TremendousDetails {
+    pub delivery_email: String,
+    #[schema(inline)]
+    pub currency: Option<TremendousCurrency>,
+}
+
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Serialize,
+    Deserialize,
+    utoipa::ToSchema,
+)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum TremendousCurrency {
+    Usd,
+    Gbp,
+    Cad,
+    Eur,
+    Aud,
+    Chf,
+    Czk,
+    Dkk,
+    Mxn,
+    Nok,
+    Nzd,
+    Pln,
+    Sek,
+    Sgd,
+}
+
+impl fmt::Display for TremendousCurrency {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let s = serde_json::to_value(self).map_err(|_| fmt::Error)?;
+        let s = s.as_str().ok_or(fmt::Error)?;
+        write!(f, "{s}")
+    }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct TremendousForexResponse {
+    pub forex: HashMap<String, Decimal>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct MuralPayDetails {
+    pub payout_details: MuralPayoutRequest,
+    pub recipient_info: muralpay::PayoutRecipientInfo,
+}
+
 impl PayoutMethodType {
     pub fn as_str(&self) -> &'static str {
         match self {
             PayoutMethodType::Venmo => "venmo",
             PayoutMethodType::PayPal => "paypal",
             PayoutMethodType::Tremendous => "tremendous",
-            PayoutMethodType::Unknown => "unknown",
+            PayoutMethodType::MuralPay => "muralpay",
         }
     }
 
-    pub fn from_string(string: &str) -> PayoutMethodType {
+    pub fn from_string(string: &str) -> Option<PayoutMethodType> {
         match string {
-            "venmo" => PayoutMethodType::Venmo,
-            "paypal" => PayoutMethodType::PayPal,
-            "tremendous" => PayoutMethodType::Tremendous,
-            _ => PayoutMethodType::Unknown,
+            "venmo" => Some(PayoutMethodType::Venmo),
+            "paypal" => Some(PayoutMethodType::PayPal),
+            "tremendous" => Some(PayoutMethodType::Tremendous),
+            "muralpay" => Some(PayoutMethodType::MuralPay),
+            _ => None,
         }
     }
 }
 
-#[derive(Serialize, Deserialize, Copy, Clone, Eq, PartialEq, Debug)]
+#[derive(
+    Serialize, Deserialize, Copy, Clone, Eq, PartialEq, Debug, utoipa::ToSchema,
+)]
 #[serde(rename_all = "kebab-case")]
 pub enum PayoutStatus {
     Success,
@@ -119,6 +213,8 @@ pub struct PayoutMethod {
     #[serde(rename = "type")]
     pub type_: PayoutMethodType,
     pub name: String,
+    pub category: Option<String>,
+    #[serde(skip_serializing)]
     pub supported_countries: Vec<String>,
     pub image_url: Option<String>,
     pub image_logo_url: Option<String>,
@@ -136,6 +232,15 @@ pub struct PayoutMethodFee {
     pub max: Option<Decimal>,
 }
 
+impl PayoutMethodFee {
+    pub fn compute_fee(&self, value: Decimal) -> Decimal {
+        cmp::min(
+            cmp::max(self.min, self.percentage * value),
+            self.max.unwrap_or(Decimal::MAX),
+        )
+    }
+}
+
 #[derive(Clone)]
 pub struct PayoutDecimal(pub Decimal);
 
diff --git a/apps/labrinth/src/queue/payouts.rs b/apps/labrinth/src/queue/payouts/mod.rs
similarity index 68%
rename from apps/labrinth/src/queue/payouts.rs
rename to apps/labrinth/src/queue/payouts/mod.rs
index 88feaaea..02244cc9 100644
--- a/apps/labrinth/src/queue/payouts.rs
+++ b/apps/labrinth/src/queue/payouts/mod.rs
@@ -2,21 +2,28 @@ use crate::database::models::notification_item::NotificationBuilder;
 use crate::database::models::payouts_values_notifications;
 use crate::database::redis::RedisPool;
 use crate::models::payouts::{
-    PayoutDecimal, PayoutInterval, PayoutMethod, PayoutMethodFee,
-    PayoutMethodType,
+    MuralPayDetails, PayoutDecimal, PayoutInterval, PayoutMethod,
+    PayoutMethodFee, PayoutMethodRequest, PayoutMethodType,
+    TremendousForexResponse,
 };
 use crate::models::projects::MonetizationStatus;
+use crate::queue::payouts::mural::MuralPayoutRequest;
 use crate::routes::ApiError;
+use crate::util::env::env_var;
+use crate::util::error::Context;
 use crate::util::webhook::{
     PayoutSourceAlertType, send_slack_payout_source_alert_webhook,
 };
+use arc_swap::ArcSwapOption;
 use base64::Engine;
 use chrono::{DateTime, Datelike, Duration, NaiveTime, TimeZone, Utc};
 use dashmap::DashMap;
+use eyre::{Result, eyre};
 use futures::TryStreamExt;
+use muralpay::MuralPay;
 use reqwest::Method;
-use rust_decimal::Decimal;
 use rust_decimal::prelude::ToPrimitive;
+use rust_decimal::{Decimal, dec};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -24,11 +31,19 @@ use sqlx::PgPool;
 use sqlx::postgres::PgQueryResult;
 use std::collections::HashMap;
 use tokio::sync::RwLock;
-use tracing::{error, info};
+use tracing::{error, info, warn};
+
+pub mod mural;
 
 pub struct PayoutsQueue {
     credential: RwLock<Option<PayPalCredentials>>,
     payout_options: RwLock<Option<PayoutMethods>>,
+    pub muralpay: ArcSwapOption<MuralPayConfig>,
+}
+
+pub struct MuralPayConfig {
+    pub client: MuralPay,
+    pub source_account_id: muralpay::AccountId,
 }
 
 #[derive(Clone, Debug)]
@@ -55,12 +70,102 @@ impl Default for PayoutsQueue {
         Self::new()
     }
 }
+
+fn create_muralpay() -> Result<MuralPayConfig> {
+    let api_url = env_var("MURALPAY_API_URL")?;
+    let api_key = env_var("MURALPAY_API_KEY")?;
+    let transfer_api_key = env_var("MURALPAY_TRANSFER_API_KEY")?;
+    let source_account_id = env_var("MURALPAY_SOURCE_ACCOUNT_ID")?
+        .parse::<muralpay::AccountId>()
+        .wrap_err("failed to parse source account ID")?;
+
+    let client = MuralPay::new(api_url, api_key, Some(transfer_api_key));
+
+    Ok(MuralPayConfig {
+        client,
+        source_account_id,
+    })
+}
+
+fn create_muralpay_methods() -> Vec<PayoutMethod> {
+    let all_countries = rust_iso3166::ALL
+        .iter()
+        .map(|x| x.alpha2)
+        .collect::<Vec<_>>();
+
+    let currencies = vec![
+        ("blockchain_usdc_polygon", "USDC on Polygon", all_countries),
+        ("fiat_mxn", "MXN", vec!["MX"]),
+        ("fiat_brl", "BRL", vec!["BR"]),
+        ("fiat_clp", "CLP", vec!["CL"]),
+        ("fiat_crc", "CRC", vec!["CR"]),
+        ("fiat_pen", "PEN", vec!["PE"]),
+        // ("fiat_dop", "DOP"), // unsupported in API
+        // ("fiat_uyu", "UYU"), // unsupported in API
+        ("fiat_ars", "ARS", vec!["AR"]),
+        ("fiat_cop", "COP", vec!["CO"]),
+        ("fiat_usd", "USD", vec!["US"]),
+        ("fiat_usd-peru", "USD Peru", vec!["PE"]),
+        // ("fiat_usd-panama", "USD Panama"), // by request
+        (
+            "fiat_eur",
+            "EUR",
+            vec![
+                "DE", "FR", "IT", "ES", "NL", "BE", "AT", "PT", "FI", "IE",
+                "GR", "LU", "CY", "MT", "SK", "SI", "EE", "LV", "LT",
+            ],
+        ),
+    ];
+
+    currencies
+        .into_iter()
+        .map(|(id, currency, countries)| PayoutMethod {
+            id: id.to_string(),
+            type_: PayoutMethodType::MuralPay,
+            name: format!("Mural Pay - {currency}"),
+            category: None,
+            supported_countries: countries
+                .iter()
+                .map(|s| s.to_string())
+                .collect(),
+            image_url: None,
+            image_logo_url: None,
+            interval: PayoutInterval::Standard {
+                // Different countries and currencies supported by Mural have different fees.
+                min: match id {
+                    // Due to relatively low volume of Peru withdrawals, fees are higher,
+                    // so we need to raise the minimum to cover these fees.
+                    "fiat_usd-peru" => Decimal::from(10),
+                    // USDC has much lower fees.
+                    "blockchain_usdc_polygon" => {
+                        Decimal::from(10) / Decimal::from(100)
+                    }
+                    _ => Decimal::from(5),
+                },
+                max: Decimal::from(10_000),
+            },
+            fee: PayoutMethodFee {
+                percentage: Decimal::from(1) / Decimal::from(100),
+                min: Decimal::ZERO,
+                max: Some(Decimal::ZERO),
+            },
+        })
+        .collect()
+}
+
 // Batches payouts and handles token refresh
 impl PayoutsQueue {
     pub fn new() -> Self {
+        let muralpay = create_muralpay()
+            .inspect_err(|err| {
+                warn!("Failed to create Mural Pay client: {err:#?}")
+            })
+            .ok();
+
         PayoutsQueue {
             credential: RwLock::new(None),
             payout_options: RwLock::new(None),
+            muralpay: ArcSwapOption::from_pointee(muralpay),
         }
     }
 
@@ -272,6 +377,7 @@ impl PayoutsQueue {
                 #[derive(Deserialize)]
                 struct TremendousError {
                     message: String,
+                    payload: Option<serde_json::Value>,
                 }
 
                 let err =
@@ -283,7 +389,10 @@ impl PayoutsQueue {
                             )
                         })?;
 
-                return Err(ApiError::Payments(err.message));
+                return Err(ApiError::Payments(format!(
+                    "Tremendous error: {} ({:?})",
+                    err.message, err.payload
+                )));
             }
 
             return Err(ApiError::Payments(
@@ -304,198 +413,23 @@ impl PayoutsQueue {
 
             let mut methods = Vec::new();
 
-            #[derive(Deserialize)]
-            pub struct Sku {
-                pub min: Decimal,
-                pub max: Decimal,
-            }
-
-            #[derive(Deserialize, Eq, PartialEq)]
-            #[serde(rename_all = "snake_case")]
-            pub enum ProductImageType {
-                Card,
-                Logo,
-            }
-
-            #[derive(Deserialize)]
-            pub struct ProductImage {
-                pub src: String,
-                #[serde(rename = "type")]
-                pub type_: ProductImageType,
-            }
-
-            #[derive(Deserialize)]
-            pub struct ProductCountry {
-                pub abbr: String,
-            }
-
-            #[derive(Deserialize)]
-            pub struct Product {
-                pub id: String,
-                pub category: String,
-                pub name: String,
-                // pub description: String,
-                // pub disclosure: String,
-                pub skus: Vec<Sku>,
-                pub currency_codes: Vec<String>,
-                pub countries: Vec<ProductCountry>,
-                pub images: Vec<ProductImage>,
-            }
-
-            #[derive(Deserialize)]
-            pub struct TremendousResponse {
-                pub products: Vec<Product>,
-            }
-
-            let response = queue
-                .make_tremendous_request::<(), TremendousResponse>(
-                    Method::GET,
-                    "products",
-                    None,
-                )
-                .await?;
-
-            for product in response.products {
-                const BLACKLISTED_IDS: &[&str] = &[
-                    // physical visa
-                    "A2J05SWPI2QG",
-                    // crypto
-                    "1UOOSHUUYTAM",
-                    "5EVJN47HPDFT",
-                    "NI9M4EVAVGFJ",
-                    "VLY29QHTMNGT",
-                    "7XU98H109Y3A",
-                    "0CGEDFP2UIKV",
-                    "PDYLQU0K073Y",
-                    "HCS5Z7O2NV5G",
-                    "IY1VMST1MOXS",
-                    "VRPZLJ7HCA8X",
-                    // bitcard (crypto)
-                    "GWQQS5RM8IZS",
-                    "896MYD4SGOGZ",
-                    "PWLEN1VZGMZA",
-                    "A2VRM96J5K5W",
-                    "HV9ICIM3JT7P",
-                    "K2KLSPVWC2Q4",
-                    "HRBRQLLTDF95",
-                    "UUBYLZVK7QAB",
-                    "BH8W3XEDEOJN",
-                    "7WGE043X1RYQ",
-                    "2B13MHUZZVTF",
-                    "JN6R44P86EYX",
-                    "DA8H43GU84SO",
-                    "QK2XAQHSDEH4",
-                    "J7K1IQFS76DK",
-                    "NL4JQ2G7UPRZ",
-                    "OEFTMSBA5ELH",
-                    "A3CQK6UHNV27",
-                ];
-                const SUPPORTED_METHODS: &[&str] = &[
-                    "merchant_cards",
-                    "merchant_card",
-                    "visa",
-                    "bank",
-                    "ach",
-                    "visa_card",
-                    "charity",
-                ];
-
-                if !SUPPORTED_METHODS.contains(&&*product.category)
-                    || BLACKLISTED_IDS.contains(&&*product.id)
-                {
-                    continue;
-                };
-
-                let method = PayoutMethod {
-                    id: product.id,
-                    type_: PayoutMethodType::Tremendous,
-                    name: product.name.clone(),
-                    supported_countries: product
-                        .countries
-                        .into_iter()
-                        .map(|x| x.abbr)
-                        .collect(),
-                    image_logo_url: product
-                        .images
-                        .iter()
-                        .find(|x| x.type_ == ProductImageType::Logo)
-                        .map(|x| x.src.clone()),
-                    image_url: product
-                        .images
-                        .into_iter()
-                        .find(|x| x.type_ == ProductImageType::Card)
-                        .map(|x| x.src),
-                    interval: if product.skus.len() > 1 {
-                        let mut values = product
-                            .skus
-                            .into_iter()
-                            .map(|x| PayoutDecimal(x.min))
-                            .collect::<Vec<_>>();
-                        values.sort_by(|a, b| a.0.cmp(&b.0));
-
-                        PayoutInterval::Fixed { values }
-                    } else if let Some(first) = product.skus.first() {
-                        PayoutInterval::Standard {
-                            min: first.min,
-                            max: first.max,
-                        }
-                    } else {
-                        PayoutInterval::Standard {
-                            min: Decimal::ZERO,
-                            max: Decimal::from(5_000),
-                        }
-                    },
-                    fee: if product.category == "ach" {
-                        PayoutMethodFee {
-                            percentage: Decimal::from(4) / Decimal::from(100),
-                            min: Decimal::from(1) / Decimal::from(4),
-                            max: None,
-                        }
-                    } else {
-                        PayoutMethodFee {
-                            percentage: Decimal::default(),
-                            min: Decimal::default(),
-                            max: None,
-                        }
-                    },
-                };
-
-                // we do not support interval gift cards with non US based currencies since we cannot do currency conversions properly
-                if let PayoutInterval::Fixed { .. } = method.interval
-                    && !product.currency_codes.contains(&"USD".to_string())
-                {
-                    continue;
+            match get_tremendous_payout_methods(queue).await {
+                Ok(mut tremendous_methods) => {
+                    methods.append(&mut tremendous_methods);
                 }
-
-                methods.push(method);
-            }
-
-            const UPRANK_IDS: &[&str] =
-                &["ET0ZVETV5ILN", "Q24BD9EZ332JT", "UIL1ZYJU5MKN"];
-            const DOWNRANK_IDS: &[&str] = &["EIPF8Q00EMM1", "OU2MWXYWPNWQ"];
-
-            methods.sort_by(|a, b| {
-                let a_top = UPRANK_IDS.contains(&&*a.id);
-                let a_bottom = DOWNRANK_IDS.contains(&&*a.id);
-                let b_top = UPRANK_IDS.contains(&&*b.id);
-                let b_bottom = DOWNRANK_IDS.contains(&&*b.id);
-
-                match (a_top, a_bottom, b_top, b_bottom) {
-                    (true, _, true, _) => a.name.cmp(&b.name), // Both in top_priority: sort alphabetically
-                    (_, true, _, true) => a.name.cmp(&b.name), // Both in bottom_priority: sort alphabetically
-                    (true, _, _, _) => std::cmp::Ordering::Less, // a in top_priority: a comes first
-                    (_, _, true, _) => std::cmp::Ordering::Greater, // b in top_priority: b comes first
-                    (_, true, _, _) => std::cmp::Ordering::Greater, // a in bottom_priority: b comes first
-                    (_, _, _, true) => std::cmp::Ordering::Less, // b in bottom_priority: a comes first
-                    (_, _, _, _) => a.name.cmp(&b.name), // Neither in priority: sort alphabetically
+                Err(err) => {
+                    warn!(
+                        "Failed to fetch Tremendous payout methods: {err:#?}"
+                    );
                 }
-            });
+            }
 
             {
                 let paypal_us = PayoutMethod {
                     id: "paypal_us".to_string(),
                     type_: PayoutMethodType::PayPal,
                     name: "PayPal".to_string(),
+                    category: None,
                     supported_countries: vec!["US".to_string()],
                     image_url: None,
                     image_logo_url: None,
@@ -519,30 +453,7 @@ impl PayoutsQueue {
                 methods.insert(1, venmo)
             }
 
-            methods.insert(
-                2,
-                PayoutMethod {
-                    id: "paypal_in".to_string(),
-                    type_: PayoutMethodType::PayPal,
-                    name: "PayPal".to_string(),
-                    supported_countries: rust_iso3166::ALL
-                        .iter()
-                        .filter(|x| x.alpha2 != "US")
-                        .map(|x| x.alpha2.to_string())
-                        .collect(),
-                    image_url: None,
-                    image_logo_url: None,
-                    interval: PayoutInterval::Standard {
-                        min: Decimal::from(1) / Decimal::from(4),
-                        max: Decimal::from(100_000),
-                    },
-                    fee: PayoutMethodFee {
-                        percentage: Decimal::from(2) / Decimal::from(100),
-                        min: Decimal::ZERO,
-                        max: Some(Decimal::from(20)),
-                    },
-                },
-            );
+            methods.extend(create_muralpay_methods());
 
             let new_options = PayoutMethods {
                 options: methods,
@@ -699,6 +610,333 @@ impl PayoutsQueue {
                     / Decimal::from(100),
             }))
     }
+
+    pub async fn calculate_fees(
+        &self,
+        request: &PayoutMethodRequest,
+        method_id: &str,
+        amount: Decimal,
+    ) -> Result<PayoutFees, ApiError> {
+        const MURAL_FEE: Decimal = dec!(0.01);
+
+        let get_method = async {
+            let method = self
+                .get_payout_methods()
+                .await
+                .wrap_internal_err("failed to fetch payout methods")?
+                .into_iter()
+                .find(|method| method.id == method_id)
+                .wrap_request_err("invalid payout method ID")?;
+            Ok::<_, ApiError>(method)
+        };
+
+        let fees = match request {
+            PayoutMethodRequest::MuralPay {
+                method_details:
+                    MuralPayDetails {
+                        payout_details: MuralPayoutRequest::Blockchain { .. },
+                        ..
+                    },
+            } => PayoutFees {
+                method_fee: dec!(0),
+                platform_fee: amount * MURAL_FEE,
+                exchange_rate: None,
+            },
+            PayoutMethodRequest::MuralPay {
+                method_details:
+                    MuralPayDetails {
+                        payout_details:
+                            MuralPayoutRequest::Fiat {
+                                fiat_and_rail_details,
+                                ..
+                            },
+                        ..
+                    },
+            } => {
+                let fiat_and_rail_code = fiat_and_rail_details.code();
+                let fee = self
+                    .compute_muralpay_fees(amount, fiat_and_rail_code)
+                    .await?;
+
+                match fee {
+                    muralpay::TokenPayoutFee::Success {
+                        exchange_rate,
+                        fee_total,
+                        ..
+                    } => PayoutFees {
+                        method_fee: fee_total.token_amount,
+                        platform_fee: amount * MURAL_FEE,
+                        exchange_rate: Some(exchange_rate),
+                    },
+                    muralpay::TokenPayoutFee::Error { message, .. } => {
+                        return Err(ApiError::Internal(eyre!(
+                            "failed to compute fee: {message}"
+                        )));
+                    }
+                }
+            }
+            PayoutMethodRequest::PayPal | PayoutMethodRequest::Venmo => {
+                let method = get_method.await?;
+                let fee = method.fee.compute_fee(amount);
+                PayoutFees {
+                    method_fee: fee,
+                    platform_fee: dec!(0),
+                    exchange_rate: None,
+                }
+            }
+            PayoutMethodRequest::Tremendous { method_details } => {
+                let method = get_method.await?;
+                let fee = method.fee.compute_fee(amount);
+
+                let forex: TremendousForexResponse = self
+                    .make_tremendous_request(Method::GET, "forex", None::<()>)
+                    .await
+                    .wrap_internal_err("failed to fetch Tremendous forex")?;
+
+                let exchange_rate = if let Some(currency) =
+                    &method_details.currency
+                {
+                    let currency_code = currency.to_string();
+                    let exchange_rate =
+                        forex.forex.get(&currency_code).wrap_request_err_with(
+                            || eyre!("no Tremendous forex data for {currency}"),
+                        )?;
+                    Some(*exchange_rate)
+                } else {
+                    None
+                };
+
+                PayoutFees {
+                    method_fee: fee,
+                    platform_fee: dec!(0),
+                    exchange_rate,
+                }
+            }
+        };
+
+        Ok(fees)
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct PayoutFees {
+    /// Fee which is taken by the underlying method we're using.
+    ///
+    /// For example, if a user withdraws $10.00 and the method takes a
+    /// 10% cut, then we submit a payout request of $10.00 to the method,
+    /// and only $9.00 will be sent to the recipient.
+    pub method_fee: Decimal,
+    /// Fee which we keep and don't pass to the underlying method.
+    ///
+    /// For example, if a user withdraws $10.00 and the method takes a
+    /// 10% cut, then we submit a payout request of $9.00, and the $1.00 stays
+    /// in our account.
+    pub platform_fee: Decimal,
+    /// How much is 1 USD worth in the target currency?
+    pub exchange_rate: Option<Decimal>,
+}
+
+impl PayoutFees {
+    pub fn total_fee(&self) -> Decimal {
+        self.method_fee + self.platform_fee
+    }
+}
+
+async fn get_tremendous_payout_methods(
+    queue: &PayoutsQueue,
+) -> Result<Vec<PayoutMethod>> {
+    #[derive(Debug, Deserialize)]
+    struct Sku {
+        min: Decimal,
+        max: Decimal,
+    }
+
+    #[derive(Deserialize, Eq, PartialEq)]
+    #[serde(rename_all = "snake_case")]
+    enum ProductImageType {
+        Card,
+        Logo,
+    }
+
+    #[derive(Deserialize)]
+    struct ProductImage {
+        src: String,
+        #[serde(rename = "type")]
+        type_: ProductImageType,
+    }
+
+    #[derive(Deserialize)]
+    struct ProductCountry {
+        abbr: String,
+    }
+
+    #[derive(Deserialize)]
+    struct Product {
+        id: String,
+        category: String,
+        name: String,
+        // description: String,
+        // disclosure: String,
+        skus: Vec<Sku>,
+        currency_codes: Vec<String>,
+        countries: Vec<ProductCountry>,
+        images: Vec<ProductImage>,
+    }
+
+    #[derive(Deserialize)]
+    struct TremendousResponse {
+        products: Vec<Product>,
+    }
+
+    let response = queue
+        .make_tremendous_request::<(), TremendousResponse>(
+            Method::GET,
+            "products",
+            None,
+        )
+        .await?;
+
+    let mut methods = Vec::new();
+
+    for product in response.products {
+        const BLACKLISTED_IDS: &[&str] = &[
+            // physical visa
+            "A2J05SWPI2QG",
+            // crypto
+            "1UOOSHUUYTAM",
+            "5EVJN47HPDFT",
+            "NI9M4EVAVGFJ",
+            "VLY29QHTMNGT",
+            "7XU98H109Y3A",
+            "0CGEDFP2UIKV",
+            "PDYLQU0K073Y",
+            "HCS5Z7O2NV5G",
+            "IY1VMST1MOXS",
+            "VRPZLJ7HCA8X",
+            // bitcard (crypto)
+            "GWQQS5RM8IZS",
+            "896MYD4SGOGZ",
+            "PWLEN1VZGMZA",
+            "A2VRM96J5K5W",
+            "HV9ICIM3JT7P",
+            "K2KLSPVWC2Q4",
+            "HRBRQLLTDF95",
+            "UUBYLZVK7QAB",
+            "BH8W3XEDEOJN",
+            "7WGE043X1RYQ",
+            "2B13MHUZZVTF",
+            "JN6R44P86EYX",
+            "DA8H43GU84SO",
+            "QK2XAQHSDEH4",
+            "J7K1IQFS76DK",
+            "NL4JQ2G7UPRZ",
+            "OEFTMSBA5ELH",
+            "A3CQK6UHNV27",
+        ];
+        const SUPPORTED_METHODS: &[&str] = &[
+            "merchant_cards",
+            "merchant_card",
+            "bank",
+            "charity",
+            "paypal",
+            "venmo",
+        ];
+
+        if !SUPPORTED_METHODS.contains(&&*product.category)
+            || BLACKLISTED_IDS.contains(&&*product.id)
+        {
+            continue;
+        };
+
+        // https://help.tremendous.com/hc/en-us/articles/41472317536787-Premium-reward-options
+        let fee = match product.category.as_str() {
+            "paypal" | "venmo" => PayoutMethodFee {
+                percentage: dec!(0.06),
+                min: dec!(1.00),
+                max: Some(dec!(25.00)),
+            },
+            _ => PayoutMethodFee {
+                percentage: dec!(0),
+                min: dec!(0),
+                max: None,
+            },
+        };
+
+        let method = PayoutMethod {
+            id: product.id,
+            type_: PayoutMethodType::Tremendous,
+            name: product.name.clone(),
+            category: Some(product.category.clone()),
+            supported_countries: product
+                .countries
+                .into_iter()
+                .map(|x| x.abbr)
+                .collect(),
+            image_logo_url: product
+                .images
+                .iter()
+                .find(|x| x.type_ == ProductImageType::Logo)
+                .map(|x| x.src.clone()),
+            image_url: product
+                .images
+                .into_iter()
+                .find(|x| x.type_ == ProductImageType::Card)
+                .map(|x| x.src),
+            interval: if product.skus.len() > 1 {
+                let mut values = product
+                    .skus
+                    .into_iter()
+                    .map(|x| PayoutDecimal(x.min))
+                    .collect::<Vec<_>>();
+                values.sort_by(|a, b| a.0.cmp(&b.0));
+
+                PayoutInterval::Fixed { values }
+            } else if let Some(first) = product.skus.first() {
+                PayoutInterval::Standard {
+                    min: first.min,
+                    max: first.max,
+                }
+            } else {
+                PayoutInterval::Standard {
+                    min: Decimal::ZERO,
+                    max: Decimal::from(5_000),
+                }
+            },
+            fee,
+        };
+
+        // we do not support interval gift cards with non US based currencies since we cannot do currency conversions properly
+        if let PayoutInterval::Fixed { .. } = method.interval
+            && !product.currency_codes.contains(&"USD".to_string())
+        {
+            continue;
+        }
+
+        methods.push(method);
+    }
+
+    const UPRANK_IDS: &[&str] =
+        &["ET0ZVETV5ILN", "Q24BD9EZ332JT", "UIL1ZYJU5MKN"];
+    const DOWNRANK_IDS: &[&str] = &["EIPF8Q00EMM1", "OU2MWXYWPNWQ"];
+
+    methods.sort_by(|a, b| {
+        let a_top = UPRANK_IDS.contains(&&*a.id);
+        let a_bottom = DOWNRANK_IDS.contains(&&*a.id);
+        let b_top = UPRANK_IDS.contains(&&*b.id);
+        let b_bottom = DOWNRANK_IDS.contains(&&*b.id);
+
+        match (a_top, a_bottom, b_top, b_bottom) {
+            (true, _, true, _) => a.name.cmp(&b.name), // Both in top_priority: sort alphabetically
+            (_, true, _, true) => a.name.cmp(&b.name), // Both in bottom_priority: sort alphabetically
+            (true, _, _, _) => std::cmp::Ordering::Less, // a in top_priority: a comes first
+            (_, _, true, _) => std::cmp::Ordering::Greater, // b in top_priority: b comes first
+            (_, true, _, _) => std::cmp::Ordering::Greater, // a in bottom_priority: b comes first
+            (_, _, _, true) => std::cmp::Ordering::Less, // b in bottom_priority: a comes first
+            (_, _, _, _) => a.name.cmp(&b.name), // Neither in priority: sort alphabetically
+        }
+    });
+
+    Ok(methods)
 }
 
 #[derive(Deserialize)]
@@ -1133,6 +1371,7 @@ pub async fn insert_bank_balances_and_webhook(
     let paypal_result = PayoutsQueue::get_paypal_balance().await;
     let brex_result = PayoutsQueue::get_brex_balance().await;
     let tremendous_result = payouts.get_tremendous_balance().await;
+    let mural_result = payouts.get_mural_balance().await;
 
     let mut insert_account_types = Vec::new();
     let mut insert_amounts = Vec::new();
@@ -1163,6 +1402,9 @@ pub async fn insert_bank_balances_and_webhook(
     if let Ok(Some(ref tremendous)) = tremendous_result {
         add_balance("tremendous", tremendous);
     }
+    if let Ok(Some(ref mural)) = mural_result {
+        add_balance("mural", mural);
+    }
 
     let inserted = sqlx::query_scalar!(
         r#"
diff --git a/apps/labrinth/src/queue/payouts/mural.rs b/apps/labrinth/src/queue/payouts/mural.rs
new file mode 100644
index 00000000..ef4739ab
--- /dev/null
+++ b/apps/labrinth/src/queue/payouts/mural.rs
@@ -0,0 +1,180 @@
+use ariadne::ids::UserId;
+use eyre::Result;
+use muralpay::{MuralError, TokenFeeRequest};
+use rust_decimal::Decimal;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    queue::payouts::{AccountBalance, PayoutsQueue},
+    routes::ApiError,
+    util::error::Context,
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum MuralPayoutRequest {
+    Fiat {
+        bank_name: String,
+        bank_account_owner: String,
+        fiat_and_rail_details: muralpay::FiatAndRailDetails,
+    },
+    Blockchain {
+        wallet_address: String,
+    },
+}
+
+impl PayoutsQueue {
+    pub async fn compute_muralpay_fees(
+        &self,
+        amount: Decimal,
+        fiat_and_rail_code: muralpay::FiatAndRailCode,
+    ) -> Result<muralpay::TokenPayoutFee, ApiError> {
+        let muralpay = self.muralpay.load();
+        let muralpay = muralpay
+            .as_ref()
+            .wrap_internal_err("Mural Pay client not available")?;
+
+        let fees = muralpay
+            .client
+            .get_fees_for_token_amount(&[TokenFeeRequest {
+                amount: muralpay::TokenAmount {
+                    token_symbol: muralpay::USDC.into(),
+                    token_amount: amount,
+                },
+                fiat_and_rail_code,
+            }])
+            .await
+            .wrap_internal_err("failed to request fees")?;
+        let fee = fees
+            .into_iter()
+            .next()
+            .wrap_internal_err("no fees returned")?;
+        Ok(fee)
+    }
+
+    pub async fn create_muralpay_payout_request(
+        &self,
+        user_id: UserId,
+        amount: muralpay::TokenAmount,
+        payout_details: MuralPayoutRequest,
+        recipient_info: muralpay::PayoutRecipientInfo,
+    ) -> Result<muralpay::PayoutRequest, ApiError> {
+        let muralpay = self.muralpay.load();
+        let muralpay = muralpay
+            .as_ref()
+            .wrap_internal_err("Mural Pay client not available")?;
+
+        let payout_details = match payout_details {
+            MuralPayoutRequest::Fiat {
+                bank_name,
+                bank_account_owner,
+                fiat_and_rail_details,
+            } => muralpay::CreatePayoutDetails::Fiat {
+                bank_name,
+                bank_account_owner,
+                developer_fee: None,
+                fiat_and_rail_details,
+            },
+            MuralPayoutRequest::Blockchain { wallet_address } => {
+                muralpay::CreatePayoutDetails::Blockchain {
+                    wallet_details: muralpay::WalletDetails {
+                        // only Polygon chain is currently supported
+                        blockchain: muralpay::Blockchain::Polygon,
+                        wallet_address,
+                    },
+                }
+            }
+        };
+
+        let payout = muralpay::CreatePayout {
+            amount,
+            payout_details,
+            recipient_info,
+            supporting_details: None,
+        };
+
+        let payout_request = muralpay
+            .client
+            .create_payout_request(
+                muralpay.source_account_id,
+                Some(format!("User {user_id}")),
+                &[payout],
+            )
+            .await
+            .map_err(|err| match err {
+                MuralError::Api(err) => ApiError::Request(err.into()),
+                err => ApiError::Internal(err.into()),
+            })?;
+
+        // try to immediately execute the payout request...
+        // use a poor man's try/catch block using this `async move {}`
+        // to catch any errors within this block
+        let result = async move {
+            muralpay
+                .client
+                .execute_payout_request(payout_request.id)
+                .await
+                .wrap_internal_err("failed to execute payout request")?;
+            eyre::Ok(())
+        }
+        .await;
+
+        // and if it fails, make sure to immediately cancel it -
+        // we don't want floating payout requests
+        if let Err(err) = result {
+            muralpay
+                .client
+                .cancel_payout_request(payout_request.id)
+                .await
+                .wrap_internal_err(
+                    "failed to cancel unexecuted payout request",
+                )?;
+            return Err(ApiError::Internal(err));
+        }
+
+        Ok(payout_request)
+    }
+
+    pub async fn cancel_muralpay_payout_request(
+        &self,
+        id: muralpay::PayoutRequestId,
+    ) -> Result<()> {
+        let muralpay = self.muralpay.load();
+        let muralpay = muralpay
+            .as_ref()
+            .wrap_err("Mural Pay client not available")?;
+
+        muralpay.client.cancel_payout_request(id).await?;
+        Ok(())
+    }
+
+    pub async fn get_mural_balance(&self) -> Result<Option<AccountBalance>> {
+        let muralpay = self.muralpay.load();
+        let muralpay = muralpay
+            .as_ref()
+            .wrap_err("Mural Pay client not available")?;
+
+        let account = muralpay
+            .client
+            .get_account(muralpay.source_account_id)
+            .await?;
+        let details = account
+            .account_details
+            .wrap_err("source account does not have details")?;
+        let available = details
+            .balances
+            .iter()
+            .map(|balance| {
+                if balance.token_symbol == muralpay::USDC {
+                    balance.token_amount
+                } else {
+                    Decimal::ZERO
+                }
+            })
+            .sum::<Decimal>();
+        Ok(Some(AccountBalance {
+            available,
+            pending: Decimal::ZERO,
+        }))
+    }
+}
diff --git a/apps/labrinth/src/routes/internal/mod.rs b/apps/labrinth/src/routes/internal/mod.rs
index 32f5a0bf..8cca28c2 100644
--- a/apps/labrinth/src/routes/internal/mod.rs
+++ b/apps/labrinth/src/routes/internal/mod.rs
@@ -7,6 +7,7 @@ pub mod gdpr;
 pub mod gotenberg;
 pub mod medal;
 pub mod moderation;
+pub mod mural;
 pub mod pats;
 pub mod session;
 pub mod statuses;
@@ -31,6 +32,7 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
             .configure(statuses::config)
             .configure(medal::config)
             .configure(external_notifications::config)
-            .configure(affiliate::config),
+            .configure(affiliate::config)
+            .configure(mural::config),
     );
 }
diff --git a/apps/labrinth/src/routes/internal/mural.rs b/apps/labrinth/src/routes/internal/mural.rs
new file mode 100644
index 00000000..d10ff4e9
--- /dev/null
+++ b/apps/labrinth/src/routes/internal/mural.rs
@@ -0,0 +1,28 @@
+use actix_web::{get, web};
+use muralpay::FiatAndRailCode;
+use strum::IntoEnumIterator;
+
+use crate::{
+    queue::payouts::PayoutsQueue, routes::ApiError, util::error::Context,
+};
+
+pub fn config(cfg: &mut web::ServiceConfig) {
+    cfg.service(get_bank_details);
+}
+
+#[get("/mural/bank-details")]
+async fn get_bank_details(
+    payouts_queue: web::Data<PayoutsQueue>,
+) -> Result<web::Json<muralpay::BankDetailsResponse>, ApiError> {
+    let mural = payouts_queue.muralpay.load();
+    let mural = mural
+        .as_ref()
+        .wrap_internal_err("Mural API not available")?;
+    let fiat_and_rail_codes = FiatAndRailCode::iter().collect::<Vec<_>>();
+    let details = mural
+        .client
+        .get_bank_details(&fiat_and_rail_codes)
+        .await
+        .wrap_internal_err("failed to fetch bank details")?;
+    Ok(web::Json(details))
+}
diff --git a/apps/labrinth/src/routes/mod.rs b/apps/labrinth/src/routes/mod.rs
index 66a20a91..ca55240b 100644
--- a/apps/labrinth/src/routes/mod.rs
+++ b/apps/labrinth/src/routes/mod.rs
@@ -85,12 +85,18 @@ pub fn root_config(cfg: &mut web::ServiceConfig) {
     );
 }
 
+/// Error when calling an HTTP endpoint.
 #[derive(thiserror::Error, Debug)]
 pub enum ApiError {
+    /// Error occurred on the server side, which the caller has no fault in.
     #[error(transparent)]
     Internal(eyre::Report),
+    /// Caller made an invalid or malformed request.
     #[error(transparent)]
     Request(eyre::Report),
+    /// Caller attempted a request which they are not allowed to make.
+    #[error(transparent)]
+    Auth(eyre::Report),
     #[error("Invalid input: {0}")]
     InvalidInput(String),
     #[error("Environment error")]
@@ -161,41 +167,47 @@ impl ApiError {
     pub fn as_api_error<'a>(&self) -> crate::models::error::ApiError<'a> {
         crate::models::error::ApiError {
             error: match self {
-                ApiError::Internal(..) => "internal_error",
+                Self::Internal(..) => "internal_error",
                 Self::Request(..) => "request_error",
-                ApiError::Env(..) => "environment_error",
-                ApiError::Database(..) => "database_error",
-                ApiError::SqlxDatabase(..) => "database_error",
-                ApiError::RedisDatabase(..) => "database_error",
-                ApiError::Authentication(..) => "unauthorized",
-                ApiError::CustomAuthentication(..) => "unauthorized",
-                ApiError::Xml(..) => "xml_error",
-                ApiError::Json(..) => "json_error",
-                ApiError::Search(..) => "search_error",
-                ApiError::Indexing(..) => "indexing_error",
-                ApiError::FileHosting(..) => "file_hosting_error",
-                ApiError::InvalidInput(..) => "invalid_input",
-                ApiError::Validation(..) => "invalid_input",
-                ApiError::Payments(..) => "payments_error",
-                ApiError::Discord(..) => "discord_error",
-                ApiError::Turnstile => "turnstile_error",
-                ApiError::Decoding(..) => "decoding_error",
-                ApiError::ImageParse(..) => "invalid_image",
-                ApiError::PasswordHashing(..) => "password_hashing_error",
-                ApiError::Mail(..) => "mail_error",
-                ApiError::Clickhouse(..) => "clickhouse_error",
-                ApiError::Reroute(..) => "reroute_error",
-                ApiError::NotFound => "not_found",
-                ApiError::Conflict(..) => "conflict",
-                ApiError::TaxComplianceApi => "tax_compliance_api_error",
-                ApiError::Zip(..) => "zip_error",
-                ApiError::Io(..) => "io_error",
-                ApiError::RateLimitError(..) => "ratelimit_error",
-                ApiError::Stripe(..) => "stripe_error",
-                ApiError::TaxProcessor(..) => "tax_processor_error",
-                ApiError::Slack(..) => "slack_error",
+                Self::Auth(..) => "auth_error",
+                Self::Env(..) => "environment_error",
+                Self::Database(..) => "database_error",
+                Self::SqlxDatabase(..) => "database_error",
+                Self::RedisDatabase(..) => "database_error",
+                Self::Authentication(..) => "unauthorized",
+                Self::CustomAuthentication(..) => "unauthorized",
+                Self::Xml(..) => "xml_error",
+                Self::Json(..) => "json_error",
+                Self::Search(..) => "search_error",
+                Self::Indexing(..) => "indexing_error",
+                Self::FileHosting(..) => "file_hosting_error",
+                Self::InvalidInput(..) => "invalid_input",
+                Self::Validation(..) => "invalid_input",
+                Self::Payments(..) => "payments_error",
+                Self::Discord(..) => "discord_error",
+                Self::Turnstile => "turnstile_error",
+                Self::Decoding(..) => "decoding_error",
+                Self::ImageParse(..) => "invalid_image",
+                Self::PasswordHashing(..) => "password_hashing_error",
+                Self::Mail(..) => "mail_error",
+                Self::Clickhouse(..) => "clickhouse_error",
+                Self::Reroute(..) => "reroute_error",
+                Self::NotFound => "not_found",
+                Self::Conflict(..) => "conflict",
+                Self::TaxComplianceApi => "tax_compliance_api_error",
+                Self::Zip(..) => "zip_error",
+                Self::Io(..) => "io_error",
+                Self::RateLimitError(..) => "ratelimit_error",
+                Self::Stripe(..) => "stripe_error",
+                Self::TaxProcessor(..) => "tax_processor_error",
+                Self::Slack(..) => "slack_error",
+            },
+            description: match self {
+                Self::Internal(e) => format!("{e:#?}"),
+                Self::Request(e) => format!("{e:#?}"),
+                Self::Auth(e) => format!("{e:#?}"),
+                _ => self.to_string(),
             },
-            description: self.to_string(),
         }
     }
 }
@@ -203,39 +215,40 @@ impl ApiError {
 impl actix_web::ResponseError for ApiError {
     fn status_code(&self) -> StatusCode {
         match self {
-            ApiError::Internal(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Request(..) => StatusCode::BAD_REQUEST,
-            ApiError::InvalidInput(..) => StatusCode::BAD_REQUEST,
-            ApiError::Env(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Database(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::SqlxDatabase(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::RedisDatabase(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Clickhouse(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Authentication(..) => StatusCode::UNAUTHORIZED,
-            ApiError::CustomAuthentication(..) => StatusCode::UNAUTHORIZED,
-            ApiError::Xml(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Json(..) => StatusCode::BAD_REQUEST,
-            ApiError::Search(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Indexing(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::FileHosting(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Validation(..) => StatusCode::BAD_REQUEST,
-            ApiError::Payments(..) => StatusCode::FAILED_DEPENDENCY,
-            ApiError::Discord(..) => StatusCode::FAILED_DEPENDENCY,
-            ApiError::Turnstile => StatusCode::BAD_REQUEST,
-            ApiError::Decoding(..) => StatusCode::BAD_REQUEST,
-            ApiError::ImageParse(..) => StatusCode::BAD_REQUEST,
-            ApiError::PasswordHashing(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Mail(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Reroute(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::NotFound => StatusCode::NOT_FOUND,
-            ApiError::Conflict(..) => StatusCode::CONFLICT,
-            ApiError::TaxComplianceApi => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Zip(..) => StatusCode::BAD_REQUEST,
-            ApiError::Io(..) => StatusCode::BAD_REQUEST,
-            ApiError::RateLimitError(..) => StatusCode::TOO_MANY_REQUESTS,
-            ApiError::Stripe(..) => StatusCode::FAILED_DEPENDENCY,
-            ApiError::TaxProcessor(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::Slack(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Internal(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Request(..) => StatusCode::BAD_REQUEST,
+            Self::Auth(..) => StatusCode::UNAUTHORIZED,
+            Self::InvalidInput(..) => StatusCode::BAD_REQUEST,
+            Self::Env(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Database(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::SqlxDatabase(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::RedisDatabase(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Clickhouse(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Authentication(..) => StatusCode::UNAUTHORIZED,
+            Self::CustomAuthentication(..) => StatusCode::UNAUTHORIZED,
+            Self::Xml(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Json(..) => StatusCode::BAD_REQUEST,
+            Self::Search(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Indexing(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::FileHosting(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Validation(..) => StatusCode::BAD_REQUEST,
+            Self::Payments(..) => StatusCode::FAILED_DEPENDENCY,
+            Self::Discord(..) => StatusCode::FAILED_DEPENDENCY,
+            Self::Turnstile => StatusCode::BAD_REQUEST,
+            Self::Decoding(..) => StatusCode::BAD_REQUEST,
+            Self::ImageParse(..) => StatusCode::BAD_REQUEST,
+            Self::PasswordHashing(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Mail(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Reroute(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::NotFound => StatusCode::NOT_FOUND,
+            Self::Conflict(..) => StatusCode::CONFLICT,
+            Self::TaxComplianceApi => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Zip(..) => StatusCode::BAD_REQUEST,
+            Self::Io(..) => StatusCode::BAD_REQUEST,
+            Self::RateLimitError(..) => StatusCode::TOO_MANY_REQUESTS,
+            Self::Stripe(..) => StatusCode::FAILED_DEPENDENCY,
+            Self::TaxProcessor(..) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::Slack(..) => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }
 
diff --git a/apps/labrinth/src/routes/v3/mod.rs b/apps/labrinth/src/routes/v3/mod.rs
index 96c54ce4..96c3aaf6 100644
--- a/apps/labrinth/src/routes/v3/mod.rs
+++ b/apps/labrinth/src/routes/v3/mod.rs
@@ -47,7 +47,6 @@ pub fn config(cfg: &mut web::ServiceConfig) {
             .configure(threads::config)
             .configure(users::config)
             .configure(version_file::config)
-            .configure(payouts::config)
             .configure(versions::config)
             .configure(friends::config),
     );
@@ -61,6 +60,11 @@ pub fn utoipa_config(
             .wrap(default_cors())
             .configure(analytics_get::config),
     );
+    cfg.service(
+        utoipa_actix_web::scope("/v3/payout")
+            .wrap(default_cors())
+            .configure(payouts::config),
+    );
 }
 
 pub async fn hello_world() -> Result<HttpResponse, ApiError> {
diff --git a/apps/labrinth/src/routes/v3/payouts.rs b/apps/labrinth/src/routes/v3/payouts.rs
index 8779a887..36a6b7fe 100644
--- a/apps/labrinth/src/routes/v3/payouts.rs
+++ b/apps/labrinth/src/routes/v3/payouts.rs
@@ -1,11 +1,15 @@
 use crate::auth::validate::get_user_record_from_bearer_token;
 use crate::auth::{AuthenticationError, get_user_from_headers};
-use crate::database::models::DBUserId;
+use crate::database::models::payout_item::DBPayout;
+use crate::database::models::{DBPayoutId, DBUser, DBUserId};
 use crate::database::models::{generate_payout_id, users_compliance};
 use crate::database::redis::RedisPool;
 use crate::models::ids::PayoutId;
 use crate::models::pats::Scopes;
-use crate::models::payouts::{PayoutMethodType, PayoutStatus};
+use crate::models::payouts::{
+    MuralPayDetails, PayoutMethodRequest, PayoutMethodType, PayoutStatus,
+    TremendousDetails, TremendousForexResponse,
+};
 use crate::queue::payouts::PayoutsQueue;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
@@ -13,6 +17,7 @@ use crate::util::avalara1099;
 use crate::util::error::Context;
 use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use chrono::{DateTime, Duration, Utc};
+use eyre::eyre;
 use hex::ToHex;
 use hmac::{Hmac, Mac};
 use reqwest::Method;
@@ -28,38 +33,26 @@ use tracing::error;
 const COMPLIANCE_CHECK_DEBOUNCE: chrono::Duration =
     chrono::Duration::seconds(15);
 
-pub fn config(cfg: &mut web::ServiceConfig) {
-    cfg.service(
-        web::scope("payout")
-            .service(paypal_webhook)
-            .service(tremendous_webhook)
-            // we use `route` instead of `service` because `user_payouts` uses the logic of `transaction_history`
-            .route(
-                "",
-                web::get().to(
-                    #[expect(
-                        deprecated,
-                        reason = "v3 backwards compatibility"
-                    )]
-                    user_payouts,
-                ),
-            )
-            .route("history", web::get().to(transaction_history))
-            .service(create_payout)
-            .service(cancel_payout)
-            .service(payment_methods)
-            .service(get_balance)
-            .service(platform_revenue)
-            .service(post_compliance_form),
-    );
+pub fn config(cfg: &mut utoipa_actix_web::service_config::ServiceConfig) {
+    cfg.service(paypal_webhook)
+        .service(tremendous_webhook)
+        .service(transaction_history)
+        .service(calculate_fees)
+        .service(create_payout)
+        .service(cancel_payout)
+        .service(payment_methods)
+        .service(get_balance)
+        .service(platform_revenue)
+        .service(post_compliance_form);
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, utoipa::ToSchema)]
 pub struct RequestForm {
     form_type: users_compliance::FormType,
 }
 
-#[post("compliance")]
+#[utoipa::path]
+#[post("/compliance")]
 pub async fn post_compliance_form(
     req: HttpRequest,
     pool: web::Data<PgPool>,
@@ -157,7 +150,8 @@ pub async fn post_compliance_form(
     }
 }
 
-#[post("_paypal")]
+#[utoipa::path]
+#[post("/_paypal")]
 pub async fn paypal_webhook(
     req: HttpRequest,
     pool: web::Data<PgPool>,
@@ -314,7 +308,8 @@ pub async fn paypal_webhook(
     Ok(HttpResponse::NoContent().finish())
 }
 
-#[post("_tremendous")]
+#[utoipa::path]
+#[post("/_tremendous")]
 pub async fn tremendous_webhook(
     req: HttpRequest,
     pool: web::Data<PgPool>,
@@ -424,60 +419,55 @@ pub async fn tremendous_webhook(
     Ok(HttpResponse::NoContent().finish())
 }
 
-#[deprecated = "use `transaction_history` instead"]
-pub async fn user_payouts(
-    req: HttpRequest,
-    pool: web::Data<PgPool>,
-    redis: web::Data<RedisPool>,
-    session_queue: web::Data<AuthQueue>,
-) -> Result<web::Json<Vec<crate::models::payouts::Payout>>, ApiError> {
-    let (_, user) = get_user_from_headers(
-        &req,
-        &**pool,
-        &redis,
-        &session_queue,
-        Scopes::PAYOUTS_READ,
-    )
-    .await?;
-
-    let items = transaction_history(req, pool, redis, session_queue)
-        .await?
-        .0
-        .into_iter()
-        .filter_map(|txn_item| match txn_item {
-            TransactionItem::Withdrawal {
-                id,
-                status,
-                created,
-                amount,
-                fee,
-                method_type,
-                method_address,
-            } => Some(crate::models::payouts::Payout {
-                id,
-                user_id: user.id,
-                status,
-                created,
-                amount,
-                fee,
-                method: method_type,
-                method_address,
-                platform_id: None,
-            }),
-            TransactionItem::PayoutAvailable { .. } => None,
-        })
-        .collect::<Vec<_>>();
-    Ok(web::Json(items))
-}
-
-#[derive(Deserialize)]
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct Withdrawal {
     #[serde(with = "rust_decimal::serde::float")]
     amount: Decimal,
-    method: PayoutMethodType,
+    #[serde(flatten)]
+    method: PayoutMethodRequest,
     method_id: String,
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WithdrawalFees {
+    pub fee: Decimal,
+    pub exchange_rate: Option<Decimal>,
+}
+
+#[utoipa::path]
+#[post("/fees")]
+pub async fn calculate_fees(
+    req: HttpRequest,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    body: web::Json<Withdrawal>,
+    session_queue: web::Data<AuthQueue>,
+    payouts_queue: web::Data<PayoutsQueue>,
+) -> Result<web::Json<WithdrawalFees>, ApiError> {
+    // even though we don't use the user, we ensure they're logged in to make API calls
+    let (_, _user) = get_user_record_from_bearer_token(
+        &req,
+        None,
+        &**pool,
+        &redis,
+        &session_queue,
+    )
+    .await?
+    .ok_or_else(|| {
+        ApiError::Authentication(AuthenticationError::InvalidCredentials)
+    })?;
+
+    let fees = payouts_queue
+        .calculate_fees(&body.method, &body.method_id, body.amount)
+        .await?;
+
+    Ok(web::Json(WithdrawalFees {
+        fee: fees.total_fee(),
+        exchange_rate: fees.exchange_rate,
+    }))
+}
+
+#[utoipa::path]
 #[post("")]
 pub async fn create_payout(
     req: HttpRequest,
@@ -486,7 +476,7 @@ pub async fn create_payout(
     body: web::Json<Withdrawal>,
     session_queue: web::Data<AuthQueue>,
     payouts_queue: web::Data<PayoutsQueue>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<(), ApiError> {
     let (scopes, user) = get_user_record_from_bearer_token(
         &req,
         None,
@@ -514,9 +504,12 @@ pub async fn create_payout(
         user.id.0
     )
     .fetch_optional(&mut *transaction)
-    .await?;
+    .await
+    .wrap_internal_err("failed to fetch user balance")?;
 
-    let balance = get_user_balance(user.id, &pool).await?;
+    let balance = get_user_balance(user.id, &pool)
+        .await
+        .wrap_internal_err("failed to calculate user balance")?;
     if balance.available < body.amount || body.amount < Decimal::ZERO {
         return Err(ApiError::InvalidInput(
             "You do not have enough funds to make this payout!".to_string(),
@@ -585,255 +578,372 @@ pub async fn create_payout(
         ));
     }
 
-    let payout_method = payouts_queue
-        .get_payout_methods()
-        .await?
-        .into_iter()
-        .find(|x| x.id == body.method_id)
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "Invalid payment method specified!".to_string(),
-            )
-        })?;
+    let fees = payouts_queue
+        .calculate_fees(&body.method, &body.method_id, body.amount)
+        .await?;
 
-    let fee = std::cmp::min(
-        std::cmp::max(
-            payout_method.fee.min,
-            payout_method.fee.percentage * body.amount,
-        ),
-        payout_method.fee.max.unwrap_or(Decimal::MAX),
-    );
+    // fees are a bit complicated here, since we have 2 types:
+    // - method fees - this is what Tremendous, Mural, etc. will take from us
+    //   without us having a say in it
+    // - platform fees - this is what we deliberately keep for ourselves
+    // - total fees - method fees + platform fees
+    //
+    // we first make sure that `amount - total fees` is greater than zero,
+    // then we issue a payout request with `amount - platform fees`
 
-    let transfer = (body.amount - fee).round_dp(2);
-    if transfer <= Decimal::ZERO {
+    if (body.amount - fees.total_fee()).round_dp(2) <= Decimal::ZERO {
         return Err(ApiError::InvalidInput(
             "You need to withdraw more to cover the fee!".to_string(),
         ));
     }
 
-    let payout_id = generate_payout_id(&mut transaction).await?;
+    let sent_to_method = (body.amount - fees.platform_fee).round_dp(2);
+    assert!(sent_to_method > Decimal::ZERO);
 
-    let payout_item = match body.method {
-        PayoutMethodType::Venmo | PayoutMethodType::PayPal => {
-            let (wallet, wallet_type, address, display_address) = if body.method
-                == PayoutMethodType::Venmo
-            {
-                if let Some(venmo) = user.venmo_handle {
-                    ("Venmo", "user_handle", venmo.clone(), venmo)
-                } else {
-                    return Err(ApiError::InvalidInput(
-                        "Venmo address has not been set for account!"
-                            .to_string(),
-                    ));
-                }
-            } else if let Some(paypal_id) = user.paypal_id {
-                if let Some(paypal_country) = user.paypal_country {
-                    if &*paypal_country == "US"
-                        && &*body.method_id != "paypal_us"
-                    {
-                        return Err(ApiError::InvalidInput(
-                            "Please use the US PayPal transfer option!"
-                                .to_string(),
-                        ));
-                    } else if &*paypal_country != "US"
-                        && &*body.method_id == "paypal_us"
-                    {
-                        return Err(ApiError::InvalidInput(
-                                "Please use the International PayPal transfer option!".to_string(),
-                            ));
-                    }
+    let payout_id = generate_payout_id(&mut transaction)
+        .await
+        .wrap_internal_err("failed to generate payout ID")?;
 
-                    (
-                        "PayPal",
-                        "paypal_id",
-                        paypal_id.clone(),
-                        user.paypal_email.unwrap_or(paypal_id),
-                    )
-                } else {
-                    return Err(ApiError::InvalidInput(
-                        "Please re-link your PayPal account!".to_string(),
-                    ));
-                }
-            } else {
-                return Err(ApiError::InvalidInput(
-                    "You have not linked a PayPal account!".to_string(),
-                ));
-            };
+    let payout_cx = PayoutContext {
+        body: &body,
+        user: &user,
+        payout_id,
+        raw_amount: body.amount,
+        total_fee: fees.total_fee(),
+        sent_to_method,
+        payouts_queue: &payouts_queue,
+    };
 
-            #[derive(Deserialize)]
-            struct PayPalLink {
-                href: String,
-            }
-
-            #[derive(Deserialize)]
-            struct PayoutsResponse {
-                pub links: Vec<PayPalLink>,
-            }
-
-            let mut payout_item =
-                crate::database::models::payout_item::DBPayout {
-                    id: payout_id,
-                    user_id: user.id,
-                    created: Utc::now(),
-                    status: PayoutStatus::InTransit,
-                    amount: transfer,
-                    fee: Some(fee),
-                    method: Some(body.method),
-                    method_address: Some(display_address),
-                    platform_id: None,
-                };
-
-            let res: PayoutsResponse = payouts_queue.make_paypal_request(
-                Method::POST,
-                "payments/payouts",
-                Some(
-                    json! ({
-                        "sender_batch_header": {
-                            "sender_batch_id": format!("{}-payouts", Utc::now().to_rfc3339()),
-                            "email_subject": "You have received a payment from Modrinth!",
-                            "email_message": "Thank you for creating projects on Modrinth. Please claim this payment within 30 days.",
-                        },
-                        "items": [{
-                            "amount": {
-                                "currency": "USD",
-                                "value": transfer.to_string()
-                            },
-                            "receiver": address,
-                            "note": "Payment from Modrinth creator monetization program",
-                            "recipient_type": wallet_type,
-                            "recipient_wallet": wallet,
-                            "sender_item_id": crate::models::ids::PayoutId::from(payout_id),
-                        }]
-                    })
-                ),
-                None,
-                None
-            ).await?;
-
-            if let Some(link) = res.links.first() {
-                #[derive(Deserialize)]
-                struct PayoutItem {
-                    pub payout_item_id: String,
-                }
-
-                #[derive(Deserialize)]
-                struct PayoutData {
-                    pub items: Vec<PayoutItem>,
-                }
-
-                if let Ok(res) = payouts_queue
-                    .make_paypal_request::<(), PayoutData>(
-                        Method::GET,
-                        &link.href,
-                        None,
-                        None,
-                        Some(true),
-                    )
-                    .await
-                    && let Some(data) = res.items.first()
-                {
-                    payout_item.platform_id = Some(data.payout_item_id.clone());
-                }
-            }
-
-            payout_item
+    let payout_item = match &body.method {
+        PayoutMethodRequest::PayPal | PayoutMethodRequest::Venmo => {
+            paypal_payout(payout_cx).await?
         }
-        PayoutMethodType::Tremendous => {
-            if let Some(email) = user.email {
-                if user.email_verified {
-                    let mut payout_item =
-                        crate::database::models::payout_item::DBPayout {
-                            id: payout_id,
-                            user_id: user.id,
-                            created: Utc::now(),
-                            status: PayoutStatus::InTransit,
-                            amount: transfer,
-                            fee: Some(fee),
-                            method: Some(PayoutMethodType::Tremendous),
-                            method_address: Some(email.clone()),
-                            platform_id: None,
-                        };
-
-                    #[derive(Deserialize)]
-                    struct Reward {
-                        pub id: String,
-                    }
-
-                    #[derive(Deserialize)]
-                    struct Order {
-                        pub rewards: Vec<Reward>,
-                    }
-
-                    #[derive(Deserialize)]
-                    struct TremendousResponse {
-                        pub order: Order,
-                    }
-
-                    let res: TremendousResponse = payouts_queue
-                        .make_tremendous_request(
-                            Method::POST,
-                            "orders",
-                            Some(json! ({
-                                "payment": {
-                                    "funding_source_id": "BALANCE",
-                                },
-                                "rewards": [{
-                                    "value": {
-                                        "denomination": transfer
-                                    },
-                                    "delivery": {
-                                        "method": "EMAIL"
-                                    },
-                                    "recipient": {
-                                        "name": user.username,
-                                        "email": email
-                                    },
-                                    "products": [
-                                        &body.method_id,
-                                    ],
-                                    "campaign_id": dotenvy::var("TREMENDOUS_CAMPAIGN_ID")?,
-                                }]
-                            })),
-                        )
-                        .await?;
-
-                    if let Some(reward) = res.order.rewards.first() {
-                        payout_item.platform_id = Some(reward.id.clone())
-                    }
-
-                    payout_item
-                } else {
-                    return Err(ApiError::InvalidInput(
-                        "You must verify your account email to proceed!"
-                            .to_string(),
-                    ));
-                }
-            } else {
-                return Err(ApiError::InvalidInput(
-                    "You must add an email to your account to proceed!"
-                        .to_string(),
-                ));
-            }
+        PayoutMethodRequest::Tremendous { method_details } => {
+            tremendous_payout(payout_cx, method_details).await?
         }
-        PayoutMethodType::Unknown => {
-            return Err(ApiError::Payments(
-                "Invalid payment method specified!".to_string(),
-            ));
+        PayoutMethodRequest::MuralPay { method_details } => {
+            mural_pay_payout(payout_cx, method_details).await?
         }
     };
 
-    payout_item.insert(&mut transaction).await?;
+    payout_item
+        .insert(&mut transaction)
+        .await
+        .wrap_internal_err("failed to insert payout")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("failed to commit transaction")?;
     crate::database::models::DBUser::clear_caches(&[(user.id, None)], &redis)
-        .await?;
+        .await
+        .wrap_internal_err("failed to clear user caches")?;
 
-    Ok(HttpResponse::NoContent().finish())
+    Ok(())
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Clone, Copy)]
+struct PayoutContext<'a> {
+    body: &'a Withdrawal,
+    user: &'a DBUser,
+    payout_id: DBPayoutId,
+    raw_amount: Decimal,
+    total_fee: Decimal,
+    sent_to_method: Decimal,
+    payouts_queue: &'a PayoutsQueue,
+}
+
+fn get_verified_email(user: &DBUser) -> Result<&str, ApiError> {
+    let email = user.email.as_ref().wrap_request_err(
+        "you must add an email to your account to withdraw",
+    )?;
+    if !user.email_verified {
+        return Err(ApiError::Request(eyre!(
+            "you must verify your email to withdraw"
+        )));
+    }
+
+    Ok(email)
+}
+
+async fn tremendous_payout(
+    PayoutContext {
+        body,
+        user,
+        payout_id,
+        raw_amount,
+        total_fee,
+        sent_to_method,
+        payouts_queue,
+    }: PayoutContext<'_>,
+    TremendousDetails {
+        delivery_email,
+        currency,
+    }: &TremendousDetails,
+) -> Result<DBPayout, ApiError> {
+    let user_email = get_verified_email(user)?;
+
+    let mut payout_item = DBPayout {
+        id: payout_id,
+        user_id: user.id,
+        created: Utc::now(),
+        status: PayoutStatus::InTransit,
+        amount: raw_amount,
+        fee: Some(total_fee),
+        method: Some(PayoutMethodType::Tremendous),
+        method_address: Some(user_email.to_string()),
+        platform_id: None,
+    };
+
+    #[derive(Deserialize)]
+    struct Reward {
+        pub id: String,
+    }
+
+    #[derive(Deserialize)]
+    struct Order {
+        pub rewards: Vec<Reward>,
+    }
+
+    #[derive(Deserialize)]
+    struct TremendousResponse {
+        pub order: Order,
+    }
+
+    let forex: TremendousForexResponse = payouts_queue
+        .make_tremendous_request(Method::GET, "forex", None::<()>)
+        .await
+        .wrap_internal_err("failed to fetch Tremendous forex data")?;
+
+    let (denomination, currency_code) = if let Some(currency) = currency {
+        let currency_code = currency.to_string();
+        let exchange_rate =
+            forex.forex.get(&currency_code).wrap_internal_err_with(|| {
+                eyre!("no Tremendous forex data for {currency}")
+            })?;
+        (sent_to_method * *exchange_rate, Some(currency_code))
+    } else {
+        (sent_to_method, None)
+    };
+
+    let reward_value = if let Some(currency_code) = currency_code {
+        json!({
+            "denomination": denomination,
+            "currency_code": currency_code,
+        })
+    } else {
+        json!({
+            "denomination": denomination,
+        })
+    };
+
+    let res: TremendousResponse = payouts_queue
+        .make_tremendous_request(
+            Method::POST,
+            "orders",
+            Some(json! ({
+                "payment": {
+                    "funding_source_id": "BALANCE",
+                },
+                "rewards": [{
+                    "value": reward_value,
+                    "delivery": {
+                        "method": "EMAIL"
+                    },
+                    "recipient": {
+                        "name": user.username,
+                        "email": delivery_email
+                    },
+                    "products": [
+                        &body.method_id,
+                    ],
+                    "campaign_id": dotenvy::var("TREMENDOUS_CAMPAIGN_ID")?,
+                }]
+            })),
+        )
+        .await?;
+
+    if let Some(reward) = res.order.rewards.first() {
+        payout_item.platform_id = Some(reward.id.clone())
+    }
+
+    Ok(payout_item)
+}
+
+async fn mural_pay_payout(
+    PayoutContext {
+        body: _body,
+        user,
+        payout_id,
+        raw_amount,
+        total_fee,
+        sent_to_method,
+        payouts_queue,
+    }: PayoutContext<'_>,
+    details: &MuralPayDetails,
+) -> Result<DBPayout, ApiError> {
+    let user_email = get_verified_email(user)?;
+
+    let payout_request = payouts_queue
+        .create_muralpay_payout_request(
+            user.id.into(),
+            muralpay::TokenAmount {
+                token_symbol: muralpay::USDC.into(),
+                token_amount: sent_to_method,
+            },
+            details.payout_details.clone(),
+            details.recipient_info.clone(),
+        )
+        .await?;
+
+    Ok(DBPayout {
+        id: payout_id,
+        user_id: user.id,
+        created: Utc::now(),
+        status: PayoutStatus::Success,
+        amount: raw_amount,
+        fee: Some(total_fee),
+        method: Some(PayoutMethodType::MuralPay),
+        method_address: Some(user_email.to_string()),
+        platform_id: Some(payout_request.id.to_string()),
+    })
+}
+
+async fn paypal_payout(
+    PayoutContext {
+        body,
+        user,
+        payout_id,
+        raw_amount,
+        total_fee,
+        sent_to_method,
+        payouts_queue,
+    }: PayoutContext<'_>,
+) -> Result<DBPayout, ApiError> {
+    let (wallet, wallet_type, address, display_address) =
+        if matches!(body.method, PayoutMethodRequest::Venmo) {
+            if let Some(venmo) = &user.venmo_handle {
+                ("Venmo", "user_handle", venmo.clone(), venmo)
+            } else {
+                return Err(ApiError::InvalidInput(
+                    "Venmo address has not been set for account!".to_string(),
+                ));
+            }
+        } else if let Some(paypal_id) = &user.paypal_id {
+            if let Some(paypal_country) = &user.paypal_country {
+                if paypal_country == "US" && &*body.method_id != "paypal_us" {
+                    return Err(ApiError::InvalidInput(
+                        "Please use the US PayPal transfer option!".to_string(),
+                    ));
+                } else if paypal_country != "US"
+                    && &*body.method_id == "paypal_us"
+                {
+                    return Err(ApiError::InvalidInput(
+                        "Please use the International PayPal transfer option!"
+                            .to_string(),
+                    ));
+                }
+
+                (
+                    "PayPal",
+                    "paypal_id",
+                    paypal_id.clone(),
+                    user.paypal_email.as_ref().unwrap_or(paypal_id),
+                )
+            } else {
+                return Err(ApiError::InvalidInput(
+                    "Please re-link your PayPal account!".to_string(),
+                ));
+            }
+        } else {
+            return Err(ApiError::InvalidInput(
+                "You have not linked a PayPal account!".to_string(),
+            ));
+        };
+
+    #[derive(Deserialize)]
+    struct PayPalLink {
+        href: String,
+    }
+
+    #[derive(Deserialize)]
+    struct PayoutsResponse {
+        pub links: Vec<PayPalLink>,
+    }
+
+    let mut payout_item = crate::database::models::payout_item::DBPayout {
+        id: payout_id,
+        user_id: user.id,
+        created: Utc::now(),
+        status: PayoutStatus::InTransit,
+        amount: raw_amount,
+        fee: Some(total_fee),
+        method: Some(body.method.method_type()),
+        method_address: Some(display_address.clone()),
+        platform_id: None,
+    };
+
+    let res: PayoutsResponse = payouts_queue.make_paypal_request(
+        Method::POST,
+        "payments/payouts",
+        Some(
+            json!({
+                "sender_batch_header": {
+                    "sender_batch_id": format!("{}-payouts", Utc::now().to_rfc3339()),
+                    "email_subject": "You have received a payment from Modrinth!",
+                    "email_message": "Thank you for creating projects on Modrinth. Please claim this payment within 30 days.",
+                },
+                "items": [{
+                    "amount": {
+                        "currency": "USD",
+                        "value": sent_to_method.to_string()
+                    },
+                    "receiver": address,
+                    "note": "Payment from Modrinth creator monetization program",
+                    "recipient_type": wallet_type,
+                    "recipient_wallet": wallet,
+                    "sender_item_id": crate::models::ids::PayoutId::from(payout_id),
+                }]
+            })
+        ),
+        None,
+        None
+    ).await?;
+
+    if let Some(link) = res.links.first() {
+        #[derive(Deserialize)]
+        struct PayoutItem {
+            pub payout_item_id: String,
+        }
+
+        #[derive(Deserialize)]
+        struct PayoutData {
+            pub items: Vec<PayoutItem>,
+        }
+
+        if let Ok(res) = payouts_queue
+            .make_paypal_request::<(), PayoutData>(
+                Method::GET,
+                &link.href,
+                None,
+                None,
+                Some(true),
+            )
+            .await
+            && let Some(data) = res.items.first()
+        {
+            payout_item.platform_id = Some(data.payout_item_id.clone());
+        }
+    }
+
+    Ok(payout_item)
+}
+
+/// User performing a payout-related action.
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum TransactionItem {
+    /// User withdrew some of their available payout.
     Withdrawal {
         id: PayoutId,
         status: PayoutStatus,
@@ -843,6 +953,7 @@ pub enum TransactionItem {
         method_type: Option<PayoutMethodType>,
         method_address: Option<String>,
     },
+    /// User got a payout available for them to withdraw.
     PayoutAvailable {
         created: DateTime<Utc>,
         payout_source: PayoutSource,
@@ -859,7 +970,17 @@ impl TransactionItem {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Serialize,
+    Deserialize,
+    utoipa::ToSchema,
+)]
 #[serde(rename_all = "snake_case")]
 #[non_exhaustive]
 pub enum PayoutSource {
@@ -867,6 +988,10 @@ pub enum PayoutSource {
     Affilites,
 }
 
+/// Get the history of when the authorized user got payouts available, and when
+/// the user withdrew their payouts.
+#[utoipa::path(responses((status = OK, body = Vec<TransactionItem>)))]
+#[get("/history")]
 pub async fn transaction_history(
     req: HttpRequest,
     pool: web::Data<PgPool>,
@@ -907,7 +1032,7 @@ pub async fn transaction_history(
             });
 
     let mut payouts_available = sqlx::query!(
-        "SELECT created, amount
+        "SELECT date_available, amount
         FROM payouts_values
         WHERE user_id = $1
         AND NOW() >= date_available",
@@ -918,7 +1043,7 @@ pub async fn transaction_history(
         let record = record
             .wrap_internal_err("failed to fetch available payout record")?;
         Ok(TransactionItem::PayoutAvailable {
-            created: record.created,
+            created: record.date_available,
             payout_source: PayoutSource::CreatorRewards,
             amount: record.amount,
         })
@@ -935,7 +1060,8 @@ pub async fn transaction_history(
     Ok(web::Json(txn_items))
 }
 
-#[delete("{id}")]
+#[utoipa::path]
+#[delete("/{id}")]
 pub async fn cancel_payout(
     info: web::Path<(PayoutId,)>,
     req: HttpRequest,
@@ -995,10 +1121,16 @@ pub async fn cancel_payout(
                             )
                             .await?;
                     }
-                    PayoutMethodType::Unknown => {
-                        return Err(ApiError::InvalidInput(
-                            "Payout cannot be cancelled!".to_string(),
-                        ));
+                    PayoutMethodType::MuralPay => {
+                        let payout_request_id = platform_id
+                            .parse::<muralpay::PayoutRequestId>()
+                            .wrap_request_err("invalid payout request ID")?;
+                        payouts
+                            .cancel_muralpay_payout_request(payout_request_id)
+                            .await
+                            .wrap_internal_err(
+                                "failed to cancel payout request",
+                            )?;
                     }
                 }
 
@@ -1047,7 +1179,8 @@ pub enum FormCompletionStatus {
     Complete,
 }
 
-#[get("methods")]
+#[utoipa::path]
+#[get("/methods")]
 pub async fn payment_methods(
     payouts_queue: web::Data<PayoutsQueue>,
     filter: web::Query<MethodFilter>,
@@ -1079,7 +1212,8 @@ pub struct UserBalance {
     pub dates: HashMap<DateTime<Utc>, Decimal>,
 }
 
-#[get("balance")]
+#[utoipa::path]
+#[get("/balance")]
 pub async fn get_balance(
     req: HttpRequest,
     pool: web::Data<PgPool>,
@@ -1217,7 +1351,9 @@ async fn update_compliance_status(
     user_id: crate::database::models::ids::DBUserId,
 ) -> Result<Option<ComplianceCheck>, ApiError> {
     let maybe_compliance =
-        users_compliance::UserCompliance::get_by_user_id(pg, user_id).await?;
+        users_compliance::UserCompliance::get_by_user_id(pg, user_id)
+            .await
+            .wrap_internal_err("failed to fetch user tax compliance")?;
 
     let Some(mut compliance) = maybe_compliance else {
         return Ok(None);
@@ -1233,7 +1369,9 @@ async fn update_compliance_status(
             compliance_api_check_failed: false,
         }))
     } else {
-        let result = avalara1099::check_form(&compliance.reference_id).await?;
+        let result = avalara1099::check_form(&compliance.reference_id)
+            .await
+            .wrap_internal_err("failed to check form using Track1099")?;
         let mut compliance_api_check_failed = false;
 
         compliance.last_checked = Utc::now();
@@ -1311,7 +1449,8 @@ pub struct RevenueData {
     pub creator_revenue: Decimal,
 }
 
-#[get("platform_revenue")]
+#[utoipa::path]
+#[get("/platform_revenue")]
 pub async fn platform_revenue(
     query: web::Query<RevenueQuery>,
     pool: web::Data<PgPool>,
diff --git a/apps/labrinth/src/util/env.rs b/apps/labrinth/src/util/env.rs
index 78a5b72d..0bcb6bde 100644
--- a/apps/labrinth/src/util/env.rs
+++ b/apps/labrinth/src/util/env.rs
@@ -1,5 +1,12 @@
 use std::str::FromStr;
 
+use eyre::{Context, eyre};
+
+pub fn env_var(key: &str) -> eyre::Result<String> {
+    dotenvy::var(key)
+        .wrap_err_with(|| eyre!("missing environment variable `{key}`"))
+}
+
 pub fn parse_var<T: FromStr>(var: &str) -> Option<T> {
     dotenvy::var(var).ok().and_then(|i| i.parse().ok())
 }
diff --git a/apps/labrinth/src/util/error.rs b/apps/labrinth/src/util/error.rs
index fdc9ab37..5f9ff343 100644
--- a/apps/labrinth/src/util/error.rs
+++ b/apps/labrinth/src/util/error.rs
@@ -5,111 +5,253 @@ use std::{
 
 use crate::routes::ApiError;
 
+/// Allows wrapping [`Result`]s and [`Option`]s into [`Result<T, ApiError>`]s.
+#[allow(
+    clippy::missing_errors_doc,
+    reason = "this trait's purpose is improving error handling"
+)]
 pub trait Context<T, E>: Sized {
-    fn wrap_request_err_with<D>(
-        self,
-        f: impl FnOnce() -> D,
-    ) -> Result<T, ApiError>
+    /// Maps the error variant into an [`eyre::Report`], creating the message
+    /// using `f`.
+    fn wrap_err_with<D>(self, f: impl FnOnce() -> D) -> Result<T, eyre::Report>
     where
-        D: Debug + Display + Send + Sync + 'static;
+        D: Send + Sync + Debug + Display + 'static;
 
-    fn wrap_request_err<D>(self, msg: D) -> Result<T, ApiError>
+    /// Maps the error variant into an [`eyre::Report`] with the given message.
+    #[inline]
+    fn wrap_err<D>(self, msg: D) -> Result<T, eyre::Report>
     where
-        D: Debug + Display + Send + Sync + 'static,
+        D: Send + Sync + Debug + Display + 'static,
     {
-        self.wrap_request_err_with(|| msg)
+        self.wrap_err_with(|| msg)
     }
 
+    /// Maps the error variant into an [`ApiError::Internal`] using the closure to create the message.
+    #[inline]
     fn wrap_internal_err_with<D>(
         self,
         f: impl FnOnce() -> D,
     ) -> Result<T, ApiError>
     where
-        D: Debug + Display + Send + Sync + 'static;
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_err_with(f).map_err(ApiError::Internal)
+    }
 
+    /// Maps the error variant into an [`ApiError::Internal`] with the given message.
+    #[inline]
     fn wrap_internal_err<D>(self, msg: D) -> Result<T, ApiError>
     where
-        D: Debug + Display + Send + Sync + 'static,
+        D: Send + Sync + Debug + Display + 'static,
     {
         self.wrap_internal_err_with(|| msg)
     }
+
+    /// Maps the error variant into an [`ApiError::Request`] using the closure to create the message.
+    #[inline]
+    fn wrap_request_err_with<D>(
+        self,
+        f: impl FnOnce() -> D,
+    ) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_err_with(f).map_err(ApiError::Request)
+    }
+
+    /// Maps the error variant into an [`ApiError::Request`] with the given message.
+    #[inline]
+    fn wrap_request_err<D>(self, msg: D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_request_err_with(|| msg)
+    }
+
+    /// Maps the error variant into an [`ApiError::Auth`] using the closure to create the message.
+    #[inline]
+    fn wrap_auth_err_with<D>(self, f: impl FnOnce() -> D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_err_with(f).map_err(ApiError::Auth)
+    }
+
+    /// Maps the error variant into an [`ApiError::Auth`] with the given message.
+    #[inline]
+    fn wrap_auth_err<D>(self, msg: D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_auth_err_with(|| msg)
+    }
 }
 
 impl<T, E> Context<T, E> for Result<T, E>
 where
-    E: std::error::Error + Send + Sync + Sized + 'static,
+    Self: eyre::WrapErr<T, E>,
 {
-    fn wrap_request_err_with<D>(
-        self,
-        f: impl FnOnce() -> D,
-    ) -> Result<T, ApiError>
+    fn wrap_err_with<D>(self, f: impl FnOnce() -> D) -> Result<T, eyre::Report>
     where
-        D: Display + Send + Sync + 'static,
+        D: Send + Sync + Debug + Display + 'static,
     {
-        self.map_err(|err| {
-            let report = eyre::Report::new(err).wrap_err(f());
-            ApiError::Request(report)
-        })
-    }
-
-    fn wrap_internal_err_with<D>(
-        self,
-        f: impl FnOnce() -> D,
-    ) -> Result<T, ApiError>
-    where
-        D: Display + Send + Sync + 'static,
-    {
-        self.map_err(|err| {
-            let report = eyre::Report::new(err).wrap_err(f());
-            ApiError::Internal(report)
-        })
+        eyre::WrapErr::wrap_err_with(self, f)
     }
 }
 
 impl<T> Context<T, Infallible> for Option<T> {
-    fn wrap_request_err_with<D>(
-        self,
-        f: impl FnOnce() -> D,
-    ) -> Result<T, ApiError>
+    fn wrap_err_with<D>(self, f: impl FnOnce() -> D) -> Result<T, eyre::Report>
     where
-        D: Debug + Display + Send + Sync + 'static,
+        D: Send + Sync + Debug + Display + 'static,
     {
-        self.ok_or_else(|| ApiError::Request(eyre::Report::msg(f())))
-    }
-
-    fn wrap_internal_err_with<D>(
-        self,
-        f: impl FnOnce() -> D,
-    ) -> Result<T, ApiError>
-    where
-        D: Debug + Display + Send + Sync + 'static,
-    {
-        self.ok_or_else(|| ApiError::Internal(eyre::Report::msg(f())))
+        self.ok_or_else(|| eyre::Report::msg(f()))
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use actix_web::{ResponseError, http::StatusCode};
 
-    fn sqlx_result() -> Result<(), sqlx::Error> {
-        Err(sqlx::Error::RowNotFound)
-    }
-
-    // these just test that code written with the above API compiles
-    fn propagating() -> Result<(), ApiError> {
-        sqlx_result()
-            .wrap_internal_err("failed to perform database operation")?;
-        sqlx_result().wrap_request_err("invalid request parameter")?;
-
-        None::<()>.wrap_internal_err("something is missing")?;
-
-        Ok(())
-    }
-
-    // just so we don't get a dead code warning
     #[test]
-    fn test_propagating() {
-        _ = propagating();
+    fn test_api_error_display() {
+        let error = ApiError::Internal(eyre::eyre!("test internal error"));
+        assert!(error.to_string().contains("test internal error"));
+
+        let error = ApiError::Request(eyre::eyre!("test request error"));
+        assert!(error.to_string().contains("test request error"));
+
+        let error = ApiError::Auth(eyre::eyre!("test auth error"));
+        assert!(error.to_string().contains("test auth error"));
+    }
+
+    #[test]
+    fn test_api_error_debug() {
+        let error = ApiError::Internal(eyre::eyre!("test error"));
+        let debug_str = format!("{error:?}");
+        assert!(debug_str.contains("Internal"));
+        assert!(debug_str.contains("test error"));
+    }
+
+    #[test]
+    fn test_response_error_status_codes() {
+        let internal_error = ApiError::Internal(eyre::eyre!("internal error"));
+        assert_eq!(
+            internal_error.status_code(),
+            StatusCode::INTERNAL_SERVER_ERROR
+        );
+
+        let request_error = ApiError::Request(eyre::eyre!("request error"));
+        assert_eq!(request_error.status_code(), StatusCode::BAD_REQUEST);
+
+        let auth_error = ApiError::Auth(eyre::eyre!("auth error"));
+        assert_eq!(auth_error.status_code(), StatusCode::UNAUTHORIZED);
+    }
+
+    #[test]
+    fn test_response_error_response() {
+        let error = ApiError::Request(eyre::eyre!("test request error"));
+        let response = error.error_response();
+
+        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
+
+        // Skip the body parsing test as it requires async and is more complex
+        // The important thing is that the error response is created correctly
+    }
+
+    #[test]
+    fn test_context_trait_result() {
+        let result: Result<i32, std::io::Error> = Ok(42);
+        let wrapped = result.wrap_err("context message");
+        assert_eq!(wrapped.unwrap(), 42);
+
+        let result: Result<i32, std::io::Error> = Err(std::io::Error::new(
+            std::io::ErrorKind::NotFound,
+            "not found",
+        ));
+        let wrapped = result.wrap_err("context message");
+        assert!(wrapped.is_err());
+        assert!(wrapped.unwrap_err().to_string().contains("context message"));
+    }
+
+    #[test]
+    fn test_context_trait_option() {
+        let option: Option<i32> = Some(42);
+        let wrapped = option.wrap_err("context message");
+        assert_eq!(wrapped.unwrap(), 42);
+
+        let option: Option<i32> = None;
+        let wrapped = option.wrap_err("context message");
+        assert!(wrapped.is_err());
+        assert_eq!(wrapped.unwrap_err().to_string(), "context message");
+    }
+
+    #[test]
+    fn test_context_trait_internal_error() {
+        let result: Result<i32, std::io::Error> = Err(std::io::Error::new(
+            std::io::ErrorKind::NotFound,
+            "not found",
+        ));
+        let wrapped = result.wrap_internal_err("internal error context");
+
+        assert!(wrapped.is_err());
+        match wrapped.unwrap_err() {
+            ApiError::Internal(report) => {
+                assert!(report.to_string().contains("internal error context"));
+            }
+            _ => panic!("Expected Internal error"),
+        }
+    }
+
+    #[test]
+    fn test_context_trait_request_error() {
+        let result: Result<i32, std::io::Error> = Err(std::io::Error::new(
+            std::io::ErrorKind::NotFound,
+            "not found",
+        ));
+        let wrapped = result.wrap_request_err("request error context");
+
+        assert!(wrapped.is_err());
+        match wrapped.unwrap_err() {
+            ApiError::Request(report) => {
+                assert!(report.to_string().contains("request error context"));
+            }
+            _ => panic!("Expected Request error"),
+        }
+    }
+
+    #[test]
+    fn test_context_trait_auth_error() {
+        let result: Result<i32, std::io::Error> = Err(std::io::Error::new(
+            std::io::ErrorKind::NotFound,
+            "not found",
+        ));
+        let wrapped = result.wrap_auth_err("auth error context");
+
+        assert!(wrapped.is_err());
+        match wrapped.unwrap_err() {
+            ApiError::Auth(report) => {
+                assert!(report.to_string().contains("auth error context"));
+            }
+            _ => panic!("Expected Auth error"),
+        }
+    }
+
+    #[test]
+    fn test_context_trait_with_closure() {
+        let result: Result<i32, std::io::Error> = Err(std::io::Error::new(
+            std::io::ErrorKind::NotFound,
+            "not found",
+        ));
+        let wrapped =
+            result.wrap_err_with(|| format!("context with {}", "dynamic"));
+
+        assert!(wrapped.is_err());
+        assert!(
+            wrapped
+                .unwrap_err()
+                .to_string()
+                .contains("context with dynamic")
+        );
     }
 }
diff --git a/packages/muralpay/Cargo.toml b/packages/muralpay/Cargo.toml
new file mode 100644
index 00000000..91d61c25
--- /dev/null
+++ b/packages/muralpay/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+name = "muralpay"
+version = "0.1.0"
+edition.workspace = true
+description = "Mural Pay API"
+repository = "https://github.com/modrinth/code/"
+license = "MIT"
+keywords = []
+categories = ["api-bindings"]
+
+[dependencies]
+bytes = { workspace = true }
+chrono = { workspace = true, features = ["serde"] }
+derive_more = { workspace = true, features = [
+  "deref",
+  "display",
+  "error",
+  "from",
+] }
+reqwest = { workspace = true, features = ["default-tls", "http2", "json"] }
+rust_decimal = { workspace = true, features = ["macros"] }
+rust_iso3166 = { workspace = true }
+secrecy = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+serde_with = { workspace = true }
+strum = { workspace = true, features = ["derive"] }
+utoipa = { workspace = true, features = ["uuid"], optional = true }
+uuid = { workspace = true, features = ["serde"] }
+
+[dev-dependencies]
+clap = { workspace = true, features = ["derive"] }
+color-eyre = { workspace = true }
+dotenvy = { workspace = true }
+eyre = { workspace = true }
+tokio = { workspace = true, features = ["full"] }
+tracing-subscriber = { workspace = true }
+
+[features]
+utoipa = ["dep:utoipa"]
+
+[lints]
+workspace = true
diff --git a/packages/muralpay/README.md b/packages/muralpay/README.md
new file mode 100644
index 00000000..5413dcf5
--- /dev/null
+++ b/packages/muralpay/README.md
@@ -0,0 +1,5 @@
+Rust API bindings for the [Mural Pay API](https://developers.muralpay.com/docs/getting-started).
+
+# Useful links
+
+- [Mural Pay API Reference](https://developers.muralpay.com/reference/)
diff --git a/packages/muralpay/examples/muralpay.rs b/packages/muralpay/examples/muralpay.rs
new file mode 100644
index 00000000..d3ae1afb
--- /dev/null
+++ b/packages/muralpay/examples/muralpay.rs
@@ -0,0 +1,321 @@
+use std::{env, fmt::Debug, io};
+
+use eyre::{Result, WrapErr, eyre};
+use muralpay::{
+    AccountId, CounterpartyId, CreatePayout, CreatePayoutDetails, Dob,
+    FiatAccountType, FiatAndRailCode, FiatAndRailDetails, FiatFeeRequest,
+    FiatPayoutFee, MuralPay, PayoutMethodId, PayoutRecipientInfo,
+    PhysicalAddress, TokenAmount, TokenFeeRequest, TokenPayoutFee, UsdSymbol,
+};
+use rust_decimal::{Decimal, dec};
+use serde::Serialize;
+
+#[derive(Debug, clap::Parser)]
+struct Args {
+    #[arg(short, long)]
+    output: Option<OutputFormat>,
+    #[clap(subcommand)]
+    command: Command,
+}
+
+#[derive(Debug, clap::Subcommand)]
+enum Command {
+    /// Account listing and management
+    Account {
+        #[command(subcommand)]
+        command: AccountCommand,
+    },
+    /// Payouts and payout requests
+    Payout {
+        #[command(subcommand)]
+        command: PayoutCommand,
+    },
+    /// Counterparty management
+    Counterparty {
+        #[command(subcommand)]
+        command: CounterpartyCommand,
+    },
+    /// Payout method management
+    PayoutMethod {
+        #[command(subcommand)]
+        command: PayoutMethodCommand,
+    },
+}
+
+#[derive(Debug, clap::Subcommand)]
+enum AccountCommand {
+    /// List all accounts
+    #[clap(alias = "ls")]
+    List,
+}
+
+#[derive(Debug, clap::Subcommand)]
+enum PayoutCommand {
+    /// List all payout requests
+    #[clap(alias = "ls")]
+    List,
+    /// Create a payout request
+    Create {
+        /// ID of the Mural account to send from
+        source_account_id: AccountId,
+        /// Description for this payout request
+        memo: Option<String>,
+    },
+    /// Get fees for a transaction
+    Fees {
+        #[command(subcommand)]
+        command: PayoutFeesCommand,
+    },
+    /// Get bank details for a fiat and rail code
+    BankDetails {
+        /// Fiat and rail code to fetch bank details for
+        fiat_and_rail_code: FiatAndRailCode,
+    },
+}
+
+#[derive(Debug, clap::Subcommand)]
+enum PayoutFeesCommand {
+    /// Get fees for a token-to-fiat transaction
+    Token {
+        amount: Decimal,
+        fiat_and_rail_code: FiatAndRailCode,
+    },
+    /// Get fees for a fiat-to-token transaction
+    Fiat {
+        amount: Decimal,
+        fiat_and_rail_code: FiatAndRailCode,
+    },
+}
+
+#[derive(Debug, clap::Subcommand)]
+enum CounterpartyCommand {
+    /// List all counterparties
+    #[clap(alias = "ls")]
+    List,
+}
+
+#[derive(Debug, clap::Subcommand)]
+enum PayoutMethodCommand {
+    /// List payout methods for a counterparty
+    #[clap(alias = "ls")]
+    List {
+        /// ID of the counterparty
+        counterparty_id: CounterpartyId,
+    },
+    /// Delete a payout method
+    Delete {
+        /// ID of the counterparty
+        counterparty_id: CounterpartyId,
+        /// ID of the payout method to delete
+        payout_method_id: PayoutMethodId,
+    },
+}
+
+#[derive(Debug, Clone, Copy, clap::ValueEnum)]
+enum OutputFormat {
+    Json,
+    JsonMin,
+}
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    _ = dotenvy::dotenv();
+    color_eyre::install().expect("failed to install `color-eyre`");
+    tracing_subscriber::fmt().init();
+
+    let args = <Args as clap::Parser>::parse();
+    let of = args.output;
+
+    let api_url = env::var("MURALPAY_API_URL")
+        .unwrap_or_else(|_| muralpay::SANDBOX_API_URL.to_string());
+    let api_key = env::var("MURALPAY_API_KEY").wrap_err("no API key")?;
+    let transfer_api_key = env::var("MURALPAY_TRANSFER_API_KEY").ok();
+
+    let muralpay = MuralPay::new(api_url, api_key, transfer_api_key);
+
+    match args.command {
+        Command::Account {
+            command: AccountCommand::List,
+        } => run(of, muralpay.get_all_accounts().await?),
+        Command::Payout {
+            command: PayoutCommand::List,
+        } => run(of, muralpay.search_payout_requests(None, None).await?),
+        Command::Payout {
+            command:
+                PayoutCommand::Create {
+                    source_account_id,
+                    memo,
+                },
+        } => run(
+            of,
+            create_payout_request(
+                &muralpay,
+                source_account_id,
+                memo.as_deref(),
+            )
+            .await?,
+        ),
+        Command::Payout {
+            command:
+                PayoutCommand::Fees {
+                    command:
+                        PayoutFeesCommand::Token {
+                            amount,
+                            fiat_and_rail_code,
+                        },
+                },
+        } => run(
+            of,
+            get_fees_for_token_amount(&muralpay, amount, fiat_and_rail_code)
+                .await?,
+        ),
+        Command::Payout {
+            command:
+                PayoutCommand::Fees {
+                    command:
+                        PayoutFeesCommand::Fiat {
+                            amount,
+                            fiat_and_rail_code,
+                        },
+                },
+        } => run(
+            of,
+            get_fees_for_fiat_amount(&muralpay, amount, fiat_and_rail_code)
+                .await?,
+        ),
+        Command::Payout {
+            command: PayoutCommand::BankDetails { fiat_and_rail_code },
+        } => run(of, muralpay.get_bank_details(&[fiat_and_rail_code]).await?),
+        Command::Counterparty {
+            command: CounterpartyCommand::List,
+        } => run(of, list_counterparties(&muralpay).await?),
+        Command::PayoutMethod {
+            command: PayoutMethodCommand::List { counterparty_id },
+        } => run(
+            of,
+            muralpay
+                .search_payout_methods(counterparty_id, None)
+                .await?,
+        ),
+        Command::PayoutMethod {
+            command:
+                PayoutMethodCommand::Delete {
+                    counterparty_id,
+                    payout_method_id,
+                },
+        } => run(
+            of,
+            muralpay
+                .delete_payout_method(counterparty_id, payout_method_id)
+                .await?,
+        ),
+    }
+
+    Ok(())
+}
+
+async fn create_payout_request(
+    muralpay: &MuralPay,
+    source_account_id: AccountId,
+    memo: Option<&str>,
+) -> Result<()> {
+    muralpay
+        .create_payout_request(
+            source_account_id,
+            memo,
+            &[CreatePayout {
+                amount: TokenAmount {
+                    token_amount: dec!(2.00),
+                    token_symbol: muralpay::USDC.into(),
+                },
+                payout_details: CreatePayoutDetails::Fiat {
+                    bank_name: "Foo Bank".into(),
+                    bank_account_owner: "John Smith".into(),
+                    developer_fee: None,
+                    fiat_and_rail_details: FiatAndRailDetails::Usd {
+                        symbol: UsdSymbol::Usd,
+                        account_type: FiatAccountType::Checking,
+                        bank_account_number: "123456789".into(),
+                        // idk what the format is, https://wise.com/us/routing-number/bank/us-bank
+                        bank_routing_number: "071004200".into(),
+                    },
+                },
+                recipient_info: PayoutRecipientInfo::Individual {
+                    first_name: "John".into(),
+                    last_name: "Smith".into(),
+                    email: "john.smith@example.com".into(),
+                    date_of_birth: Dob::new(1970, 1, 1).unwrap(),
+                    physical_address: PhysicalAddress {
+                        address1: "1234 Elm Street".into(),
+                        address2: Some("Apt 56B".into()),
+                        country: rust_iso3166::US,
+                        state: "CA".into(),
+                        city: "Springfield".into(),
+                        zip: "90001".into(),
+                    },
+                },
+                supporting_details: None,
+            }],
+        )
+        .await?;
+    Ok(())
+}
+
+async fn get_fees_for_token_amount(
+    muralpay: &MuralPay,
+    amount: Decimal,
+    fiat_and_rail_code: FiatAndRailCode,
+) -> Result<TokenPayoutFee> {
+    let fees = muralpay
+        .get_fees_for_token_amount(&[TokenFeeRequest {
+            amount: TokenAmount {
+                token_amount: amount,
+                token_symbol: muralpay::USDC.into(),
+            },
+            fiat_and_rail_code,
+        }])
+        .await?;
+    let fee = fees
+        .into_iter()
+        .next()
+        .ok_or_else(|| eyre!("no fee results returned"))?;
+    Ok(fee)
+}
+
+async fn get_fees_for_fiat_amount(
+    muralpay: &MuralPay,
+    amount: Decimal,
+    fiat_and_rail_code: FiatAndRailCode,
+) -> Result<FiatPayoutFee> {
+    let fees = muralpay
+        .get_fees_for_fiat_amount(&[FiatFeeRequest {
+            fiat_amount: amount,
+            token_symbol: muralpay::USDC.into(),
+            fiat_and_rail_code,
+        }])
+        .await?;
+    let fee = fees
+        .into_iter()
+        .next()
+        .ok_or_else(|| eyre!("no fee results returned"))?;
+    Ok(fee)
+}
+
+async fn list_counterparties(muralpay: &MuralPay) -> Result<()> {
+    let _counterparties = muralpay.search_counterparties(None).await?;
+    Ok(())
+}
+
+fn run<T: Debug + Serialize>(output_format: Option<OutputFormat>, value: T) {
+    match output_format {
+        None => {
+            println!("{value:#?}");
+        }
+        Some(OutputFormat::Json) => {
+            _ = serde_json::to_writer_pretty(io::stdout(), &value)
+        }
+        Some(OutputFormat::JsonMin) => {
+            _ = serde_json::to_writer(io::stdout(), &value);
+        }
+    }
+}
diff --git a/packages/muralpay/src/account.rs b/packages/muralpay/src/account.rs
new file mode 100644
index 00000000..4ec40fca
--- /dev/null
+++ b/packages/muralpay/src/account.rs
@@ -0,0 +1,236 @@
+use std::str::FromStr;
+
+use chrono::{DateTime, Utc};
+use derive_more::{Deref, Display};
+use rust_decimal::Decimal;
+use secrecy::ExposeSecret;
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+use crate::{
+    Blockchain, FiatAmount, MuralError, MuralPay, TokenAmount, WalletDetails,
+    util::RequestExt,
+};
+
+impl MuralPay {
+    pub async fn get_all_accounts(&self) -> Result<Vec<Account>, MuralError> {
+        self.http_get(|base| format!("{base}/api/accounts"))
+            .send_mural()
+            .await
+    }
+
+    pub async fn get_account(
+        &self,
+        id: AccountId,
+    ) -> Result<Account, MuralError> {
+        self.http_get(|base| format!("{base}/api/accounts/{id}"))
+            .send_mural()
+            .await
+    }
+
+    pub async fn create_account(
+        &self,
+        name: impl AsRef<str>,
+        description: Option<impl AsRef<str>>,
+    ) -> Result<Account, MuralError> {
+        #[derive(Debug, Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct Body<'a> {
+            name: &'a str,
+            description: Option<&'a str>,
+        }
+
+        let body = Body {
+            name: name.as_ref(),
+            description: description.as_ref().map(|x| x.as_ref()),
+        };
+
+        self.http
+            .post(format!("{}/api/accounts", self.api_url))
+            .bearer_auth(self.api_key.expose_secret())
+            .json(&body)
+            .send_mural()
+            .await
+    }
+}
+
+#[derive(
+    Debug,
+    Display,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Deref,
+    Serialize,
+    Deserialize,
+)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[display("{}", _0.hyphenated())]
+pub struct AccountId(pub Uuid);
+
+impl FromStr for AccountId {
+    type Err = <Uuid as FromStr>::Err;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<Uuid>().map(Self)
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct Account {
+    pub id: AccountId,
+    pub name: String,
+    pub description: Option<String>,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    pub is_api_enabled: bool,
+    pub status: AccountStatus,
+    pub account_details: Option<AccountDetails>,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum AccountStatus {
+    Initializing,
+    Active,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct AccountDetails {
+    pub wallet_details: WalletDetails,
+    pub balances: Vec<TokenAmount>,
+    pub payin_methods: Vec<PayinMethod>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct PayinMethod {
+    pub status: PayinMethodStatus,
+    pub supported_destination_tokens: Vec<DestinationToken>,
+    pub payin_rail_details: PayinRailDetails,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum PayinMethodStatus {
+    Activated,
+    Deactivated,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct DestinationToken {
+    pub fees: Fees,
+    pub token: Token,
+    pub transaction_minimum: Option<FiatAmount>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct Fees {
+    #[serde(with = "rust_decimal::serde::float")]
+    pub variable_fee_percentage: Decimal,
+    pub fixed_transaction_fee: Option<FiatAmount>,
+    #[serde(with = "rust_decimal::serde::float_option", default)]
+    pub developer_fee_percentage: Option<Decimal>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct Token {
+    pub symbol: String,
+    pub blockchain: Blockchain,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum PayinRailDetails {
+    #[serde(rename_all = "camelCase")]
+    Usd {
+        currency: UsdCurrency,
+        payin_rails: Vec<String>,
+        bank_beneficiary_name: String,
+        bank_beneficiary_address: String,
+        bank_name: String,
+        bank_address: String,
+        bank_routing_number: String,
+        bank_account_number: String,
+    },
+    #[serde(rename_all = "camelCase")]
+    Eur {
+        currency: EurCurrency,
+        payin_rail: EurPayinRail,
+        bank_name: String,
+        bank_address: String,
+        account_holder_name: String,
+        iban: String,
+        bic: String,
+    },
+    #[serde(rename_all = "camelCase")]
+    Cop {
+        currency: CopCurrency,
+        payin_rail: CopPayinRail,
+    },
+    #[serde(rename_all = "camelCase")]
+    BlockchainDeposit {
+        deposit_token: DepositToken,
+        sender_address: Option<String>,
+        destination_address: String,
+    },
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum UsdCurrency {
+    Usd,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum EurCurrency {
+    Eur,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum EurPayinRail {
+    Sepa,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum CopCurrency {
+    Cop,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum CopPayinRail {
+    Pse,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum DepositToken {
+    #[serde(rename_all = "camelCase")]
+    UsdtTron { contract_address: String },
+}
diff --git a/packages/muralpay/src/counterparty.rs b/packages/muralpay/src/counterparty.rs
new file mode 100644
index 00000000..84c20e47
--- /dev/null
+++ b/packages/muralpay/src/counterparty.rs
@@ -0,0 +1,169 @@
+use chrono::{DateTime, Utc};
+use derive_more::{Deref, Display};
+use serde::{Deserialize, Serialize};
+use std::str::FromStr;
+use uuid::Uuid;
+
+use crate::{
+    MuralError, MuralPay, PhysicalAddress, SearchParams, SearchResponse,
+    util::RequestExt,
+};
+
+impl MuralPay {
+    pub async fn search_counterparties(
+        &self,
+        params: Option<SearchParams<CounterpartyId>>,
+    ) -> Result<SearchResponse<CounterpartyId, Counterparty>, MuralError> {
+        self.http_post(|base| format!("{base}/api/counterparties/search"))
+            .query(&params.map(|p| p.to_query()).unwrap_or_default())
+            .send_mural()
+            .await
+    }
+
+    pub async fn get_counterparty(
+        &self,
+        id: CounterpartyId,
+    ) -> Result<Counterparty, MuralError> {
+        self.http_get(|base| {
+            format!("{base}/api/counterparties/counterparty/{id}")
+        })
+        .send_mural()
+        .await
+    }
+
+    pub async fn create_counterparty(
+        &self,
+        counterparty: &CreateCounterparty,
+    ) -> Result<Counterparty, MuralError> {
+        #[derive(Debug, Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct Body<'a> {
+            counterparty: &'a CreateCounterparty,
+        }
+
+        let body = Body { counterparty };
+
+        self.http_post(|base| format!("{base}/api/counterparties"))
+            .json(&body)
+            .send_mural()
+            .await
+    }
+
+    pub async fn update_counterparty(
+        &self,
+        id: CounterpartyId,
+        counterparty: &UpdateCounterparty,
+    ) -> Result<Counterparty, MuralError> {
+        #[derive(Debug, Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct Body<'a> {
+            counterparty: &'a UpdateCounterparty,
+        }
+
+        let body = Body { counterparty };
+
+        self.http_put(|base| {
+            format!("{base}/api/counterparties/counterparty/{id}")
+        })
+        .json(&body)
+        .send_mural()
+        .await
+    }
+}
+
+#[derive(
+    Debug,
+    Display,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Deref,
+    Serialize,
+    Deserialize,
+)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[display("{}", _0.hyphenated())]
+pub struct CounterpartyId(pub Uuid);
+
+impl FromStr for CounterpartyId {
+    type Err = <Uuid as FromStr>::Err;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<Uuid>().map(Self)
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct Counterparty {
+    pub id: CounterpartyId,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    pub alias: Option<String>,
+    #[serde(flatten)]
+    pub kind: CounterpartyKind,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum CounterpartyKind {
+    #[serde(rename_all = "camelCase")]
+    Individual {
+        first_name: String,
+        last_name: String,
+        email: String,
+        physical_address: PhysicalAddress,
+    },
+    #[serde(rename_all = "camelCase")]
+    Business {
+        name: String,
+        email: String,
+        physical_address: PhysicalAddress,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum CreateCounterparty {
+    #[serde(rename_all = "camelCase")]
+    Individual {
+        alias: Option<String>,
+        first_name: String,
+        last_name: String,
+        email: String,
+        physical_address: PhysicalAddress,
+    },
+    #[serde(rename_all = "camelCase")]
+    Business {
+        alias: Option<String>,
+        name: String,
+        email: String,
+        physical_address: PhysicalAddress,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum UpdateCounterparty {
+    #[serde(rename_all = "camelCase")]
+    Individual {
+        alias: Option<String>,
+        first_name: Option<String>,
+        last_name: Option<String>,
+        email: Option<String>,
+        physical_address: Option<PhysicalAddress>,
+    },
+    #[serde(rename_all = "camelCase")]
+    Business {
+        alias: Option<String>,
+        name: Option<String>,
+        email: Option<String>,
+        physical_address: Option<PhysicalAddress>,
+    },
+}
diff --git a/packages/muralpay/src/error.rs b/packages/muralpay/src/error.rs
new file mode 100644
index 00000000..e7d9790a
--- /dev/null
+++ b/packages/muralpay/src/error.rs
@@ -0,0 +1,117 @@
+use std::{collections::HashMap, fmt};
+
+use bytes::Bytes;
+use derive_more::{Display, Error, From};
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+#[derive(Debug, Display, Error, From)]
+pub enum MuralError {
+    #[display("API error")]
+    Api(ApiError),
+    #[display("request error")]
+    Request(reqwest::Error),
+    #[display("failed to decode response\n{json:?}")]
+    #[from(skip)]
+    Decode {
+        source: serde_json::Error,
+        json: Bytes,
+    },
+    #[display("failed to decode error response\n{json:?}")]
+    #[from(skip)]
+    DecodeError {
+        source: serde_json::Error,
+        json: Bytes,
+    },
+}
+
+pub type Result<T, E = MuralError> = std::result::Result<T, E>;
+
+#[derive(Debug, Display, Error, From)]
+pub enum TransferError {
+    #[display("no transfer API key")]
+    NoTransferKey,
+    #[display("API error")]
+    Api(Box<ApiError>),
+    #[display("request error")]
+    Request(reqwest::Error),
+    #[display("failed to decode response\n{json:?}")]
+    #[from(skip)]
+    Decode {
+        source: serde_json::Error,
+        json: Bytes,
+    },
+    #[display("failed to decode error response\n{json:?}")]
+    #[from(skip)]
+    DecodeError {
+        source: serde_json::Error,
+        json: Bytes,
+    },
+}
+
+impl From<MuralError> for TransferError {
+    fn from(value: MuralError) -> Self {
+        match value {
+            MuralError::Api(x) => Self::Api(Box::new(x)),
+            MuralError::Request(x) => Self::Request(x),
+            MuralError::Decode { source, json } => {
+                Self::Decode { source, json }
+            }
+            MuralError::DecodeError { source, json } => {
+                Self::DecodeError { source, json }
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Error)]
+#[serde(rename_all = "camelCase")]
+pub struct ApiError {
+    pub error_instance_id: Uuid,
+    pub name: String,
+    pub message: String,
+    #[serde(deserialize_with = "one_or_many")]
+    #[serde(default)]
+    pub details: Vec<String>,
+    #[serde(default)]
+    pub params: HashMap<String, serde_json::Value>,
+}
+
+fn one_or_many<'de, D>(deserializer: D) -> Result<Vec<String>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum OneOrMany {
+        One(String),
+        Many(Vec<String>),
+    }
+
+    match OneOrMany::deserialize(deserializer)? {
+        OneOrMany::One(s) => Ok(vec![s]),
+        OneOrMany::Many(v) => Ok(v),
+    }
+}
+
+impl fmt::Display for ApiError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut lines = vec![self.message.to_string()];
+
+        if !self.details.is_empty() {
+            lines.push("details:".into());
+            lines.extend(self.details.iter().map(|s| format!("- {s}")));
+        }
+
+        if !self.params.is_empty() {
+            lines.push("params:".into());
+            lines
+                .extend(self.params.iter().map(|(k, v)| format!("- {k}: {v}")));
+        }
+
+        lines.push(format!("error name: {}", self.name));
+        lines.push(format!("error instance id: {}", self.error_instance_id));
+
+        write!(f, "{}", lines.join("\n"))
+    }
+}
diff --git a/packages/muralpay/src/lib.rs b/packages/muralpay/src/lib.rs
index b7525259..8f8fd398 100644
--- a/packages/muralpay/src/lib.rs
+++ b/packages/muralpay/src/lib.rs
@@ -1,22 +1,31 @@
 #![doc = include_str!("../README.md")]
 
 mod account;
+mod counterparty;
 mod error;
 mod organization;
 mod payout;
+mod payout_method;
+mod serde_iso3166;
 mod util;
 
-pub use {account::*, error::*, organization::*, payout::*};
+pub use {
+    account::*, counterparty::*, error::*, organization::*, payout::*,
+    payout_method::*,
+};
 
 use rust_decimal::Decimal;
 use secrecy::SecretString;
 use serde::{Deserialize, Serialize};
-use std::ops::Deref;
+use std::{ops::Deref, str::FromStr};
 use uuid::Uuid;
 
 pub const API_URL: &str = "https://api.muralpay.com";
 pub const SANDBOX_API_URL: &str = "https://api-staging.muralpay.com";
 
+/// Default token symbol for [`TokenAmount::token_symbol`] values.
+pub const USDC: &str = "USDC";
+
 #[derive(Debug)]
 pub struct MuralPay {
     pub http: reqwest::Client,
@@ -41,6 +50,7 @@ impl MuralPay {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
 pub enum Blockchain {
     Ethereum,
@@ -49,7 +59,10 @@ pub enum Blockchain {
     Celo,
 }
 
+crate::util::display_as_serialize!(Blockchain);
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[serde(rename_all = "SCREAMING-KEBAB-CASE")]
 pub enum CurrencyCode {
     Usd,
@@ -65,7 +78,20 @@ pub enum CurrencyCode {
     Zar,
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+crate::util::display_as_serialize!(CurrencyCode);
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum FiatAccountType {
+    Checking,
+    Savings,
+}
+
+crate::util::display_as_serialize!(FiatAccountType);
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, strum::EnumIter)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[serde(rename_all = "kebab-case")]
 pub enum FiatAndRailCode {
     Usd,
@@ -84,7 +110,18 @@ pub enum FiatAndRailCode {
     UsdPanama,
 }
 
+crate::util::display_as_serialize!(FiatAndRailCode);
+
+impl FromStr for FiatAndRailCode {
+    type Err = serde_json::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        serde_json::from_value(serde_json::Value::String(s.to_owned()))
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[serde(rename_all = "camelCase")]
 pub struct WalletDetails {
     pub blockchain: Blockchain,
@@ -92,15 +129,19 @@ pub struct WalletDetails {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[serde(rename_all = "camelCase")]
 pub struct TokenAmount {
+    #[serde(with = "rust_decimal::serde::float")]
     pub token_amount: Decimal,
     pub token_symbol: String,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[serde(rename_all = "camelCase")]
 pub struct FiatAmount {
+    #[serde(with = "rust_decimal::serde::float")]
     pub fiat_amount: Decimal,
     pub fiat_currency_code: CurrencyCode,
 }
@@ -126,6 +167,7 @@ impl<Id: Deref<Target = Uuid> + Clone> SearchParams<Id> {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[serde(rename_all = "camelCase")]
 pub struct SearchResponse<Id, T> {
     pub total: u64,
diff --git a/packages/muralpay/src/organization.rs b/packages/muralpay/src/organization.rs
new file mode 100644
index 00000000..811aca7b
--- /dev/null
+++ b/packages/muralpay/src/organization.rs
@@ -0,0 +1,277 @@
+use std::str::FromStr;
+
+use chrono::{DateTime, Utc};
+use derive_more::{Deref, Display};
+use secrecy::ExposeSecret;
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+use crate::{
+    CurrencyCode, MuralError, MuralPay, SearchResponse, util::RequestExt,
+};
+
+impl MuralPay {
+    pub async fn search_organizations(
+        &self,
+        req: SearchRequest,
+    ) -> Result<SearchResponse<OrganizationId, Organization>, MuralError> {
+        #[derive(Debug, Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct Body {
+            #[serde(skip_serializing_if = "Option::is_none")]
+            filter: Option<Filter>,
+        }
+
+        #[derive(Debug, Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct Filter {
+            #[serde(rename = "type")]
+            ty: FilterType,
+            name: String,
+        }
+
+        #[derive(Debug, Clone, Copy, Serialize)]
+        #[serde(rename_all = "snake_case")]
+        pub enum FilterType {
+            Name,
+        }
+
+        let query = [
+            req.limit.map(|limit| ("limit", limit.to_string())),
+            req.next_id
+                .map(|next_id| ("nextId", next_id.hyphenated().to_string())),
+        ]
+        .into_iter()
+        .flatten()
+        .collect::<Vec<_>>();
+
+        let body = Body {
+            filter: req.name.map(|name| Filter {
+                ty: FilterType::Name,
+                name,
+            }),
+        };
+
+        self.http_post(|base| format!("{base}/api/organizations/search"))
+            .bearer_auth(self.api_key.expose_secret())
+            .query(&query)
+            .json(&body)
+            .send_mural()
+            .await
+    }
+
+    pub async fn get_organization(
+        &self,
+        id: OrganizationId,
+    ) -> Result<Organization, MuralError> {
+        self.http_post(|base| format!("{base}/api/organizations/{id}"))
+            .send_mural()
+            .await
+    }
+}
+
+#[derive(
+    Debug,
+    Display,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Deref,
+    Serialize,
+    Deserialize,
+)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[display("{}", _0.hyphenated())]
+pub struct OrganizationId(pub Uuid);
+
+impl FromStr for OrganizationId {
+    type Err = <Uuid as FromStr>::Err;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<Uuid>().map(Self)
+    }
+}
+
+#[derive(Debug, Clone, Default)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+pub struct SearchRequest {
+    pub limit: Option<u64>,
+    pub next_id: Option<Uuid>,
+    pub name: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum Organization {
+    Individual(Individual),
+    Business(Business),
+    EndUserCustodialIndividual(EndUserCustodialIndividual),
+    EndUserCustodialBusiness(EndUserCustodialBusiness),
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct Individual {
+    pub id: OrganizationId,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    pub first_name: String,
+    pub last_name: String,
+    pub tos_status: TosStatus,
+    pub kyc_status: KycStatus,
+    pub currency_capabilities: Vec<CurrencyCapability>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct Business {
+    pub id: OrganizationId,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    pub name: String,
+    pub tos_status: TosStatus,
+    pub kyc_status: KycStatus,
+    pub currency_capabilities: Vec<CurrencyCapability>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct EndUserCustodialIndividual {
+    pub id: OrganizationId,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    pub first_name: String,
+    pub last_name: String,
+    pub approver: Approver,
+    pub tos_status: TosStatus,
+    pub kyc_status: KycStatus,
+    pub currency_capabilities: Vec<CurrencyCapability>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct EndUserCustodialBusiness {
+    pub id: OrganizationId,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    pub name: String,
+    pub approver: Approver,
+    pub tos_status: TosStatus,
+    pub kyc_status: KycStatus,
+    pub currency_capabilities: Vec<CurrencyCapability>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct Approver {
+    pub id: Uuid,
+    pub created_at: DateTime<Utc>,
+    pub name: String,
+    pub email: String,
+    pub auth_methods: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum TosStatus {
+    NotAccepted,
+    NeedsReview,
+    Accepted,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum KycStatus {
+    Inactive,
+    Pending,
+    Approved {
+        approved_at: DateTime<Utc>,
+    },
+    Errored {
+        details: String,
+        errored_at: DateTime<Utc>,
+    },
+    Rejected {
+        reason: String,
+        rejected_at: DateTime<Utc>,
+    },
+    PreValidationFailed {
+        failed_validation_reason: FailedValidationReason,
+        failed_validation_at: DateTime<Utc>,
+    },
+    NeedsUpdate {
+        needs_update_reason: String,
+        verification_status_updated_at: DateTime<Utc>,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum FailedValidationReason {
+    DocumentPrevalidationFailed {
+        document_id: String,
+        failed_validation_reason: String,
+    },
+    UltimateBeneficialOwnerPrevalidationFailed {
+        ultimate_beneficial_owner_id: String,
+        failed_validation_reason: String,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct CurrencyCapability {
+    pub fiat_and_rail_code: String,
+    pub currency_code: CurrencyCode,
+    pub deposit_status: TransactionCapabilityStatus,
+    pub pay_out_status: TransactionCapabilityStatus,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum TransactionCapabilityStatus {
+    TermsOfService {
+        details: String,
+    },
+    #[serde(rename = "awaitingKYC")]
+    AwaitingKyc {
+        details: String,
+    },
+    Enabled,
+    Rejected {
+        reason: RejectedReason,
+        details: String,
+    },
+    Disabled {
+        reason: DisabledReason,
+        details: String,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum RejectedReason {
+    KycFailed,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum DisabledReason {
+    CapabilityUnavailable,
+    ProcessingError,
+}
diff --git a/packages/muralpay/src/payout.rs b/packages/muralpay/src/payout.rs
new file mode 100644
index 00000000..063035de
--- /dev/null
+++ b/packages/muralpay/src/payout.rs
@@ -0,0 +1,825 @@
+#![cfg_attr(
+    feature = "utoipa",
+    expect(
+        clippy::large_stack_arrays,
+        reason = "due to `utoipa::ToSchema` derive"
+    )
+)]
+
+use std::str::FromStr;
+
+use chrono::{DateTime, Utc};
+use derive_more::{Deref, Display, Error, From};
+use rust_decimal::Decimal;
+use rust_iso3166::CountryCode;
+use serde::{Deserialize, Serialize};
+use serde_with::{DeserializeFromStr, SerializeDisplay};
+use uuid::Uuid;
+
+use crate::{
+    AccountId, Blockchain, FiatAccountType, FiatAmount, FiatAndRailCode,
+    MuralError, MuralPay, SearchParams, SearchResponse, TokenAmount,
+    TransferError, WalletDetails, util::RequestExt,
+};
+
+impl MuralPay {
+    pub async fn search_payout_requests(
+        &self,
+        filter: Option<PayoutStatusFilter>,
+        params: Option<SearchParams<PayoutRequestId>>,
+    ) -> Result<SearchResponse<PayoutRequestId, PayoutRequest>, MuralError>
+    {
+        #[derive(Debug, Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct Body {
+            filter: Option<PayoutStatusFilter>,
+        }
+
+        let body = Body { filter };
+
+        self.http_post(|base| format!("{base}/api/payouts/search"))
+            .query(&params.map(|p| p.to_query()).unwrap_or_default())
+            .json(&body)
+            .send_mural()
+            .await
+    }
+
+    pub async fn get_payout_request(
+        &self,
+        id: PayoutRequestId,
+    ) -> Result<PayoutRequest, MuralError> {
+        self.http_get(|base| format!("{base}/api/payouts/{id}"))
+            .send_mural()
+            .await
+    }
+
+    pub async fn get_fees_for_token_amount(
+        &self,
+        token_fee_requests: &[TokenFeeRequest],
+    ) -> Result<Vec<TokenPayoutFee>, MuralError> {
+        #[derive(Debug, Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct Body<'a> {
+            token_fee_requests: &'a [TokenFeeRequest],
+        }
+
+        let body = Body { token_fee_requests };
+
+        self.http_post(|base| format!("{base}/api/payouts/fees/token-to-fiat"))
+            .json(&body)
+            .send_mural()
+            .await
+    }
+
+    pub async fn get_fees_for_fiat_amount(
+        &self,
+        fiat_fee_requests: &[FiatFeeRequest],
+    ) -> Result<Vec<FiatPayoutFee>, MuralError> {
+        #[derive(Debug, Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct Body<'a> {
+            fiat_fee_requests: &'a [FiatFeeRequest],
+        }
+
+        let body = Body { fiat_fee_requests };
+
+        self.http_post(|base| format!("{base}/api/payouts/fees/fiat-to-token"))
+            .json(&body)
+            .send_mural()
+            .await
+    }
+
+    pub async fn create_payout_request(
+        &self,
+        source_account_id: AccountId,
+        memo: Option<impl AsRef<str>>,
+        payouts: &[CreatePayout],
+    ) -> Result<PayoutRequest, MuralError> {
+        #[derive(Debug, Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct Body<'a> {
+            source_account_id: AccountId,
+            memo: Option<&'a str>,
+            payouts: &'a [CreatePayout],
+        }
+
+        let body = Body {
+            source_account_id,
+            memo: memo.as_ref().map(|x| x.as_ref()),
+            payouts,
+        };
+
+        self.http_post(|base| format!("{base}/api/payouts/payout"))
+            .json(&body)
+            .send_mural()
+            .await
+    }
+
+    pub async fn execute_payout_request(
+        &self,
+        id: PayoutRequestId,
+    ) -> Result<PayoutRequest, TransferError> {
+        self.http_post(|base| format!("{base}/api/payouts/payout/{id}/execute"))
+            .transfer_auth(self)?
+            .send_mural()
+            .await
+            .map_err(From::from)
+    }
+
+    pub async fn cancel_payout_request(
+        &self,
+        id: PayoutRequestId,
+    ) -> Result<PayoutRequest, TransferError> {
+        self.http_post(|base| format!("{base}/api/payouts/payout/{id}/cancel"))
+            .transfer_auth(self)?
+            .send_mural()
+            .await
+            .map_err(From::from)
+    }
+
+    pub async fn get_bank_details(
+        &self,
+        fiat_currency_and_rail: &[FiatAndRailCode],
+    ) -> Result<BankDetailsResponse, MuralError> {
+        let query = fiat_currency_and_rail
+            .iter()
+            .map(|code| ("fiatCurrencyAndRail", code.to_string()))
+            .collect::<Vec<_>>();
+
+        self.http_get(|base| format!("{base}/api/payouts/bank-details"))
+            .query(&query)
+            .send_mural()
+            .await
+    }
+}
+
+#[derive(
+    Debug,
+    Display,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Deref,
+    Serialize,
+    Deserialize,
+)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[display("{}", _0.hyphenated())]
+pub struct PayoutRequestId(pub Uuid);
+
+impl FromStr for PayoutRequestId {
+    type Err = <Uuid as FromStr>::Err;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<Uuid>().map(Self)
+    }
+}
+
+#[derive(
+    Debug,
+    Display,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Deref,
+    Serialize,
+    Deserialize,
+)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[display("{}", _0.hyphenated())]
+pub struct PayoutId(pub Uuid);
+
+impl FromStr for PayoutId {
+    type Err = <Uuid as FromStr>::Err;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<Uuid>().map(Self)
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum PayoutStatusFilter {
+    PayoutStatus { statuses: Vec<String> },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct PayoutRequest {
+    pub id: PayoutRequestId,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    pub source_account_id: AccountId,
+    pub transaction_hash: Option<String>,
+    pub memo: Option<String>,
+    pub status: PayoutStatus,
+    pub payouts: Vec<Payout>,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum PayoutStatus {
+    AwaitingExecution,
+    Canceled,
+    Pending,
+    Executed,
+    Failed,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct Payout {
+    pub id: PayoutId,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    pub amount: TokenAmount,
+    pub details: PayoutDetails,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum PayoutDetails {
+    Fiat(FiatPayoutDetails),
+    Blockchain(BlockchainPayoutDetails),
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct FiatPayoutDetails {
+    pub fiat_and_rail_code: FiatAndRailCode,
+    pub fiat_payout_status: FiatPayoutStatus,
+    pub fiat_amount: FiatAmount,
+    pub transaction_fee: TokenAmount,
+    #[serde(with = "rust_decimal::serde::float")]
+    pub exchange_fee_percentage: Decimal,
+    #[serde(with = "rust_decimal::serde::float")]
+    pub exchange_rate: Decimal,
+    pub fee_total: TokenAmount,
+    pub developer_fee: Option<DeveloperFee>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "kebab-case")]
+pub enum FiatPayoutStatus {
+    Created,
+    #[serde(rename_all = "camelCase")]
+    Pending {
+        initiated_at: DateTime<Utc>,
+    },
+    #[serde(rename_all = "camelCase")]
+    OnHold {
+        initiated_at: DateTime<Utc>,
+    },
+    #[serde(rename_all = "camelCase")]
+    Completed {
+        initiated_at: DateTime<Utc>,
+        completed_at: DateTime<Utc>,
+    },
+    #[serde(rename_all = "camelCase")]
+    Failed {
+        initiated_at: DateTime<Utc>,
+        reason: String,
+        error_code: FiatPayoutErrorCode,
+    },
+    Canceled,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum FiatPayoutErrorCode {
+    Unknown,
+    AccountNumberIncorrect,
+    RejectedByBank,
+    AccountTypeIncorrect,
+    AccountClosed,
+    BeneficiaryDocumentationIncorrect,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct DeveloperFee {
+    #[serde(with = "rust_decimal::serde::float_option", default)]
+    pub developer_fee_percentage: Option<Decimal>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct BlockchainPayoutDetails {
+    pub wallet_address: String,
+    pub blockchain: Blockchain,
+    pub status: BlockchainPayoutStatus,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum BlockchainPayoutStatus {
+    AwaitingExecution,
+    Pending,
+    Executed,
+    Failed,
+    Canceled,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct CreatePayout {
+    pub amount: TokenAmount,
+    pub payout_details: CreatePayoutDetails,
+    pub recipient_info: PayoutRecipientInfo,
+    pub supporting_details: Option<SupportingDetails>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum CreatePayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    Fiat {
+        bank_name: String,
+        bank_account_owner: String,
+        developer_fee: Option<DeveloperFee>,
+        fiat_and_rail_details: FiatAndRailDetails,
+    },
+    #[serde(rename_all = "camelCase")]
+    Blockchain { wallet_details: WalletDetails },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "kebab-case")]
+pub enum FiatAndRailDetails {
+    #[serde(rename_all = "camelCase")]
+    Usd {
+        symbol: UsdSymbol,
+        account_type: FiatAccountType,
+        bank_account_number: String,
+        bank_routing_number: String,
+    },
+    #[serde(rename_all = "camelCase")]
+    Cop {
+        symbol: CopSymbol,
+        phone_number: String,
+        account_type: FiatAccountType,
+        bank_account_number: String,
+        document_number: String,
+        document_type: DocumentType,
+    },
+    #[serde(rename_all = "camelCase")]
+    Ars {
+        symbol: ArsSymbol,
+        bank_account_number: String,
+        document_number: String,
+        bank_account_number_type: String,
+    },
+    #[serde(rename_all = "camelCase")]
+    Eur {
+        symbol: EurSymbol,
+        iban: String,
+        swift_bic: String,
+        #[serde(with = "crate::serde_iso3166")]
+        #[cfg_attr(feature = "utoipa", schema(value_type = String))]
+        country: CountryCode,
+    },
+    #[serde(rename_all = "camelCase")]
+    Mxn {
+        symbol: MxnSymbol,
+        bank_account_number: String,
+    },
+    #[serde(rename_all = "camelCase")]
+    Brl {
+        symbol: BrlSymbol,
+        pix_account_type: PixAccountType,
+        pix_email: String,
+        pix_phone: String,
+        branch_code: String,
+        document_number: String,
+    },
+    #[serde(rename_all = "camelCase")]
+    Clp {
+        symbol: ClpSymbol,
+        account_type: FiatAccountType,
+        bank_account_number: String,
+        document_type: DocumentType,
+        document_number: String,
+    },
+    #[serde(rename_all = "camelCase")]
+    Pen {
+        symbol: PenSymbol,
+        document_number: String,
+        document_type: DocumentType,
+        bank_account_number: String,
+        account_type: FiatAccountType,
+    },
+    #[serde(rename_all = "camelCase")]
+    Bob {
+        symbol: BobSymbol,
+        bank_account_number: String,
+        document_number: String,
+        document_type: DocumentType,
+    },
+    #[serde(rename_all = "camelCase")]
+    Crc {
+        symbol: CrcSymbol,
+        iban: String,
+        document_number: String,
+        document_type: DocumentType,
+    },
+    #[serde(rename_all = "camelCase")]
+    Zar {
+        symbol: ZarSymbol,
+        account_type: FiatAccountType,
+        bank_account_number: String,
+    },
+    #[serde(rename_all = "camelCase")]
+    UsdPeru {
+        symbol: UsdSymbol,
+        account_type: FiatAccountType,
+        bank_account_number: String,
+        document_number: String,
+        document_type: DocumentType,
+    },
+    #[serde(rename_all = "camelCase")]
+    UsdChina {
+        symbol: UsdSymbol,
+        bank_name: String,
+        account_type: FiatAccountType,
+        bank_account_number: String,
+        document_number: String,
+        document_type: DocumentType,
+        phone_number: String,
+        address: String,
+        swift_bic: String,
+    },
+}
+
+impl FiatAndRailDetails {
+    pub fn code(&self) -> FiatAndRailCode {
+        match self {
+            Self::Usd { .. } => FiatAndRailCode::Usd,
+            Self::Cop { .. } => FiatAndRailCode::Cop,
+            Self::Ars { .. } => FiatAndRailCode::Ars,
+            Self::Eur { .. } => FiatAndRailCode::Eur,
+            Self::Mxn { .. } => FiatAndRailCode::Mxn,
+            Self::Brl { .. } => FiatAndRailCode::Brl,
+            Self::Clp { .. } => FiatAndRailCode::Clp,
+            Self::Pen { .. } => FiatAndRailCode::Pen,
+            Self::Bob { .. } => FiatAndRailCode::Bob,
+            Self::Crc { .. } => FiatAndRailCode::Crc,
+            Self::Zar { .. } => FiatAndRailCode::Zar,
+            Self::UsdPeru { .. } => FiatAndRailCode::UsdPeru,
+            Self::UsdChina { .. } => FiatAndRailCode::UsdChina,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum UsdSymbol {
+    Usd,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum CopSymbol {
+    Cop,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum ArsSymbol {
+    Ars,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum EurSymbol {
+    Eur,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum MxnSymbol {
+    Mxn,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum BrlSymbol {
+    Brl,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum ClpSymbol {
+    Clp,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum PenSymbol {
+    Pen,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum BobSymbol {
+    Bob,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum CrcSymbol {
+    Crc,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING-KEBAB-CASE")]
+pub enum ZarSymbol {
+    Zar,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum DocumentType {
+    NationalId,
+    Passport,
+    ResidentId,
+    Ruc,
+    TaxId,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum PixAccountType {
+    Phone,
+    Email,
+    Document,
+    BankAccount,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, From)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum PayoutRecipientInfo {
+    #[serde(rename_all = "camelCase")]
+    Individual {
+        first_name: String,
+        last_name: String,
+        email: String,
+        date_of_birth: Dob,
+        physical_address: PhysicalAddress,
+    },
+    #[serde(rename_all = "camelCase")]
+    Business {
+        name: String,
+        email: String,
+        physical_address: PhysicalAddress,
+    },
+}
+
+#[derive(Debug, Display, Clone, Copy, SerializeDisplay, DeserializeFromStr)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[display("{year:04}-{month:02}-{day:02}")]
+pub struct Dob {
+    year: u16,
+    month: u8,
+    day: u8,
+}
+
+#[derive(Debug, Display, Clone, Error)]
+pub enum InvalidDob {
+    #[display("must be three segments separated by `-`")]
+    NotThreeSegments,
+    #[display("year is not an integer")]
+    YearNotInt,
+    #[display("month is not an integer")]
+    MonthNotInt,
+    #[display("day is not an integer")]
+    DayNotInt,
+    #[display("year out of range")]
+    YearRange,
+    #[display("month out of range")]
+    MonthRange,
+    #[display("day out of range")]
+    DayRange,
+}
+
+impl Dob {
+    pub fn new(year: u16, month: u8, day: u8) -> Result<Self, InvalidDob> {
+        if !(1000..10000).contains(&year) {
+            return Err(InvalidDob::YearRange);
+        }
+        if month > 12 {
+            return Err(InvalidDob::MonthRange);
+        }
+        if day > 31 {
+            return Err(InvalidDob::DayRange);
+        }
+        Ok(Self { year, month, day })
+    }
+}
+
+impl FromStr for Dob {
+    type Err = InvalidDob;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let [year, month, day] = s
+            .split('-')
+            .collect::<Vec<_>>()
+            .try_into()
+            .map_err(|_| InvalidDob::NotThreeSegments)?;
+        let year = year.parse::<u16>().map_err(|_| InvalidDob::YearNotInt)?;
+        let month = month.parse::<u8>().map_err(|_| InvalidDob::MonthNotInt)?;
+        let day = day.parse::<u8>().map_err(|_| InvalidDob::DayNotInt)?;
+        Self::new(year, month, day)
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct PhysicalAddress {
+    pub address1: String,
+    pub address2: Option<String>,
+    #[serde(with = "crate::serde_iso3166")]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
+    pub country: CountryCode,
+    pub state: String,
+    pub city: String,
+    pub zip: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct SupportingDetails {
+    pub supporting_document: Option<String>, // data:image/jpeg;base64,...
+    pub payout_purpose: Option<PayoutPurpose>,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum PayoutPurpose {
+    VendorPayment,
+    Payroll,
+    TaxPayment,
+    RentLeasePayment,
+    SupplierPayment,
+    PersonalGift,
+    FamilySupport,
+    CharitableDonation,
+    ExpenseReimbursement,
+    BillUtilityPayment,
+    TravelExpenses,
+    InvestmentContribution,
+    CashWithdrawal,
+    RealEstatePurchase,
+    Other,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct TokenFeeRequest {
+    pub amount: TokenAmount,
+    pub fiat_and_rail_code: FiatAndRailCode,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum TokenPayoutFee {
+    #[serde(rename_all = "camelCase")]
+    Success {
+        #[serde(with = "rust_decimal::serde::float")]
+        exchange_rate: Decimal,
+        #[serde(with = "rust_decimal::serde::float")]
+        exchange_fee_percentage: Decimal,
+        fiat_and_rail_code: FiatAndRailCode,
+        transaction_fee: TokenAmount,
+        min_transaction_value: TokenAmount,
+        estimated_fiat_amount: FiatAmount,
+        token_amount: TokenAmount,
+        fee_total: TokenAmount,
+    },
+    #[serde(rename_all = "camelCase")]
+    Error {
+        token_amount: TokenAmount,
+        message: String,
+        fiat_and_rail_code: FiatAndRailCode,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct FiatFeeRequest {
+    #[serde(with = "rust_decimal::serde::float")]
+    pub fiat_amount: Decimal,
+    pub token_symbol: String,
+    pub fiat_and_rail_code: FiatAndRailCode,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum FiatPayoutFee {
+    #[serde(rename_all = "camelCase")]
+    Success {
+        token_symbol: String,
+        fiat_amount: FiatAmount,
+        #[serde(with = "rust_decimal::serde::float")]
+        exchange_rate: Decimal,
+        #[serde(with = "rust_decimal::serde::float")]
+        exchange_fee_percentage: Decimal,
+        fiat_and_rail_code: FiatAndRailCode,
+        transaction_fee: TokenAmount,
+        min_transaction_value: TokenAmount,
+        estimated_token_amount_required: TokenAmount,
+        fee_total: TokenAmount,
+    },
+    #[serde(rename_all = "camelCase")]
+    Error {
+        message: String,
+        fiat_and_rail_code: FiatAndRailCode,
+        token_symbol: String,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct BankDetailsResponse {
+    pub bank_details: CurrenciesBankDetails,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "kebab-case")]
+pub struct CurrenciesBankDetails {
+    #[serde(default)]
+    pub usd: CurrencyBankDetails,
+    #[serde(default)]
+    pub cop: CurrencyBankDetails,
+    #[serde(default)]
+    pub ars: CurrencyBankDetails,
+    #[serde(default)]
+    pub eur: CurrencyBankDetails,
+    #[serde(default)]
+    pub mxn: CurrencyBankDetails,
+    #[serde(default)]
+    pub brl: CurrencyBankDetails,
+    #[serde(default)]
+    pub clp: CurrencyBankDetails,
+    #[serde(default)]
+    pub pen: CurrencyBankDetails,
+    #[serde(default)]
+    pub bob: CurrencyBankDetails,
+    #[serde(default)]
+    pub crc: CurrencyBankDetails,
+    #[serde(default)]
+    pub zar: CurrencyBankDetails,
+    #[serde(default)]
+    pub usd_peru: CurrencyBankDetails,
+    #[serde(default)]
+    pub usd_china: CurrencyBankDetails,
+    #[serde(default)]
+    pub usd_panama: CurrencyBankDetails,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct CurrencyBankDetails {
+    pub bank_names: Vec<String>,
+}
diff --git a/packages/muralpay/src/payout_method.rs b/packages/muralpay/src/payout_method.rs
new file mode 100644
index 00000000..1a451b4c
--- /dev/null
+++ b/packages/muralpay/src/payout_method.rs
@@ -0,0 +1,439 @@
+use std::str::FromStr;
+
+use chrono::{DateTime, Utc};
+use derive_more::{Deref, Display, Error};
+use serde::{Deserialize, Serialize};
+use serde_with::DeserializeFromStr;
+use uuid::Uuid;
+
+use crate::{
+    ArsSymbol, BobSymbol, BrlSymbol, ClpSymbol, CopSymbol, CounterpartyId,
+    CrcSymbol, DocumentType, EurSymbol, FiatAccountType, MuralError, MuralPay,
+    MxnSymbol, PenSymbol, SearchParams, SearchResponse, UsdSymbol,
+    WalletDetails, ZarSymbol, util::RequestExt,
+};
+
+impl MuralPay {
+    pub async fn search_payout_methods(
+        &self,
+        counterparty_id: CounterpartyId,
+        params: Option<SearchParams<PayoutMethodId>>,
+    ) -> Result<SearchResponse<PayoutMethodId, PayoutMethod>, MuralError> {
+        self.http_post(|base| {
+            format!(
+                "{base}/api/counterparties/{counterparty_id}/payout-methods/search"
+            )
+        })
+        .query(&params.map(|p| p.to_query()).unwrap_or_default())
+        .send_mural()
+        .await
+    }
+
+    pub async fn get_payout_method(
+        &self,
+        counterparty_id: CounterpartyId,
+        payout_method_id: PayoutMethodId,
+    ) -> Result<PayoutMethod, MuralError> {
+        self.http_get(|base| format!("{base}/api/counterparties/{counterparty_id}/payout-methods/{payout_method_id}"))
+            .send_mural()
+            .await
+    }
+
+    pub async fn create_payout_method(
+        &self,
+        counterparty_id: CounterpartyId,
+        alias: impl AsRef<str>,
+        payout_method: &PayoutMethodDetails,
+    ) -> Result<PayoutMethod, MuralError> {
+        #[derive(Debug, Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct Body<'a> {
+            alias: &'a str,
+            payout_method: &'a PayoutMethodDetails,
+        }
+
+        let body = Body {
+            alias: alias.as_ref(),
+            payout_method,
+        };
+
+        self.http_post(|base| {
+            format!(
+                "{base}/api/counterparties/{counterparty_id}/payout-methods"
+            )
+        })
+        .json(&body)
+        .send_mural()
+        .await
+    }
+
+    pub async fn delete_payout_method(
+        &self,
+        counterparty_id: CounterpartyId,
+        payout_method_id: PayoutMethodId,
+    ) -> Result<(), MuralError> {
+        self.http_delete(|base| format!("{base}/api/counterparties/{counterparty_id}/payout-methods/{payout_method_id}"))
+            .send_mural()
+            .await
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum PayoutMethodDocumentType {
+    NationalId,
+    Passport,
+    ResidentId,
+    Ruc,
+    TaxId,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum PayoutMethodPixAccountType {
+    Phone,
+    Email,
+    Document,
+    BankAccount,
+}
+
+#[derive(
+    Debug,
+    Display,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Deref,
+    Serialize,
+    Deserialize,
+)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[display("{}", _0.hyphenated())]
+pub struct PayoutMethodId(pub Uuid);
+
+impl FromStr for PayoutMethodId {
+    type Err = <Uuid as FromStr>::Err;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<Uuid>().map(Self)
+    }
+}
+
+#[derive(Debug, Clone, Serialize, DeserializeFromStr)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+pub struct TruncatedString(String);
+
+const TRUNCATED_LEN: usize = 4;
+
+#[derive(Debug, Display, Error)]
+#[display("expected {TRUNCATED_LEN} characters, got {num_chars}")]
+pub struct InvalidTruncated {
+    pub num_chars: usize,
+}
+
+impl FromStr for TruncatedString {
+    type Err = InvalidTruncated;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let num_chars = s.chars().count();
+        if num_chars == TRUNCATED_LEN {
+            Ok(Self(s.to_string()))
+        } else {
+            Err(InvalidTruncated { num_chars })
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct PayoutMethod {
+    pub id: PayoutMethodId,
+    pub created_at: DateTime<Utc>,
+    pub counterparty_id: CounterpartyId,
+    pub alias: String,
+    pub payout_method: PayoutMethodDetails,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum PayoutMethodDetails {
+    #[serde(rename_all = "camelCase")]
+    Usd { details: UsdPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    Ars { details: ArsPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    Brl { details: BrlPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    Cop { details: CopPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    Eur { details: EurPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    Mxn { details: MxnPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    Clp { details: ClpPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    Pen { details: PenPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    Bob { details: BobPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    Crc { details: CrcPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    Zar { details: ZarPayoutDetails },
+    #[serde(rename_all = "camelCase")]
+    BlockchainWallet { details: WalletDetails },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum UsdPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    UsdDomestic {
+        symbol: UsdSymbol,
+        account_type: FiatAccountType,
+        transfer_type: UsdTransferType,
+        bank_name: String,
+        bank_account_number_truncated: TruncatedString,
+        bank_routing_number_truncated: TruncatedString,
+    },
+    #[serde(rename_all = "camelCase")]
+    UsdPeru {
+        symbol: UsdSymbol,
+        account_type: FiatAccountType,
+        document_type: DocumentType,
+        bank_name: String,
+        bank_account_number_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+    #[serde(rename_all = "camelCase")]
+    UsdChina {
+        symbol: UsdSymbol,
+        account_type: FiatAccountType,
+        document_type: DocumentType,
+        bank_name: String,
+        bank_account_number_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+        swift_bic_truncated: TruncatedString,
+        phone_number_truncated: TruncatedString,
+    },
+    #[serde(rename_all = "camelCase")]
+    UsdPanama {
+        symbol: UsdSymbol,
+        account_type: FiatAccountType,
+        document_type: DocumentType,
+        bank_name: String,
+        bank_account_number_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum UsdTransferType {
+    Ach,
+    Wire,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum ArsPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    ArsAlias {
+        symbol: ArsSymbol,
+        bank_name: String,
+        alias_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+    #[serde(rename_all = "camelCase")]
+    ArsAccountNumber {
+        symbol: ArsSymbol,
+        bank_account_number_type: ArsBankAccountNumberType,
+        bank_name: String,
+        bank_account_number_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum ArsBankAccountNumberType {
+    Cvu,
+    Cbu,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum BrlPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    PixPhone {
+        symbol: BrlSymbol,
+        full_legal_name: String,
+        bank_name: String,
+        phone_number_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+    #[serde(rename_all = "camelCase")]
+    PixEmail {
+        symbol: BrlSymbol,
+        full_legal_name: String,
+        bank_name: String,
+        email_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+    #[serde(rename_all = "camelCase")]
+    PixDocument {
+        symbol: BrlSymbol,
+        full_legal_name: String,
+        bank_name: String,
+        document_number_truncated: TruncatedString,
+    },
+    #[serde(rename_all = "camelCase")]
+    PixBankAccount {
+        symbol: BrlSymbol,
+        full_legal_name: String,
+        bank_name: String,
+        bank_account_number_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+    #[serde(rename_all = "camelCase")]
+    Wire {
+        symbol: BrlSymbol,
+        account_type: FiatAccountType,
+        full_legal_name: String,
+        bank_name: String,
+        account_number_truncated: TruncatedString,
+        bank_branch_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum CopPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    CopDomestic {
+        symbol: CopSymbol,
+        account_type: FiatAccountType,
+        document_type: DocumentType,
+        bank_name: String,
+        phone_number_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+        bank_account_number_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum EurPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    EurSepa {
+        symbol: EurSymbol,
+        country: String,
+        bank_name: String,
+        iban_truncated: TruncatedString,
+        swift_bic_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum MxnPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    MxnDomestic {
+        symbol: MxnSymbol,
+        bank_name: String,
+        bank_account_number_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum ClpPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    ClpDomestic {
+        clp: ClpSymbol,
+        account_type: FiatAccountType,
+        document_type: DocumentType,
+        bank_name: String,
+        bank_account_number_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum PenPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    PenDomestic {
+        symbol: PenSymbol,
+        document_type: DocumentType,
+        account_type: FiatAccountType,
+        bank_name: String,
+        document_number_truncated: TruncatedString,
+        bank_account_number_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum BobPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    BobDomestic {
+        symbol: BobSymbol,
+        document_type: DocumentType,
+        bank_name: String,
+        bank_account_number_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum CrcPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    CrcDomestic {
+        symbol: CrcSymbol,
+        document_type: DocumentType,
+        bank_name: String,
+        iban_truncated: TruncatedString,
+        document_number_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum ZarPayoutDetails {
+    #[serde(rename_all = "camelCase")]
+    ZarDomestic {
+        symbol: ZarSymbol,
+        account_type: FiatAccountType,
+        bank_name: String,
+        bank_account_number_truncated: TruncatedString,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct CreatePayoutMethod {
+    pub alias: String,
+    pub payout_method: PayoutMethodDetails,
+}
diff --git a/packages/muralpay/src/serde_iso3166.rs b/packages/muralpay/src/serde_iso3166.rs
new file mode 100644
index 00000000..28c9e198
--- /dev/null
+++ b/packages/muralpay/src/serde_iso3166.rs
@@ -0,0 +1,24 @@
+use serde::{Deserialize, de::Error};
+use std::borrow::Cow;
+
+use rust_iso3166::CountryCode;
+
+pub fn serialize<S: serde::Serializer>(
+    v: &CountryCode,
+    serializer: S,
+) -> Result<S::Ok, S::Error> {
+    serializer.serialize_str(v.alpha2)
+}
+
+pub fn deserialize<'de, D: serde::Deserializer<'de>>(
+    deserializer: D,
+) -> Result<CountryCode, D::Error> {
+    <Cow<'_, str>>::deserialize(deserializer).and_then(|country_code| {
+        rust_iso3166::ALPHA2_MAP
+            .get(&country_code)
+            .copied()
+            .ok_or_else(|| {
+                D::Error::custom("invalid ISO 3166 alpha-2 country code")
+            })
+    })
+}
diff --git a/packages/muralpay/src/util.rs b/packages/muralpay/src/util.rs
new file mode 100644
index 00000000..709c3df4
--- /dev/null
+++ b/packages/muralpay/src/util.rs
@@ -0,0 +1,100 @@
+use reqwest::{IntoUrl, RequestBuilder};
+use secrecy::ExposeSecret;
+use serde::de::DeserializeOwned;
+
+use crate::{ApiError, MuralError, MuralPay, TransferError};
+
+impl MuralPay {
+    fn http_req(
+        &self,
+        make_req: impl FnOnce() -> RequestBuilder,
+    ) -> RequestBuilder {
+        make_req()
+            .bearer_auth(self.api_key.expose_secret())
+            .header("accept", "application/json")
+            .header("content-type", "application/json")
+    }
+
+    pub(crate) fn http_get<U: IntoUrl>(
+        &self,
+        make_url: impl FnOnce(&str) -> U,
+    ) -> RequestBuilder {
+        self.http_req(|| self.http.get(make_url(&self.api_url)))
+    }
+
+    pub(crate) fn http_post<U: IntoUrl>(
+        &self,
+        make_url: impl FnOnce(&str) -> U,
+    ) -> RequestBuilder {
+        self.http_req(|| self.http.post(make_url(&self.api_url)))
+    }
+
+    pub(crate) fn http_put<U: IntoUrl>(
+        &self,
+        make_url: impl FnOnce(&str) -> U,
+    ) -> RequestBuilder {
+        self.http_req(|| self.http.put(make_url(&self.api_url)))
+    }
+
+    pub(crate) fn http_delete<U: IntoUrl>(
+        &self,
+        make_url: impl FnOnce(&str) -> U,
+    ) -> RequestBuilder {
+        self.http_req(|| self.http.delete(make_url(&self.api_url)))
+    }
+}
+
+pub trait RequestExt: Sized {
+    fn transfer_auth(self, client: &MuralPay) -> Result<Self, TransferError>;
+
+    async fn send_mural<T: DeserializeOwned>(self) -> crate::Result<T>;
+}
+
+const HEADER_TRANSFER_API_KEY: &str = "transfer-api-key";
+
+impl RequestExt for reqwest::RequestBuilder {
+    fn transfer_auth(self, client: &MuralPay) -> Result<Self, TransferError> {
+        let transfer_api_key = client
+            .transfer_api_key
+            .as_ref()
+            .ok_or(TransferError::NoTransferKey)?;
+
+        Ok(self
+            .header(HEADER_TRANSFER_API_KEY, transfer_api_key.expose_secret()))
+    }
+
+    async fn send_mural<T: DeserializeOwned>(self) -> crate::Result<T> {
+        let resp = self.send().await?;
+        let status = resp.status();
+        if status.is_client_error() || status.is_server_error() {
+            let json = resp.bytes().await?;
+            let err = serde_json::from_slice::<ApiError>(&json)
+                .map_err(|source| MuralError::DecodeError { source, json })?;
+            Err(MuralError::Api(err))
+        } else {
+            let json = resp.bytes().await?;
+            let t = serde_json::from_slice::<T>(&json)
+                .map_err(|source| MuralError::Decode { source, json })?;
+            Ok(t)
+        }
+    }
+}
+
+macro_rules! display_as_serialize {
+    ($T:ty) => {
+        const _: () = {
+            use std::fmt;
+
+            impl fmt::Display for $T {
+                fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                    let value =
+                        serde_json::to_value(self).map_err(|_| fmt::Error)?;
+                    let value = value.as_str().ok_or(fmt::Error)?;
+                    write!(f, "{value}")
+                }
+            }
+        };
+    };
+}
+
+pub(crate) use display_as_serialize;

From 92698e4bb54ef09c62fe859a0edf6a303a7d43af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Talbot?=
 <108630700+fetchfern@users.noreply.github.com>
Date: Mon, 3 Nov 2025 14:15:16 -0800
Subject: [PATCH 08/64] Update tax change notification timings (#4706)

---
 ...0d907adfca767efc74e4422645060687135cdc46aadecfbb23d0.json} | 4 ++--
 apps/labrinth/src/database/models/charge_item.rs              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename apps/labrinth/.sqlx/{query-7d8de27065490edc560b0c81061295ca82f44546527e1a31c03e5bb7a07c1e63.json => query-042291ae24040d907adfca767efc74e4422645060687135cdc46aadecfbb23d0.json} (96%)

diff --git a/apps/labrinth/.sqlx/query-7d8de27065490edc560b0c81061295ca82f44546527e1a31c03e5bb7a07c1e63.json b/apps/labrinth/.sqlx/query-042291ae24040d907adfca767efc74e4422645060687135cdc46aadecfbb23d0.json
similarity index 96%
rename from apps/labrinth/.sqlx/query-7d8de27065490edc560b0c81061295ca82f44546527e1a31c03e5bb7a07c1e63.json
rename to apps/labrinth/.sqlx/query-042291ae24040d907adfca767efc74e4422645060687135cdc46aadecfbb23d0.json
index ba3e1bd7..3331aaea 100644
--- a/apps/labrinth/.sqlx/query-7d8de27065490edc560b0c81061295ca82f44546527e1a31c03e5bb7a07c1e63.json
+++ b/apps/labrinth/.sqlx/query-042291ae24040d907adfca767efc74e4422645060687135cdc46aadecfbb23d0.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n                charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n                -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n                charges.subscription_interval AS \"subscription_interval?\",\n                charges.payment_platform,\n                charges.payment_platform_id AS \"payment_platform_id?\",\n                charges.parent_charge_id AS \"parent_charge_id?\",\n                charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n                charges.tax_transaction_version AS \"tax_transaction_version?\",\n                charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n            FROM charges\n            \n\t\t\tINNER JOIN users u ON u.id = charges.user_id\n\t\t\tWHERE\n\t\t\t  status = 'open'\n\t\t\t  AND COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) < NOW() - INTERVAL '1 day'\n\t\t\t  AND u.email IS NOT NULL\n\t\t\t  AND due - INTERVAL '7 days' > NOW()\n              AND due - INTERVAL '30 days' < NOW() -- Due between 7 and 30 days from now\n\t\t\tORDER BY COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) ASC\n\t\t\tFOR NO KEY UPDATE SKIP LOCKED\n\t\t\tLIMIT $1\n\t\t\t",
+  "query": "\n            SELECT\n                charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n                charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n                -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n                charges.subscription_interval AS \"subscription_interval?\",\n                charges.payment_platform,\n                charges.payment_platform_id AS \"payment_platform_id?\",\n                charges.parent_charge_id AS \"parent_charge_id?\",\n                charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n                charges.tax_transaction_version AS \"tax_transaction_version?\",\n                charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n            FROM charges\n            \n\t\t\tINNER JOIN users u ON u.id = charges.user_id\n\t\t\tWHERE\n\t\t\t  status = 'open'\n\t\t\t  AND COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) < NOW() - INTERVAL '1 day'\n\t\t\t  AND u.email IS NOT NULL\n\t\t\t  AND due - INTERVAL '2 days' > NOW()\n              AND due - INTERVAL '30 days' < NOW() -- Due between 7 and 30 days from now\n\t\t\tORDER BY COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) ASC\n\t\t\tFOR NO KEY UPDATE SKIP LOCKED\n\t\t\tLIMIT $1\n\t\t\t",
   "describe": {
     "columns": [
       {
@@ -138,5 +138,5 @@
       true
     ]
   },
-  "hash": "7d8de27065490edc560b0c81061295ca82f44546527e1a31c03e5bb7a07c1e63"
+  "hash": "042291ae24040d907adfca767efc74e4422645060687135cdc46aadecfbb23d0"
 }
diff --git a/apps/labrinth/src/database/models/charge_item.rs b/apps/labrinth/src/database/models/charge_item.rs
index 4b9e704f..fea02c0b 100644
--- a/apps/labrinth/src/database/models/charge_item.rs
+++ b/apps/labrinth/src/database/models/charge_item.rs
@@ -337,7 +337,7 @@ impl DBCharge {
 			  status = 'open'
 			  AND COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) < NOW() - INTERVAL '1 day'
 			  AND u.email IS NOT NULL
-			  AND due - INTERVAL '7 days' > NOW()
+			  AND due - INTERVAL '2 days' > NOW()
               AND due - INTERVAL '30 days' < NOW() -- Due between 7 and 30 days from now
 			ORDER BY COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) ASC
 			FOR NO KEY UPDATE SKIP LOCKED

From 3765a6ded803670fc7113ba469c30def9d4ca90d Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Mon, 3 Nov 2025 23:15:25 +0000
Subject: [PATCH 09/64] feat: creator revenue page overhaul (#4204)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: start on tax compliance

* feat: avarala1099 composable

* fix: shouldShow should be managed on the page itself

* refactor: move show logic to revenue page

* feat: security practices rather than info

* feat: withdraw page lock

* fix: empty modal bug & lint issues

* feat: hide behind feature flag

* Use standard admonition components, make casing consistent

* modal title

* lint

* feat: withdrawal check

* feat: tax cap on withdrawals warning

* feat: start on revenue page overhaul

* feat: segment generation for bar

* feat: tooltips and links

* fix: tooltip border

* feat: finish initial layout, start on withdraw modal

* feat: start on withdrawal limit stage

* feat: shade support for primary colors

* feat: start on withdraw details stage

* fix: convert swatches to hex

* feat: payout method/region dropdown temporarily using multiselect

* feat: fix modal open issues and use teleport dropdowns

* feat: hide transactions section if there are no transactions

* refactor: NavStack surfaces

* feat: new dropdown component

* feat: remove teleport dropdown modal in favour of new combobox component

* fix: lint

* refactor: dashboard sidebar layout

* feat: cleanup

* fix: niche bugs

* fix: ComboBox styling

* feat: first part of qa

* feat: animate flash rather than tooltip

* fix: lint

* feat: qa border gradient

* fix: seg hover flashes

* feat: i18n

* feat: i18n and final QA

* fix: lint

* feat: QA

* fix: lint

* fix: merge conflicts

* fix: intl

* fix: blue hover

* fix: transfers page

* feat: surface variables & gradients

* feat: text vars

* fix: lint

* fix: intl

* feat: stages

* fix: lint

* feat: region selection

* feat: method selection btns

* fix: flex col on transactions

* feat: hook up method selection to ctx

* feat: muralpay kyc stage info

* wip: muralpay integration

* Basic Mural Pay API bindings

* Fix clippy

* use dotenvy in muralpay example

* Refactor payout creation code

* wip: muralpay payout requests

* Mural Pay payouts work

* Fix clippy

* feat: progress

* fix: broken tax form stage logic

* polish: tax form stage and method selection stage layout

* add mural pay fees API

* Work on payout fee API

* Fees API for more payment methods

* Fix CI

* polish: muralpay qa

* refactor: clean up combobox component

* polish: change from critical -> warning admonition in MuralpayDetailsStage

* Temporarily disable Venmo and PayPal methods from frontend

* polish: clean up transaction component & page

* polish: navbar qa, text color-contrast in chips type buttonstyled, mb on rev/index.vue page

* fix: incorrectly using available balance as tax form withdraw limit after tax forms submitted

* wip: counterparties

* Start on counterparties and payment methods API

* polish: combobox component

* polish: fix broken scroll logic using a composable & web:fix

* fix: lint

* polish: various QA fixes

* feat: hook up with backend (wip)

* feat: draft muralpay rails dynamic logic

* polish: modify rails to support backend changes

* Mural Pay multiple methods when fetching

* Don't send supported_countries to frontend

* Mural Pay multiple methods when fetching

* Don't send supported_countries to frontend

* feat: fees & methods endpoint hookup

* chore: remove duplicates fix

* polish: qa changes + figma match

* Add countries to muralpay fiat methods

* Compile fix

* Add exchange rate info to fees endpoint

* Add fees to premium Tremendous options

* polish: i18n and better document type dropdown -> id input labels

* feat: tremendous

* fix: lint & i18n

* feat: reintroduce tin mismatch logic to index.vue

* polish: qa

* fix: i18n

* feat: remove teleport dropdown menu - combobox should be used

* fix: lint

* fix: jsdoc

* feat: checkbox for reward program terms

* Add delivery email field to Tremendous payouts

* Add Tremendous product category to payout methods

* Add bank details API to muralpay

* Fix CI

* Fix CI

* polish: qa changes

* feat: i18n pass

* feat: deduplicate methods endpoint & fix i18n issues

* chore: deduplicate i18n strings into common-messages.ts

* fix: lint

* fix: i18n

* feat: estimates

* polish: more QA

* Remove prepaid visa, compute fees properly for Tremendous methods

* Add more details to Tremendous errors

* feat: withdraw endpoint impl & internals refactor

* Add more details to Tremendous errors

* feat: completion stage

* Add fees to Mural

* feat: transactions page match figma

* fix: i18n

* polish: QA changes

* polish: qa

* Payout history route and bank details

* polish: autofill and requirements checks

* fix: i18n + lint

* fix: fiat rail fees

* polish: move scroll fade stuff into NewModal rather than just CreatorWithdrawModal

* feat: simplify action btn logic & tax form error

* fix: tax -> Tax form

* Re-add legacy PayPal/Venmo options for US

* feat: mobile responsiveness fixes for modal

* fix: responsiveness issues

* feat: navstack responsiveness

* fix: responsiveness

* move the mural bank details route

* fix: generated state cleanup & bank details input

* fix: lint & i18n

* Add utoipa support to payout endpoints

* address some PR comments

* polish: qa

* add CORS to new utoipa routes

* feat: legacy paypal/venmo stage

* polish: reset amount on back qa

* revert: navstack mr changes

* polish: loading indicator on method selection stage

* fix: paypal modal doesnt reopen after auth

* fix: lint & i18n

* fix: paypal flow

* polish: qa changes

* fix: gitignore

* polish: qa fixes

* fix: payouts_available in payouts.rs

* fix: bug when limit is zero

* polish: qa changes

* fix: qa stuff & muralpay sub-division fix

* Immediately approve mural payouts

* Add currency support to Tremendous payouts

* Currency forex

* add forex to tremendous fee request

* polish: qa & currency support for paypal tremendous

* polish: fx qa

* feat: demo mode flag

* fix: i18n & padding issues

* polish: qa changes

* fix: ml

* Add Mural balance to bank balance info

* polish: show warning for paypal international USD withdrawals + more currencies

* Add more Tremendous currencies support

* fix: colors on balance bars

* fix: empty states

* fix: pl-8 mobile issue

* fix: hide see all

* Transaction payouts available use the correct date

* Address my own review comment

* Address PR comments

* Change Mural withdrawal limit to 3k

* fix: empty state + paypal warning

* maybe fix tremendous gift cards

* Change how Mural minimum withdrawals are calculated

* Tweak min/max withdrawal values

* fix: segment brightness

* fix: min & max for muralpay & legacy paypal

* Fix some icon issues

* more issues

* fix user menu

* fix: remove + network

---------

Signed-off-by: Calum H. <contact@cal.engineer>
Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
Co-authored-by: aecsocket <aecsocket@tutanota.com>
Co-authored-by: Alejandro González <me@alegon.dev>
---
 .../instructions/i18n-convert.instructions.md |   1 +
 .gitignore                                    |   3 +
 .../InstallationSettings.vue                  |  32 +-
 .../ui/settings/AppearanceSettings.vue        |  11 +-
 .../ui/world/modal/ServerModalBody.vue        |  17 +-
 apps/frontend/nuxt.config.ts                  |  84 +-
 apps/frontend/package.json                    |   3 +-
 .../src/components/brand/TextLogo.vue         |   5 +-
 .../components/ui/EnvironmentIndicator.vue    |   2 +-
 apps/frontend/src/components/ui/NavStack.vue  | 142 ++-
 .../src/components/ui/NavStackItem.vue        |  64 --
 .../src/components/ui/NotificationItem.vue    |   2 +-
 .../src/components/ui/ProjectCard.vue         |   2 +-
 .../ui/dashboard/CreatorWithdrawModal.vue     | 457 ++++++++
 .../ui/dashboard/RevenueInputField.vue        | 149 +++
 .../ui/dashboard/RevenueTransaction.vue       | 124 +++
 .../ui/dashboard/WithdrawFeeBreakdown.vue     | 119 +++
 .../withdraw-stages/CompletionStage.vue       | 301 ++++++
 .../LegacyPaypalDetailsStage.vue              | 351 ++++++
 .../withdraw-stages/MethodSelectionStage.vue  | 323 ++++++
 .../withdraw-stages/MuralpayDetailsStage.vue  | 516 +++++++++
 .../withdraw-stages/MuralpayKycStage.vue      | 362 +++++++
 .../withdraw-stages/TaxFormStage.vue          | 159 +++
 .../TremendousDetailsStage.vue                | 649 ++++++++++++
 .../src/components/ui/search/Categories.vue   |   2 +-
 .../ui/servers/BackupSettingsModal.vue        |  13 +-
 .../ui/servers/ContentVersionEditModal.vue    |  31 +-
 .../PlatformChangeModpackVersionModal.vue     |  14 +-
 .../ui/servers/PlatformVersionSelectModal.vue |  22 +-
 .../ui/servers/TeleportDropdownMenu.vue       | 458 --------
 apps/frontend/src/composables/country.ts      |  34 +
 apps/frontend/src/composables/featureFlags.ts |   1 +
 apps/frontend/src/composables/generated.ts    | 146 +++
 apps/frontend/src/composables/tag.js          |  64 --
 apps/frontend/src/helpers/projects.js         |   4 +-
 apps/frontend/src/layouts/default.vue         |  69 +-
 apps/frontend/src/locales/en-US/index.json    | 579 +++++++++-
 apps/frontend/src/pages/[type]/[id].vue       |   2 +-
 .../src/pages/[type]/[id]/changelog.vue       |   2 +-
 .../src/pages/[type]/[id]/settings.vue        | 173 ++-
 .../src/pages/[type]/[id]/settings/index.vue  |   2 +-
 .../src/pages/[type]/[id]/settings/links.vue  |   2 +-
 .../src/pages/[type]/[id]/settings/tags.vue   |   2 +-
 .../[type]/[id]/version/[version]-new.vue     |   2 +-
 .../pages/[type]/[id]/version/[version].vue   |   2 +-
 .../src/pages/[type]/[id]/versions.vue        |   2 +-
 .../src/pages/admin/servers/nodes.vue         |  37 +-
 .../src/pages/admin/servers/notices.vue       |   8 +-
 apps/frontend/src/pages/auth/sign-in.vue      |  24 +-
 apps/frontend/src/pages/auth/sign-up.vue      |  24 +-
 apps/frontend/src/pages/collection/[id].vue   |   2 +-
 apps/frontend/src/pages/dashboard.vue         |  70 +-
 .../src/pages/dashboard/revenue/index.vue     | 871 +++++++++++----
 .../src/pages/dashboard/revenue/transfers.vue | 356 +++----
 .../src/pages/dashboard/revenue/withdraw.vue  | 630 -----------
 apps/frontend/src/pages/legal.vue             |  49 +-
 apps/frontend/src/pages/organization/[id].vue |  84 +-
 apps/frontend/src/pages/report.vue            |   2 +-
 .../src/pages/search/[searchProjectType].vue  |   2 +-
 .../manage/[id]/options/properties.vue        |  10 +-
 .../servers/manage/[id]/options/startup.vue   |  14 +-
 apps/frontend/src/pages/settings.vue          | 141 +--
 apps/frontend/src/pages/settings/index.vue    |   2 +-
 apps/frontend/src/pages/user/[id].vue         |  17 +-
 apps/frontend/src/plugins/shorthands.js       |   2 +-
 .../src/providers/creator-withdraw.ts         | 917 ++++++++++++++++
 apps/frontend/src/utils/finance-icons.ts      |  34 +
 apps/frontend/src/utils/muralpay-rails.ts     | 998 ++++++++++++++++++
 ...8ec5437be07fab8c34a964f7864304681bb94.json |  28 -
 .../external/{sso => color}/discord.svg       |   0
 .../assets/external/{sso => color}/github.svg |   0
 .../assets/external/{sso => color}/gitlab.svg |   0
 .../assets/external/{sso => color}/google.svg |   0
 .../external/{sso => color}/microsoft.svg     |   0
 packages/assets/external/color/paypal.svg     |  13 +
 .../assets/external/{sso => color}/steam.svg  |   0
 packages/assets/external/color/usdc.svg       |  10 +
 packages/assets/external/color/venmo.svg      |   8 +
 packages/assets/external/paypal.svg           |   6 +-
 packages/assets/external/polygon.svg          |   5 +
 packages/assets/external/tumblr.svg           |   6 +-
 packages/assets/external/venmo.svg            |   5 +
 packages/assets/external/visa.svg             |   5 +
 packages/assets/generated-icons.ts            |  18 +
 packages/assets/icons/arrow-down.svg          |   5 +
 packages/assets/icons/arrow-left-right.svg    |   1 +
 packages/assets/icons/arrow-up-right.svg      |  15 +
 packages/assets/icons/arrow-up.svg            |  15 +
 packages/assets/icons/badge-dollar-sign.svg   |   7 +
 packages/assets/icons/gift.svg                |   1 +
 packages/assets/icons/hand-helping.svg        |   6 +
 packages/assets/icons/landmark.svg            |   9 +
 packages/assets/icons/loader-circle.svg       |   1 +
 packages/assets/index.ts                      |  36 +-
 .../ui/src/components/base/Admonition.vue     |  47 +-
 .../ui/src/components/base/BulletDivider.vue  |   5 +
 .../ui/src/components/base/ButtonStyled.vue   |  47 +-
 packages/ui/src/components/base/Combobox.vue  | 539 ++++++++++
 .../components/base/TeleportDropdownMenu.vue  | 441 --------
 packages/ui/src/components/index.ts           |   3 +-
 packages/ui/src/components/modal/NewModal.vue |  71 +-
 packages/ui/src/composables/debug-logger.ts   |  28 +
 packages/ui/src/composables/index.ts          |   2 +
 .../ui/src/composables/scroll-indicator.ts    | 181 ++++
 packages/ui/src/locales/en-US/index.json      | 111 ++
 packages/ui/src/utils/common-messages.ts      | 161 +++
 packages/utils/types.ts                       |  75 ++
 pnpm-lock.yaml                                |  26 +-
 108 files changed, 9071 insertions(+), 2664 deletions(-)
 delete mode 100644 apps/frontend/src/components/ui/NavStackItem.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/RevenueInputField.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/WithdrawFeeBreakdown.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/withdraw-stages/MethodSelectionStage.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayKycStage.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/withdraw-stages/TaxFormStage.vue
 create mode 100644 apps/frontend/src/components/ui/dashboard/withdraw-stages/TremendousDetailsStage.vue
 delete mode 100644 apps/frontend/src/components/ui/servers/TeleportDropdownMenu.vue
 create mode 100644 apps/frontend/src/composables/generated.ts
 delete mode 100644 apps/frontend/src/composables/tag.js
 delete mode 100644 apps/frontend/src/pages/dashboard/revenue/withdraw.vue
 create mode 100644 apps/frontend/src/providers/creator-withdraw.ts
 create mode 100644 apps/frontend/src/utils/finance-icons.ts
 create mode 100644 apps/frontend/src/utils/muralpay-rails.ts
 delete mode 100644 apps/labrinth/.sqlx/query-8f68ea8481d86687ef4ebd6311f8ec5437be07fab8c34a964f7864304681bb94.json
 rename packages/assets/external/{sso => color}/discord.svg (100%)
 rename packages/assets/external/{sso => color}/github.svg (100%)
 rename packages/assets/external/{sso => color}/gitlab.svg (100%)
 rename packages/assets/external/{sso => color}/google.svg (100%)
 rename packages/assets/external/{sso => color}/microsoft.svg (100%)
 create mode 100644 packages/assets/external/color/paypal.svg
 rename packages/assets/external/{sso => color}/steam.svg (100%)
 create mode 100644 packages/assets/external/color/usdc.svg
 create mode 100644 packages/assets/external/color/venmo.svg
 create mode 100644 packages/assets/external/polygon.svg
 create mode 100644 packages/assets/external/venmo.svg
 create mode 100644 packages/assets/external/visa.svg
 create mode 100644 packages/assets/icons/arrow-down.svg
 create mode 100644 packages/assets/icons/arrow-left-right.svg
 create mode 100644 packages/assets/icons/arrow-up-right.svg
 create mode 100644 packages/assets/icons/arrow-up.svg
 create mode 100644 packages/assets/icons/badge-dollar-sign.svg
 create mode 100644 packages/assets/icons/gift.svg
 create mode 100644 packages/assets/icons/hand-helping.svg
 create mode 100644 packages/assets/icons/landmark.svg
 create mode 100644 packages/assets/icons/loader-circle.svg
 create mode 100644 packages/ui/src/components/base/BulletDivider.vue
 create mode 100644 packages/ui/src/components/base/Combobox.vue
 delete mode 100644 packages/ui/src/components/base/TeleportDropdownMenu.vue
 create mode 100644 packages/ui/src/composables/debug-logger.ts
 create mode 100644 packages/ui/src/composables/scroll-indicator.ts

diff --git a/.github/instructions/i18n-convert.instructions.md b/.github/instructions/i18n-convert.instructions.md
index 44a98ce4..732e391e 100644
--- a/.github/instructions/i18n-convert.instructions.md
+++ b/.github/instructions/i18n-convert.instructions.md
@@ -9,6 +9,7 @@ Please follow these rules precisely:
 1. Identify translatable strings
 
 - Scan the <template> for all user-visible strings (inner text, alt attributes, placeholders, button labels, etc.). Do not extract dynamic expressions (like {{ user.name }}) or HTML tags. Only extract static human-readable text.
+- There may be strings within the <script> block, e.g dropdown option labels, notifications etc.
 
 2. Create message definitions
 
diff --git a/.gitignore b/.gitignore
index b02d5009..b6d7c5d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,6 @@ app-playground-data/*
 
 .astro
 .claude
+
+# labrinth demo fixtures
+apps/labrinth/fixtures/demo
diff --git a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
index 72474057..ad69e84e 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
@@ -15,8 +15,8 @@ import {
 	ButtonStyled,
 	Checkbox,
 	Chips,
+	Combobox,
 	injectNotificationManager,
-	TeleportDropdownMenu,
 } from '@modrinth/ui'
 import {
 	formatCategory,
@@ -158,6 +158,21 @@ const selectableGameVersionNumbers = computed(() => {
 		.map((x) => x.version)
 })
 
+const gameVersionOptions = computed(() =>
+	(selectableGameVersionNumbers.value ?? []).map((v) => ({ value: v, label: v })),
+)
+
+const loaderVersionOptions = computed(() =>
+	(selectableLoaderVersions.value ?? []).map((opt, index) => ({ value: index, label: opt.id })),
+)
+
+const loaderVersionLabel = computed(() => {
+	const idx = loaderVersionIndex.value
+	return idx >= 0 && selectableLoaderVersions.value
+		? selectableLoaderVersions.value[idx]?.id
+		: 'Select version'
+})
+
 const selectableLoaderVersions: ComputedRef<ManifestLoaderVersion[] | undefined> = computed(() => {
 	if (gameVersion.value) {
 		if (loader.value === 'fabric') {
@@ -647,11 +662,11 @@ const messages = defineMessages({
 				{{ formatMessage(messages.gameVersion) }}
 			</h2>
 			<div class="flex flex-wrap mt-2 gap-2">
-				<TeleportDropdownMenu
+				<Combobox
 					v-if="selectableGameVersionNumbers !== undefined"
 					v-model="gameVersion"
-					:options="selectableGameVersionNumbers"
-					name="Game Version Dropdown"
+					:options="gameVersionOptions"
+					:display-value="gameVersion || formatMessage(messages.unknownVersion)"
 				/>
 				<Checkbox
 					v-if="hasSnapshots"
@@ -663,14 +678,13 @@ const messages = defineMessages({
 				<h2 class="m-0 mt-4 text-lg font-extrabold text-contrast block">
 					{{ formatMessage(messages.loaderVersion, { loader: formatCategory(loader) }) }}
 				</h2>
-				<TeleportDropdownMenu
+				<Combobox
 					v-if="selectableLoaderVersions"
-					:model-value="selectableLoaderVersions[loaderVersionIndex]"
-					:options="selectableLoaderVersions"
-					:display-name="(option: ManifestLoaderVersion) => option?.id"
+					v-model="loaderVersionIndex"
+					:options="loaderVersionOptions"
+					:display-value="loaderVersionLabel"
 					name="Version selector"
 					class="mt-2"
-					@change="(value) => (loaderVersionIndex = value.index)"
 				/>
 				<div v-else class="mt-2 text-brand-red flex gap-2 items-center">
 					<IssuesIcon />
diff --git a/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue b/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
index 04473bb8..e66b3bef 100644
--- a/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { TeleportDropdownMenu, ThemeSelector, Toggle } from '@modrinth/ui'
+import { Combobox, ThemeSelector, Toggle } from '@modrinth/ui'
 import { ref, watch } from 'vue'
 
 import { get, set } from '@/helpers/settings.ts'
@@ -50,7 +50,7 @@ watch(
 			:model-value="themeStore.advancedRendering"
 			@update:model-value="
 				(e) => {
-					themeStore.advancedRendering = e
+					themeStore.advancedRendering = !!e
 					settings.advanced_rendering = themeStore.advancedRendering
 				}
 			"
@@ -86,12 +86,13 @@ watch(
 			<h2 class="m-0 text-lg font-extrabold text-contrast">Default landing page</h2>
 			<p class="m-0 mt-1">Change the page to which the launcher opens on.</p>
 		</div>
-		<TeleportDropdownMenu
+		<Combobox
 			id="opening-page"
 			v-model="settings.default_page"
 			name="Opening page dropdown"
 			class="w-40"
-			:options="['Home', 'Library']"
+			:options="['Home', 'Library'].map((v) => ({ value: v, label: v }))"
+			:display-value="settings.default_page ?? 'Select an option'"
 		/>
 	</div>
 
@@ -122,7 +123,7 @@ watch(
 			:model-value="settings.toggle_sidebar"
 			@update:model-value="
 				(e) => {
-					settings.toggle_sidebar = e
+					settings.toggle_sidebar = !!e
 					themeStore.toggleSidebar = settings.toggle_sidebar
 				}
 			"
diff --git a/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue b/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue
index 48b69050..ce8b557f 100644
--- a/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { TeleportDropdownMenu } from '@modrinth/ui'
+import { Combobox } from '@modrinth/ui'
 import { defineMessages, type MessageDescriptor, useVIntl } from '@vintl/vintl'
 
 import type { ServerPackStatus } from '@/helpers/worlds.ts'
@@ -74,12 +74,19 @@ defineExpose({ resourcePackOptions })
 			{{ formatMessage(messages.resourcePack) }}
 		</h2>
 		<div>
-			<TeleportDropdownMenu
+			<Combobox
 				v-model="resourcePack"
-				:options="resourcePackOptions"
+				:options="
+					resourcePackOptions.map((o) => ({
+						value: o,
+						label: formatMessage(resourcePackOptionMessages[o]),
+					}))
+				"
 				name="Server resource pack"
-				:display-name="
-					(option: ServerPackStatus) => formatMessage(resourcePackOptionMessages[option])
+				:display-value="
+					resourcePack
+						? formatMessage(resourcePackOptionMessages[resourcePack])
+						: 'Select an option'
 				"
 			/>
 		</div>
diff --git a/apps/frontend/nuxt.config.ts b/apps/frontend/nuxt.config.ts
index f1ed046d..0e41c083 100644
--- a/apps/frontend/nuxt.config.ts
+++ b/apps/frontend/nuxt.config.ts
@@ -7,10 +7,16 @@ import { promises as fs } from 'fs'
 import { globIterate } from 'glob'
 import { defineNuxtConfig } from 'nuxt/config'
 import { $fetch } from 'ofetch'
+import Papa from 'papaparse'
 import { basename, relative, resolve } from 'pathe'
 import svgLoader from 'vite-svg-loader'
 
+import type { GeneratedState } from './src/composables/generated'
+
 const STAGING_API_URL = 'https://staging-api.modrinth.com/v2/'
+// ISO 3166 data from https://github.com/ipregistry/iso3166
+// Licensed under CC BY-SA 4.0
+const ISO3166_REPO = 'https://raw.githubusercontent.com/ipregistry/iso3166/master'
 
 const preloadedFonts = [
 	'inter/Inter-Regular.woff2',
@@ -133,20 +139,7 @@ export default defineNuxtConfig({
 			// 30 minutes
 			const TTL = 30 * 60 * 1000
 
-			let state: {
-				lastGenerated?: string
-				apiUrl?: string
-				categories?: any[]
-				loaders?: any[]
-				gameVersions?: any[]
-				donationPlatforms?: any[]
-				reportTypes?: any[]
-				homePageProjects?: any[]
-				homePageSearch?: any[]
-				homePageNotifs?: any[]
-				products?: any[]
-				errors?: number[]
-			} = {}
+			let state: Partial<GeneratedState> = {}
 
 			try {
 				state = JSON.parse(await fs.readFile('./src/generated/state.json', 'utf8'))
@@ -200,6 +193,9 @@ export default defineNuxtConfig({
 				homePageSearch,
 				homePageNotifs,
 				products,
+				muralBankDetails,
+				countriesCSV,
+				subdivisionsCSV,
 			] = await Promise.all([
 				$fetch(`${API_URL}tag/category`, headers).catch((err) => handleFetchError(err, [])),
 				$fetch(`${API_URL}tag/loader`, headers).catch((err) => handleFetchError(err, [])),
@@ -220,8 +216,53 @@ export default defineNuxtConfig({
 				$fetch(`${API_URL.replace('/v2/', '/_internal/')}billing/products`, headers).catch((err) =>
 					handleFetchError(err, []),
 				),
+				$fetch(`${API_URL.replace('/v2/', '/_internal/')}mural/bank-details`, headers).catch(
+					(err) => handleFetchError(err, null),
+				),
+				$fetch<string>(`${ISO3166_REPO}/countries.csv`, {
+					...headers,
+					responseType: 'text',
+				}).catch((err) => handleFetchError(err, '')),
+				$fetch<string>(`${ISO3166_REPO}/subdivisions.csv`, {
+					...headers,
+					responseType: 'text',
+				}).catch((err) => handleFetchError(err, '')),
 			])
 
+			const countriesData = Papa.parse(countriesCSV, {
+				header: true,
+				skipEmptyLines: true,
+				transformHeader: (header) => (header.startsWith('#') ? header.slice(1) : header),
+			}).data
+			const subdivisionsData = Papa.parse(subdivisionsCSV, {
+				header: true,
+				skipEmptyLines: true,
+				transformHeader: (header) => (header.startsWith('#') ? header.slice(1) : header),
+			}).data
+
+			const subdivisionsByCountry = (subdivisionsData as any[]).reduce(
+				(acc, sub) => {
+					const countryCode = sub.country_code_alpha2
+
+					if (!countryCode || typeof countryCode !== 'string' || countryCode.trim() === '') {
+						return acc
+					}
+
+					if (!acc[countryCode]) acc[countryCode] = []
+
+					acc[countryCode].push({
+						code: sub['subdivision_code_iso3166-2'],
+						name: sub.subdivision_name,
+						localVariant: sub.localVariant || null,
+						category: sub.category,
+						parent: sub.parent_subdivision || null,
+						language: sub.language_code,
+					})
+					return acc
+				},
+				{} as Record<string, any[]>,
+			)
+
 			state.categories = categories
 			state.loaders = loaders
 			state.gameVersions = gameVersions
@@ -231,6 +272,15 @@ export default defineNuxtConfig({
 			state.homePageSearch = homePageSearch
 			state.homePageNotifs = homePageNotifs
 			state.products = products
+			state.muralBankDetails = muralBankDetails.bankDetails
+			state.countries = (countriesData as any[]).map((c) => ({
+				alpha2: c.country_code_alpha2,
+				alpha3: c.country_code_alpha3,
+				numeric: c.numeric_code,
+				nameShort: c.name_short,
+				nameLong: c.name_long,
+			}))
+			state.subdivisions = subdivisionsByCountry
 			state.errors = [...caughtErrorCodes]
 
 			await fs.writeFile('./src/generated/state.json', JSON.stringify(state))
@@ -475,6 +525,12 @@ export default defineNuxtConfig({
 				'Critical-CH': 'Sec-CH-Prefers-Color-Scheme',
 			},
 		},
+		'/dashboard/revenue/withdraw': {
+			redirect: {
+				to: '/dashboard/revenue',
+				statusCode: 410,
+			},
+		},
 		'/email/**': {
 			redirect: '/_internal/templates/email/**',
 		},
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 768926c6..3e3dca89 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -18,6 +18,7 @@
 		"@nuxt/devtools": "^1.3.3",
 		"@types/dompurify": "^3.0.5",
 		"@types/node": "^20.1.0",
+		"@types/papaparse": "^5.3.15",
 		"@vintl/compact-number": "^2.0.5",
 		"@vintl/how-ago": "^3.0.1",
 		"@vintl/nuxt": "^1.9.2",
@@ -56,10 +57,10 @@
 		"floating-vue": "^5.2.2",
 		"fuse.js": "^6.6.2",
 		"highlight.js": "^11.7.0",
-		"iso-3166-1": "^2.1.1",
 		"js-yaml": "^4.1.0",
 		"jszip": "^3.10.1",
 		"markdown-it": "14.1.0",
+		"papaparse": "^5.4.1",
 		"pathe": "^1.1.2",
 		"pinia": "^2.1.7",
 		"pinia-plugin-persistedstate": "^4.4.1",
diff --git a/apps/frontend/src/components/brand/TextLogo.vue b/apps/frontend/src/components/brand/TextLogo.vue
index 4bfb0c8f..829ffe4a 100644
--- a/apps/frontend/src/components/brand/TextLogo.vue
+++ b/apps/frontend/src/components/brand/TextLogo.vue
@@ -53,12 +53,15 @@
 	</svg>
 </template>
 
-<script setup>
+<script setup lang="ts">
 const loading = useLoading()
 
 const config = useRuntimeConfig()
+const flags = useFeatureFlags()
 
 const api = computed(() => {
+	if (flags.value.demoMode) return 'prod'
+
 	const apiUrl = config.public.apiBaseUrl
 	if (apiUrl.startsWith('https://api.modrinth.com')) {
 		return 'prod'
diff --git a/apps/frontend/src/components/ui/EnvironmentIndicator.vue b/apps/frontend/src/components/ui/EnvironmentIndicator.vue
index 0725737e..024e9493 100644
--- a/apps/frontend/src/components/ui/EnvironmentIndicator.vue
+++ b/apps/frontend/src/components/ui/EnvironmentIndicator.vue
@@ -90,7 +90,7 @@ defineProps({
 	},
 })
 
-const tags = useTags()
+const tags = useGeneratedState()
 </script>
 <style lang="scss" scoped>
 .environment {
diff --git a/apps/frontend/src/components/ui/NavStack.vue b/apps/frontend/src/components/ui/NavStack.vue
index f7bb9fcc..bba0baac 100644
--- a/apps/frontend/src/components/ui/NavStack.vue
+++ b/apps/frontend/src/components/ui/NavStack.vue
@@ -1,32 +1,134 @@
 <template>
-	<nav>
-		<ul>
-			<slot />
+	<nav :aria-label="ariaLabel" class="w-full">
+		<ul class="m-0 flex list-none flex-col items-start gap-1.5 rounded-2xl bg-bg-raised p-4">
+			<slot v-if="hasSlotContent" />
+
+			<template v-else>
+				<li v-for="(item, idx) in filteredItems" :key="getKey(item, idx)" class="contents">
+					<hr v-if="isSeparator(item)" class="my-1 w-full border-t border-solid" />
+
+					<div
+						v-else-if="isHeading(item)"
+						class="px-4 pb-1 pt-2 text-xs font-bold uppercase tracking-wide text-secondary"
+					>
+						{{ item.label }}
+					</div>
+
+					<NuxtLink
+						v-else-if="item.link ?? item.to"
+						:to="(item.link ?? item.to) as string"
+						class="nav-item inline-flex w-full cursor-pointer items-center gap-2 text-nowrap rounded-xl border-none bg-transparent px-4 py-2.5 text-left text-base font-semibold leading-tight text-button-text transition-all hover:bg-button-bg hover:text-contrast active:scale-[0.97]"
+					>
+						<component
+							:is="item.icon"
+							v-if="item.icon"
+							aria-hidden="true"
+							class="h-5 w-5 shrink-0"
+						/>
+						<span class="text-contrast">{{ item.label }}</span>
+						<span
+							v-if="item.badge != null"
+							class="rounded-full bg-brand-highlight px-2 text-sm font-bold text-brand"
+						>
+							{{ String(item.badge) }}
+						</span>
+						<span v-if="item.chevron" class="ml-auto"><ChevronRightIcon /></span>
+					</NuxtLink>
+
+					<button
+						v-else-if="item.action"
+						class="nav-item inline-flex w-full cursor-pointer items-center gap-2 text-nowrap rounded-xl border-none bg-transparent px-4 py-2.5 text-left text-base font-semibold leading-tight text-button-text transition-all hover:bg-button-bg hover:text-contrast active:scale-[0.97]"
+						:class="{ 'danger-button': item.danger }"
+						@click="item.action"
+					>
+						<component
+							:is="item.icon"
+							v-if="item.icon"
+							aria-hidden="true"
+							class="h-5 w-5 shrink-0"
+						/>
+						<span class="text-contrast">{{ item.label }}</span>
+						<span
+							v-if="item.badge != null"
+							class="rounded-full bg-brand-highlight px-2 text-sm font-bold text-brand"
+						>
+							{{ String(item.badge) }}
+						</span>
+					</button>
+
+					<span v-else>You frog. 🐸</span>
+				</li>
+			</template>
 		</ul>
 	</nav>
 </template>
 
-<script>
-export default {}
+<script setup lang="ts">
+import { ChevronRightIcon } from '@modrinth/assets'
+import { type Component, computed, useSlots } from 'vue'
+
+type NavStackBaseItem = {
+	label: string
+	icon?: Component | string
+	badge?: string | number | null
+	chevron?: boolean
+	danger?: boolean
+}
+
+type NavStackLinkItem = NavStackBaseItem & {
+	type?: 'item'
+	link?: string | null
+	to?: string | null
+	action?: (() => void) | null
+}
+
+type NavStackSeparator = { type: 'separator' }
+type NavStackHeading = { type: 'heading'; label: string }
+
+export type NavStackEntry = (NavStackLinkItem | NavStackSeparator | NavStackHeading) & {
+	shown?: boolean
+}
+
+const props = defineProps<{
+	items?: NavStackEntry[]
+	ariaLabel?: string
+}>()
+
+const ariaLabel = computed(() => props.ariaLabel ?? 'Section navigation')
+
+const slots = useSlots()
+const hasSlotContent = computed(() => {
+	const content = slots.default?.()
+	return !!(content && content.length)
+})
+
+function isSeparator(item: NavStackEntry): item is NavStackSeparator {
+	return (item as any).type === 'separator'
+}
+
+function isHeading(item: NavStackEntry): item is NavStackHeading {
+	return (item as any).type === 'heading'
+}
+
+function getKey(item: NavStackEntry, idx: number) {
+	if (isSeparator(item)) return `sep-${idx}`
+	if (isHeading(item)) return `head-${item.label}-${idx}`
+	const link = (item as NavStackLinkItem).link ?? (item as NavStackLinkItem).to
+	return link ? `link-${link}` : `action-${(item as NavStackLinkItem).label}-${idx}`
+}
+
+const filteredItems = computed(() => props.items?.filter((x) => x.shown === undefined || x.shown))
 </script>
 
 <style lang="scss" scoped>
-ul {
-	display: flex;
-	flex-direction: column;
-	grid-gap: var(--spacing-card-xs);
-	flex-wrap: wrap;
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
-
-	> :first-child {
-		margin-top: 0;
-	}
-}
-
 li {
-	display: unset;
 	text-align: unset;
 }
+.router-link-exact-active.nav-item {
+	background: var(--color-button-bg-selected);
+	color: var(--color-button-text-selected);
+}
+.router-link-exact-active.nav-item .text-contrast {
+	color: var(--color-button-text-selected);
+}
 </style>
diff --git a/apps/frontend/src/components/ui/NavStackItem.vue b/apps/frontend/src/components/ui/NavStackItem.vue
deleted file mode 100644
index aff9b434..00000000
--- a/apps/frontend/src/components/ui/NavStackItem.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-	<NuxtLink v-if="link !== null" :to="link" class="nav-item">
-		<slot />
-		<span>{{ label }}</span>
-		<span v-if="badge" class="rounded-full bg-brand-highlight px-2 text-sm font-bold text-brand">{{
-			badge
-		}}</span>
-		<span v-if="chevron" class="ml-auto"><ChevronRightIcon /></span>
-	</NuxtLink>
-	<button v-else-if="action" class="nav-item" :class="{ 'danger-button': danger }" @click="action">
-		<slot />
-		<span>{{ label }}</span>
-		<span v-if="badge" class="rounded-full bg-brand-highlight px-2 text-sm font-bold text-brand">{{
-			badge
-		}}</span>
-	</button>
-	<span v-else>i forgor 💀</span>
-</template>
-
-<script>
-import { ChevronRightIcon } from '@modrinth/assets'
-
-export default {
-	components: {
-		ChevronRightIcon,
-	},
-	props: {
-		link: {
-			default: null,
-			type: String,
-		},
-		action: {
-			default: null,
-			type: Function,
-		},
-		label: {
-			required: true,
-			type: String,
-		},
-		badge: {
-			default: null,
-			type: String,
-		},
-		chevron: {
-			default: false,
-			type: Boolean,
-		},
-		danger: {
-			default: false,
-			type: Boolean,
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.nav-item {
-	@apply flex w-full cursor-pointer items-center gap-2 text-nowrap rounded-xl border-none bg-transparent px-4 py-2 text-left font-semibold text-button-text transition-all hover:bg-button-bg hover:text-contrast active:scale-[0.97];
-}
-
-.router-link-exact-active.nav-item {
-	@apply bg-button-bgSelected text-button-textSelected;
-}
-</style>
diff --git a/apps/frontend/src/components/ui/NotificationItem.vue b/apps/frontend/src/components/ui/NotificationItem.vue
index 662c98a7..35a8e5c0 100644
--- a/apps/frontend/src/components/ui/NotificationItem.vue
+++ b/apps/frontend/src/components/ui/NotificationItem.vue
@@ -376,7 +376,7 @@ const props = defineProps({
 })
 
 const flags = useFeatureFlags()
-const tags = useTags()
+const tags = useGeneratedState()
 
 const type = computed(() =>
 	!props.notification.body || props.notification.body.type === 'legacy_markdown'
diff --git a/apps/frontend/src/components/ui/ProjectCard.vue b/apps/frontend/src/components/ui/ProjectCard.vue
index 6e429f56..a91868fc 100644
--- a/apps/frontend/src/components/ui/ProjectCard.vue
+++ b/apps/frontend/src/components/ui/ProjectCard.vue
@@ -212,7 +212,7 @@ export default {
 		},
 	},
 	setup() {
-		const tags = useTags()
+		const tags = useGeneratedState()
 		const formatRelativeTime = useRelativeTime()
 
 		return { tags, formatRelativeTime }
diff --git a/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue b/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue
new file mode 100644
index 00000000..b9aeb740
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue
@@ -0,0 +1,457 @@
+<template>
+	<NewModal
+		ref="withdrawModal"
+		:closable="currentStage !== 'completion'"
+		:hide-header="currentStage === 'completion'"
+		:merge-header="currentStage === 'completion'"
+		:scrollable="true"
+		max-content-height="72vh"
+		:on-hide="onModalHide"
+	>
+		<template #title>
+			<div v-if="shouldShowTitle" class="flex flex-wrap items-center gap-1 text-secondary">
+				<template v-if="currentStage === 'tax-form'">
+					<span class="text-lg font-bold text-contrast sm:text-xl">{{
+						formatMessage(messages.taxFormStage)
+					}}</span>
+				</template>
+				<template v-else-if="currentStage === 'method-selection'">
+					<span class="text-lg font-bold text-contrast sm:text-xl">{{
+						formatMessage(messages.methodSelectionStage)
+					}}</span>
+					<ChevronRightIcon class="size-5 text-secondary" stroke-width="3" />
+					<span class="text-lg text-secondary sm:text-xl">{{
+						formatMessage(messages.detailsLabel)
+					}}</span>
+				</template>
+				<template v-else-if="isDetailsStage">
+					<button
+						class="active:scale-9 bg-transparent p-0 text-lg text-secondary transition-colors duration-200 hover:text-primary sm:text-xl"
+						@click="goToBreadcrumbStage('method-selection')"
+					>
+						{{ formatMessage(messages.methodSelectionStage) }}
+					</button>
+					<ChevronRightIcon class="size-5 text-secondary" stroke-width="3" />
+					<span class="text-lg font-bold text-contrast sm:text-xl">{{
+						formatMessage(messages.detailsLabel)
+					}}</span>
+				</template>
+			</div>
+		</template>
+		<div class="w-full max-w-[496px] lg:min-w-[496px]">
+			<TaxFormStage
+				v-if="currentStage === 'tax-form'"
+				:balance="balance"
+				:on-show-tax-form="showTaxFormModal"
+			/>
+			<MethodSelectionStage
+				v-else-if="currentStage === 'method-selection'"
+				:on-show-tax-form="showTaxFormModal"
+				@close-modal="withdrawModal?.hide()"
+			/>
+			<TremendousDetailsStage v-else-if="currentStage === 'tremendous-details'" />
+			<MuralpayKycStage v-else-if="currentStage === 'muralpay-kyc'" />
+			<MuralpayDetailsStage v-else-if="currentStage === 'muralpay-details'" />
+			<LegacyPaypalDetailsStage v-else-if="currentStage === 'paypal-details'" />
+			<CompletionStage v-else-if="currentStage === 'completion'" />
+			<div v-else>Something went wrong</div>
+		</div>
+		<template #actions>
+			<div v-if="currentStage === 'completion'" class="mt-4 flex w-full gap-3">
+				<ButtonStyled class="flex-1">
+					<button class="w-full text-contrast" @click="handleClose">
+						{{ formatMessage(messages.closeButton) }}
+					</button>
+				</ButtonStyled>
+				<ButtonStyled class="flex-1">
+					<button class="w-full text-contrast" @click="handleViewTransactions">
+						{{ formatMessage(messages.transactionsButton) }}
+					</button>
+				</ButtonStyled>
+			</div>
+			<div v-else class="mt-4 flex flex-col justify-end gap-2 sm:flex-row">
+				<ButtonStyled type="outlined">
+					<button
+						class="!border-surface-5"
+						:disabled="leftButtonConfig.disabled"
+						@click="leftButtonConfig.handler"
+					>
+						<component :is="leftButtonConfig.icon" />
+						{{ leftButtonConfig.label }}
+					</button>
+				</ButtonStyled>
+				<ButtonStyled :color="rightButtonConfig.color">
+					<button :disabled="rightButtonConfig.disabled" @click="rightButtonConfig.handler">
+						<component
+							:is="rightButtonConfig.icon"
+							v-if="rightButtonConfig.iconPosition === 'before'"
+							:class="rightButtonConfig.iconClass"
+						/>
+						{{ rightButtonConfig.label }}
+						<component
+							:is="rightButtonConfig.icon"
+							v-if="rightButtonConfig.iconPosition === 'after'"
+							:class="rightButtonConfig.iconClass"
+						/>
+					</button>
+				</ButtonStyled>
+			</div>
+		</template>
+	</NewModal>
+	<CreatorTaxFormModal
+		ref="taxFormModal"
+		close-button-text="Continue"
+		@success="onTaxFormSuccess"
+		@cancelled="onTaxFormCancelled"
+	/>
+</template>
+
+<script setup lang="ts">
+import {
+	ArrowLeftRightIcon,
+	ChevronRightIcon,
+	FileTextIcon,
+	LeftArrowIcon,
+	RightArrowIcon,
+	SpinnerIcon,
+	XIcon,
+} from '@modrinth/assets'
+import { ButtonStyled, commonMessages, injectNotificationManager, NewModal } from '@modrinth/ui'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { computed, nextTick, onMounted, ref, useTemplateRef, watch } from 'vue'
+
+import {
+	createWithdrawContext,
+	type PayoutMethod,
+	provideWithdrawContext,
+	TAX_THRESHOLD_ACTUAL,
+	type WithdrawStage,
+} from '@/providers/creator-withdraw.ts'
+
+import CreatorTaxFormModal from './CreatorTaxFormModal.vue'
+import CompletionStage from './withdraw-stages/CompletionStage.vue'
+import LegacyPaypalDetailsStage from './withdraw-stages/LegacyPaypalDetailsStage.vue'
+import MethodSelectionStage from './withdraw-stages/MethodSelectionStage.vue'
+import MuralpayDetailsStage from './withdraw-stages/MuralpayDetailsStage.vue'
+import MuralpayKycStage from './withdraw-stages/MuralpayKycStage.vue'
+import TaxFormStage from './withdraw-stages/TaxFormStage.vue'
+import TremendousDetailsStage from './withdraw-stages/TremendousDetailsStage.vue'
+
+type FormCompletionStatus = 'unknown' | 'unrequested' | 'unsigned' | 'tin-mismatch' | 'complete'
+
+interface UserBalanceResponse {
+	available: number
+	withdrawn_lifetime: number
+	withdrawn_ytd: number
+	pending: number
+	dates: Record<string, number>
+	requested_form_type: string | null
+	form_completion_status: FormCompletionStatus | null
+}
+
+const props = defineProps<{
+	balance: UserBalanceResponse | null
+	preloadedPaymentData?: { country: string; methods: PayoutMethod[] } | null
+}>()
+
+const emit = defineEmits<{
+	(e: 'refresh-data' | 'hide'): void
+}>()
+
+const withdrawModal = useTemplateRef<InstanceType<typeof NewModal>>('withdrawModal')
+const taxFormModal = ref<InstanceType<typeof CreatorTaxFormModal> | null>(null)
+const isSubmitting = ref(false)
+
+function show(preferred?: WithdrawStage) {
+	if (preferred) {
+		setStage(preferred, true)
+		withdrawModal.value?.show()
+		return
+	}
+
+	const firstStage = stages.value[0]
+	if (firstStage) {
+		setStage(firstStage, true)
+	}
+
+	withdrawModal.value?.show()
+}
+
+defineExpose({
+	show,
+})
+
+const { formatMessage } = useVIntl()
+const { addNotification } = injectNotificationManager()
+
+const withdrawContext = createWithdrawContext(
+	props.balance,
+	props.preloadedPaymentData || undefined,
+)
+provideWithdrawContext(withdrawContext)
+
+const {
+	currentStage,
+	previousStep,
+	nextStep,
+	canProceed,
+	setStage,
+	withdrawData,
+	resetData,
+	stages,
+	submitWithdrawal,
+	restoreStateFromStorage,
+	clearSavedState,
+} = withdrawContext
+
+watch(
+	() => props.balance,
+	(newBalance) => {
+		if (newBalance) {
+			withdrawContext.balance.value = newBalance
+		}
+	},
+	{ deep: true },
+)
+
+onMounted(() => {
+	const route = useRoute()
+	const router = useRouter()
+
+	if (route.query.paypal_auth_return === 'true') {
+		const savedState = restoreStateFromStorage()
+
+		if (savedState?.data) {
+			withdrawData.value = { ...savedState.data }
+
+			nextTick(() => {
+				show(savedState.stage)
+			})
+
+			clearSavedState()
+		}
+
+		const query = { ...route.query }
+		delete query.paypal_auth_return
+		router.replace({ query })
+	}
+})
+
+const needsTaxForm = computed(() => {
+	if (!props.balance || currentStage.value !== 'tax-form') return false
+	const ytd = props.balance.withdrawn_ytd ?? 0
+	const available = props.balance.available ?? 0
+	const status = props.balance.form_completion_status
+	return status !== 'complete' && ytd + available >= 600
+})
+
+const remainingLimit = computed(() => {
+	if (!props.balance) return 0
+	const ytd = props.balance.withdrawn_ytd ?? 0
+	const raw = TAX_THRESHOLD_ACTUAL - ytd
+	if (raw <= 0) return 0
+	const cents = Math.floor(raw * 100)
+	return cents / 100
+})
+
+const leftButtonConfig = computed(() => {
+	if (previousStep.value) {
+		return {
+			icon: LeftArrowIcon,
+			label: formatMessage(commonMessages.backButton),
+			handler: () => setStage(previousStep.value, true),
+			disabled: isSubmitting.value,
+		}
+	}
+	return {
+		icon: XIcon,
+		label: formatMessage(commonMessages.cancelButton),
+		handler: () => withdrawModal.value?.hide(),
+		disabled: isSubmitting.value,
+	}
+})
+
+const rightButtonConfig = computed(() => {
+	const stage = currentStage.value
+	const isTaxFormStage = stage === 'tax-form'
+	const isDetailsStage =
+		stage === 'muralpay-details' || stage === 'tremendous-details' || stage === 'paypal-details'
+
+	if (isTaxFormStage && needsTaxForm.value && remainingLimit.value > 0) {
+		return {
+			icon: RightArrowIcon,
+			label: formatMessage(messages.continueWithLimit),
+			handler: continueWithLimit,
+			disabled: false,
+			color: 'standard' as const,
+			iconPosition: 'after' as const,
+		}
+	}
+
+	if (isTaxFormStage && needsTaxForm.value) {
+		return {
+			icon: FileTextIcon,
+			label: formatMessage(messages.completeTaxForm),
+			handler: showTaxFormModal,
+			disabled: false,
+			color: 'orange' as const,
+			iconPosition: 'before' as const,
+		}
+	}
+
+	if (isDetailsStage) {
+		return {
+			icon: isSubmitting.value ? SpinnerIcon : ArrowLeftRightIcon,
+			iconClass: isSubmitting.value ? 'animate-spin' : undefined,
+			label: formatMessage(messages.withdrawButton),
+			handler: handleWithdraw,
+			disabled: !canProceed.value || isSubmitting.value,
+			color: 'brand' as const,
+			iconPosition: 'before' as const,
+		}
+	}
+
+	return {
+		icon: RightArrowIcon,
+		label: formatMessage(commonMessages.nextButton),
+		handler: () => setStage(nextStep.value),
+		disabled: !canProceed.value,
+		color: 'standard' as const,
+		iconPosition: 'after' as const,
+	}
+})
+
+function continueWithLimit() {
+	withdrawData.value.tax.skipped = true
+	setStage(nextStep.value)
+}
+
+async function handleWithdraw() {
+	if (isSubmitting.value) return
+
+	try {
+		isSubmitting.value = true
+		await submitWithdrawal()
+		setStage('completion')
+	} catch (error) {
+		console.error('Withdrawal failed:', error)
+
+		if ((error as any)?.data?.description?.toLower?.()?.includes('Tax form')) {
+			addNotification({
+				title: 'Please complete tax form',
+				text: 'You must complete a tax form to submit your withdrawal request.',
+				type: 'error',
+			})
+		} else {
+			addNotification({
+				title: 'Unable to withdraw',
+				text: 'We were unable to submit your withdrawal request, please check your details or contact support.',
+				type: 'error',
+			})
+		}
+	} finally {
+		isSubmitting.value = false
+	}
+}
+
+const shouldShowTitle = computed(() => {
+	return currentStage.value !== 'completion'
+})
+
+const isDetailsStage = computed(() => {
+	const detailsStages: WithdrawStage[] = [
+		'tremendous-details',
+		'muralpay-kyc',
+		'muralpay-details',
+		'paypal-details',
+	]
+	const current = currentStage.value
+	return current ? detailsStages.includes(current) : false
+})
+
+function showTaxFormModal(e?: MouseEvent) {
+	withdrawModal.value?.hide()
+	taxFormModal.value?.startTaxForm(e ?? new MouseEvent('click'))
+}
+
+function onTaxFormSuccess() {
+	emit('refresh-data')
+	nextTick(() => {
+		show('method-selection')
+	})
+}
+
+function onTaxFormCancelled() {
+	show('tax-form')
+}
+
+function onModalHide() {
+	resetData()
+	emit('hide')
+}
+
+function goToBreadcrumbStage(stage: WithdrawStage) {
+	setStage(stage, true)
+}
+
+function handleClose() {
+	withdrawModal.value?.hide()
+	emit('refresh-data')
+}
+
+function handleViewTransactions() {
+	withdrawModal.value?.hide()
+	navigateTo('/dashboard/revenue/transfers')
+}
+
+const messages = defineMessages({
+	taxFormStage: {
+		id: 'dashboard.creator-withdraw-modal.stage.tax-form',
+		defaultMessage: 'Tax form',
+	},
+	methodSelectionStage: {
+		id: 'dashboard.creator-withdraw-modal.stage.method-selection',
+		defaultMessage: 'Method',
+	},
+	tremendousDetailsStage: {
+		id: 'dashboard.creator-withdraw-modal.stage.tremendous-details',
+		defaultMessage: 'Details',
+	},
+	muralpayKycStage: {
+		id: 'dashboard.creator-withdraw-modal.stage.muralpay-kyc',
+		defaultMessage: 'Verification',
+	},
+	muralpayDetailsStage: {
+		id: 'dashboard.creator-withdraw-modal.stage.muralpay-details',
+		defaultMessage: 'Account Details',
+	},
+	completionStage: {
+		id: 'dashboard.creator-withdraw-modal.stage.completion',
+		defaultMessage: 'Complete',
+	},
+	detailsLabel: {
+		id: 'dashboard.creator-withdraw-modal.details-label',
+		defaultMessage: 'Details',
+	},
+	completeTaxForm: {
+		id: 'dashboard.creator-withdraw-modal.complete-tax-form',
+		defaultMessage: 'Complete tax form',
+	},
+	continueWithLimit: {
+		id: 'dashboard.creator-withdraw-modal.continue-with-limit',
+		defaultMessage: 'Continue with limit',
+	},
+	withdrawButton: {
+		id: 'dashboard.creator-withdraw-modal.withdraw-button',
+		defaultMessage: 'Withdraw',
+	},
+	closeButton: {
+		id: 'dashboard.withdraw.completion.close-button',
+		defaultMessage: 'Close',
+	},
+	transactionsButton: {
+		id: 'dashboard.withdraw.completion.transactions-button',
+		defaultMessage: 'Transactions',
+	},
+})
+</script>
diff --git a/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue b/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue
new file mode 100644
index 00000000..6521bac4
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue
@@ -0,0 +1,149 @@
+<template>
+	<div class="flex flex-col gap-2">
+		<div class="flex items-center gap-2">
+			<div class="relative flex-1">
+				<input
+					ref="amountInput"
+					:value="modelValue"
+					type="number"
+					step="0.01"
+					:min="minAmount"
+					:max="maxAmount"
+					:placeholder="formatMessage(formFieldPlaceholders.amountPlaceholder)"
+					class="w-full rounded-[14px] bg-surface-4 py-2.5 pl-4 pr-4 text-contrast placeholder:text-secondary"
+					@input="handleInput"
+				/>
+			</div>
+			<Combobox
+				v-if="showCurrencySelector"
+				:model-value="selectedCurrency"
+				:options="currencyOptions"
+				class="w-min"
+				@update:model-value="$emit('update:selectedCurrency', $event)"
+			>
+				<template v-for="option in currencyOptions" :key="option.value" #[`option-${option.value}`]>
+					<span class="font-semibold leading-tight">{{ option.label }}</span>
+				</template>
+			</Combobox>
+			<ButtonStyled>
+				<button class="px-4 py-2" @click="setMaxAmount">
+					{{ formatMessage(commonMessages.maxButton) }}
+				</button>
+			</ButtonStyled>
+		</div>
+		<div>
+			<span class="my-1 mt-0 text-secondary">{{ formatMoney(maxAmount) }} available.</span>
+			<Transition name="fade">
+				<span v-if="isBelowMinimum" class="text-red">
+					Amount must be at least {{ formatMoney(minAmount) }}.
+				</span>
+			</Transition>
+			<Transition name="fade">
+				<span v-if="isAboveMaximum" class="text-red">
+					Amount cannot exceed {{ formatMoney(maxAmount) }}.
+				</span>
+			</Transition>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { ButtonStyled, Combobox, commonMessages, formFieldPlaceholders } from '@modrinth/ui'
+import { formatMoney } from '@modrinth/utils'
+import { useVIntl } from '@vintl/vintl'
+import { computed, nextTick, ref, watch } from 'vue'
+
+const props = withDefaults(
+	defineProps<{
+		modelValue: number | undefined
+		maxAmount: number
+		minAmount?: number
+		showCurrencySelector?: boolean
+		selectedCurrency?: string
+		currencyOptions?: Array<{ value: string; label: string }>
+	}>(),
+	{
+		minAmount: 0.01,
+		showCurrencySelector: false,
+		currencyOptions: () => [],
+	},
+)
+
+const emit = defineEmits<{
+	'update:modelValue': [value: number | undefined]
+	'update:selectedCurrency': [value: string]
+}>()
+
+const { formatMessage } = useVIntl()
+const amountInput = ref<HTMLInputElement | null>(null)
+
+const isBelowMinimum = computed(() => {
+	return (
+		props.modelValue !== undefined && props.modelValue > 0 && props.modelValue < props.minAmount
+	)
+})
+
+const isAboveMaximum = computed(() => {
+	return props.modelValue !== undefined && props.modelValue > props.maxAmount
+})
+
+async function setMaxAmount() {
+	const maxValue = props.maxAmount
+	emit('update:modelValue', maxValue)
+
+	await nextTick()
+	if (amountInput.value) {
+		amountInput.value.value = maxValue.toFixed(2)
+	}
+}
+
+function handleInput(event: Event) {
+	const input = event.target as HTMLInputElement
+	const value = input.value
+
+	if (value && value.includes('.')) {
+		const parts = value.split('.')
+		if (parts[1] && parts[1].length > 2) {
+			const rounded = Math.floor(parseFloat(value) * 100) / 100
+			emit('update:modelValue', rounded)
+			input.value = rounded.toString()
+			return
+		}
+	}
+
+	const numValue = value === '' ? undefined : parseFloat(value)
+	emit('update:modelValue', numValue)
+}
+
+watch(
+	() => props.modelValue,
+	async (newAmount) => {
+		if (newAmount !== undefined && newAmount !== null) {
+			if (newAmount > props.maxAmount) {
+				emit('update:modelValue', props.maxAmount)
+				await nextTick()
+				if (amountInput.value) {
+					amountInput.value.value = props.maxAmount.toFixed(2)
+				}
+			} else if (newAmount < 0) {
+				emit('update:modelValue', 0)
+			}
+		}
+	},
+)
+</script>
+
+<style scoped>
+.fade-enter-active {
+	transition: opacity 200ms ease-out;
+}
+
+.fade-leave-active {
+	transition: opacity 150ms ease-in;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+	opacity: 0;
+}
+</style>
diff --git a/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue b/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
new file mode 100644
index 00000000..83313f39
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
@@ -0,0 +1,124 @@
+<template>
+	<div class="flex flex-row gap-2 md:gap-3">
+		<div
+			class="flex h-10 min-h-10 w-10 min-w-10 justify-center rounded-full border-[1px] border-solid border-button-bg bg-bg-raised !p-0 shadow-md md:h-12 md:min-h-12 md:w-12 md:min-w-12"
+		>
+			<ArrowDownIcon v-if="isIncome" class="my-auto size-6 text-secondary md:size-8" />
+			<ArrowUpIcon v-else class="my-auto size-6 text-secondary md:size-8" />
+		</div>
+		<div class="flex w-full flex-row justify-between">
+			<div class="flex flex-col">
+				<span class="text-base font-semibold text-contrast md:text-lg">{{
+					isIncome
+						? formatPayoutSource(transaction.payout_source)
+						: formatMethodName(transaction.method_type || transaction.method)
+				}}</span>
+				<span class="text-xs text-secondary md:text-sm">
+					<template v-if="!isIncome">
+						<span
+							:class="[
+								transaction.status === 'cancelling' || transaction.status === 'cancelled'
+									? 'text-red'
+									: '',
+							]"
+							>{{ formatTransactionStatus(transaction.status) }} <BulletDivider
+						/></span>
+					</template>
+					{{ $dayjs(transaction.created).format('MMM DD YYYY') }}
+					<template v-if="!isIncome && transaction.fee">
+						<BulletDivider /> Fee {{ formatMoney(transaction.fee) }}
+					</template>
+				</span>
+			</div>
+			<div class="my-auto flex flex-row items-center gap-2">
+				<span
+					class="text-base font-semibold md:text-lg"
+					:class="isIncome ? 'text-green' : 'text-contrast'"
+					>{{ formatMoney(transaction.amount) }}</span
+				>
+				<template v-if="!isIncome && transaction.status === 'in-transit'">
+					<Tooltip theme="dismissable-prompt" :triggers="['hover', 'focus']" no-auto-focus>
+						<span class="my-auto align-middle"
+							><ButtonStyled circular size="small">
+								<button class="align-middle" @click="cancelPayout">
+									<XIcon />
+								</button> </ButtonStyled
+						></span>
+						<template #popper>
+							<div class="font-semibold text-contrast">Cancel transaction</div>
+						</template>
+					</Tooltip>
+				</template>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import { ArrowDownIcon, ArrowUpIcon, XIcon } from '@modrinth/assets'
+import { BulletDivider, ButtonStyled, injectNotificationManager } from '@modrinth/ui'
+import { capitalizeString, formatMoney } from '@modrinth/utils'
+import { Tooltip } from 'floating-vue'
+
+const props = defineProps({
+	transaction: {
+		type: Object,
+		required: true,
+	},
+})
+
+const emit = defineEmits(['cancelled'])
+
+const { addNotification } = injectNotificationManager()
+const auth = await useAuth()
+
+const isIncome = computed(() => props.transaction.type === 'payout_available')
+
+function formatTransactionStatus(status) {
+	if (status === 'in-transit') return 'In Transit'
+	return capitalizeString(status)
+}
+
+function formatMethodName(method) {
+	if (!method) return 'Unknown'
+	switch (method) {
+		case 'paypal':
+			return 'PayPal'
+		case 'venmo':
+			return 'Venmo'
+		case 'tremendous':
+			return 'Tremendous'
+		case 'muralpay':
+			return 'Muralpay'
+		default:
+			return capitalizeString(method)
+	}
+}
+
+function formatPayoutSource(source) {
+	if (!source) return 'Income'
+	return source
+		.split('_')
+		.map((word) => capitalizeString(word))
+		.join(' ')
+}
+
+async function cancelPayout() {
+	startLoading()
+	try {
+		await useBaseFetch(`payout/${props.transaction.id}`, {
+			method: 'DELETE',
+			apiVersion: 3,
+		})
+		await useAuth(auth.value.token)
+		emit('cancelled')
+	} catch (err) {
+		addNotification({
+			title: 'Failed to cancel transaction',
+			text: err.data ? err.data.description : err,
+			type: 'error',
+		})
+	}
+	stopLoading()
+}
+</script>
diff --git a/apps/frontend/src/components/ui/dashboard/WithdrawFeeBreakdown.vue b/apps/frontend/src/components/ui/dashboard/WithdrawFeeBreakdown.vue
new file mode 100644
index 00000000..ed58bfbe
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/WithdrawFeeBreakdown.vue
@@ -0,0 +1,119 @@
+<template>
+	<Transition
+		enter-active-class="transition-all duration-300 ease-out"
+		enter-from-class="opacity-0 max-h-0"
+		enter-to-class="opacity-100 max-h-40"
+		leave-active-class="transition-all duration-200 ease-in"
+		leave-from-class="opacity-100 max-h-40"
+		leave-to-class="opacity-0 max-h-0"
+	>
+		<div v-if="amount > 0" class="flex flex-col gap-2.5 rounded-[20px] bg-surface-2 p-4">
+			<div class="flex items-center justify-between">
+				<span class="text-primary">{{ formatMessage(messages.feeBreakdownAmount) }}</span>
+				<span class="font-semibold text-contrast">{{ formatMoney(amount || 0) }}</span>
+			</div>
+			<div class="flex items-center justify-between">
+				<span class="text-primary">{{ formatMessage(messages.feeBreakdownFee) }}</span>
+				<span class="h-4 font-semibold text-contrast">
+					<template v-if="feeLoading">
+						<LoaderCircleIcon class="size-5 animate-spin !text-secondary" />
+					</template>
+					<template v-else>-{{ formatMoney(fee || 0) }}</template>
+				</span>
+			</div>
+			<div class="h-px bg-surface-5" />
+			<div class="flex items-center justify-between">
+				<span class="text-primary">{{ formatMessage(messages.feeBreakdownNetAmount) }}</span>
+				<span class="font-semibold text-contrast">
+					{{ formatMoney(netAmount) }}
+					<template v-if="shouldShowExchangeRate">
+						<span> ({{ formattedLocalCurrency }})</span>
+					</template>
+				</span>
+			</div>
+			<template v-if="shouldShowExchangeRate">
+				<div class="flex items-center justify-between text-sm">
+					<span class="text-primary">{{ formatMessage(messages.feeBreakdownExchangeRate) }}</span>
+					<span class="text-secondary"
+						>1 USD = {{ exchangeRate?.toFixed(4) }} {{ localCurrency }}</span
+					>
+				</div>
+			</template>
+		</div>
+	</Transition>
+</template>
+
+<script setup lang="ts">
+import { LoaderCircleIcon } from '@modrinth/assets'
+import { formatMoney } from '@modrinth/utils'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { computed } from 'vue'
+
+const props = withDefaults(
+	defineProps<{
+		amount: number
+		fee: number | null
+		feeLoading: boolean
+		exchangeRate?: number | null
+		localCurrency?: string
+	}>(),
+	{
+		exchangeRate: null,
+		localCurrency: undefined,
+	},
+)
+
+const { formatMessage } = useVIntl()
+
+const netAmount = computed(() => {
+	const amount = props.amount || 0
+	const fee = props.fee || 0
+	return Math.max(0, amount - fee)
+})
+
+const shouldShowExchangeRate = computed(() => {
+	if (!props.localCurrency) return false
+	if (props.localCurrency === 'USD') return false
+	return props.exchangeRate !== null && props.exchangeRate !== undefined && props.exchangeRate > 0
+})
+
+const netAmountInLocalCurrency = computed(() => {
+	if (!shouldShowExchangeRate.value) return null
+	return netAmount.value * (props.exchangeRate || 0)
+})
+
+const formattedLocalCurrency = computed(() => {
+	if (!shouldShowExchangeRate.value || !netAmountInLocalCurrency.value || !props.localCurrency)
+		return ''
+
+	try {
+		return new Intl.NumberFormat('en-US', {
+			style: 'currency',
+			currency: props.localCurrency,
+			minimumFractionDigits: 2,
+			maximumFractionDigits: 2,
+		}).format(netAmountInLocalCurrency.value)
+	} catch {
+		return `${props.localCurrency} ${netAmountInLocalCurrency.value.toFixed(2)}`
+	}
+})
+
+const messages = defineMessages({
+	feeBreakdownAmount: {
+		id: 'dashboard.creator-withdraw-modal.fee-breakdown-amount',
+		defaultMessage: 'Amount',
+	},
+	feeBreakdownFee: {
+		id: 'dashboard.creator-withdraw-modal.fee-breakdown-fee',
+		defaultMessage: 'Fee',
+	},
+	feeBreakdownNetAmount: {
+		id: 'dashboard.creator-withdraw-modal.fee-breakdown-net-amount',
+		defaultMessage: 'Net amount',
+	},
+	feeBreakdownExchangeRate: {
+		id: 'dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate',
+		defaultMessage: 'FX rate',
+	},
+})
+</script>
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue
new file mode 100644
index 00000000..32f0b6c1
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue
@@ -0,0 +1,301 @@
+<template>
+	<div class="flex flex-col items-center gap-4">
+		<div class="flex w-full items-center justify-center gap-2.5">
+			<span class="text-xl font-semibold text-contrast sm:text-2xl">
+				{{ formatMessage(messages.title) }}
+			</span>
+		</div>
+		<div class="flex w-full flex-col gap-3">
+			<div class="span-4 flex w-full flex-col gap-2.5 rounded-2xl bg-surface-2 p-4">
+				<div
+					class="flex w-full flex-col gap-1 sm:flex-row sm:items-center sm:justify-between sm:gap-0"
+				>
+					<span class="text-sm font-normal text-primary sm:text-[1rem]">
+						{{ formatMessage(messages.method) }}
+					</span>
+					<span class="break-words text-sm font-semibold text-contrast sm:text-[1rem]">
+						{{ result?.methodType || 'N/A' }}
+					</span>
+				</div>
+				<div
+					class="flex w-full flex-col gap-1 sm:flex-row sm:items-center sm:justify-between sm:gap-0"
+				>
+					<span class="text-sm font-normal text-primary sm:text-[1rem]">
+						{{ formatMessage(messages.recipient) }}
+					</span>
+					<span class="break-words text-sm font-semibold text-contrast sm:text-[1rem]">
+						{{ result?.recipientDisplay || 'N/A' }}
+					</span>
+				</div>
+				<div
+					v-if="destinationLabel && destinationValue"
+					class="flex w-full flex-col gap-1 sm:flex-row sm:items-center sm:justify-between sm:gap-0"
+				>
+					<span class="text-sm font-normal text-primary sm:text-[1rem]">
+						{{ destinationLabel }}
+					</span>
+					<span class="break-words font-mono text-sm font-semibold text-contrast sm:text-[1rem]">
+						{{ destinationValue }}
+					</span>
+				</div>
+				<div
+					class="flex w-full flex-col gap-1 sm:flex-row sm:items-center sm:justify-between sm:gap-0"
+				>
+					<span class="text-sm font-normal text-primary sm:text-[1rem]">
+						{{ formatMessage(messages.date) }}
+					</span>
+					<span class="break-words text-sm font-semibold text-contrast sm:text-[1rem]">
+						{{ formattedDate }}
+					</span>
+				</div>
+				<div
+					class="flex w-full flex-col gap-1 sm:flex-row sm:items-center sm:justify-between sm:gap-0"
+				>
+					<span class="text-sm font-normal text-primary sm:text-[1rem]">
+						{{ formatMessage(messages.amount) }}
+					</span>
+					<span class="break-words text-sm font-semibold text-contrast sm:text-[1rem]">
+						{{ formatMoney(result?.amount || 0) }}
+					</span>
+				</div>
+				<div
+					class="flex w-full flex-col gap-1 sm:flex-row sm:items-center sm:justify-between sm:gap-0"
+				>
+					<span class="text-sm font-normal text-primary sm:text-[1rem]">
+						{{ formatMessage(messages.fee) }}
+					</span>
+					<span class="break-words text-sm font-semibold text-contrast sm:text-[1rem]">
+						{{ formatMoney(result?.fee || 0) }}
+					</span>
+				</div>
+				<div class="border-b-1 h-0 w-full rounded-full border-b border-solid border-divider" />
+				<div
+					class="flex w-full flex-col gap-1 sm:flex-row sm:items-center sm:justify-between sm:gap-0"
+				>
+					<span class="text-sm font-normal text-primary sm:text-[1rem]">
+						{{ formatMessage(messages.netAmount) }}
+					</span>
+					<span class="break-words text-sm font-semibold text-contrast sm:text-[1rem]">
+						{{ formatMoney(result?.netAmount || 0) }}
+						<template v-if="shouldShowExchangeRate">
+							<span> ({{ formattedLocalCurrency }})</span>
+						</template>
+					</span>
+				</div>
+				<template v-if="shouldShowExchangeRate">
+					<div
+						class="flex w-full flex-col gap-1 sm:flex-row sm:items-center sm:justify-between sm:gap-0"
+					>
+						<span class="text-sm font-normal text-primary sm:text-[1rem]">
+							{{ formatMessage(messages.exchangeRate) }}
+						</span>
+						<span class="break-words text-sm font-normal text-secondary sm:text-[1rem]">
+							1 USD = {{ withdrawData.calculation.exchangeRate?.toFixed(4) }}
+							{{ localCurrency }}
+						</span>
+					</div>
+				</template>
+			</div>
+			<span
+				v-if="withdrawData.providerData.type === 'tremendous'"
+				class="w-full break-words text-center text-sm font-normal text-primary sm:text-[1rem]"
+			>
+				<IntlFormatted
+					:message-id="messages.emailConfirmation"
+					:values="{ email: withdrawData.result?.recipientDisplay }"
+				>
+					<template #b="{ children }">
+						<strong>
+							<component :is="() => normalizeChildren(children)" />
+						</strong>
+					</template>
+				</IntlFormatted>
+			</span>
+		</div>
+		<Teleport to="body">
+			<div
+				v-if="showConfetti"
+				class="pointer-events-none fixed inset-0 z-[9999] flex items-center justify-center"
+			>
+				<ConfettiExplosion />
+			</div>
+		</Teleport>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { formatMoney } from '@modrinth/utils'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { IntlFormatted } from '@vintl/vintl/components'
+import dayjs from 'dayjs'
+import { computed, onMounted, ref } from 'vue'
+import ConfettiExplosion from 'vue-confetti-explosion'
+
+import { type TremendousProviderData, useWithdrawContext } from '@/providers/creator-withdraw.ts'
+import { getRailConfig } from '@/utils/muralpay-rails'
+import { normalizeChildren } from '@/utils/vue-children.ts'
+
+const { withdrawData } = useWithdrawContext()
+const { formatMessage } = useVIntl()
+
+const result = computed(() => withdrawData.value.result)
+
+const showConfetti = ref(false)
+
+onMounted(() => {
+	showConfetti.value = true
+	setTimeout(() => {
+		showConfetti.value = false
+	}, 5000)
+})
+
+const formattedDate = computed(() => {
+	if (!result.value?.created) return 'N/A'
+	return dayjs(result.value.created).format('MMMM D, YYYY')
+})
+
+const selectedRail = computed(() => {
+	const railId = withdrawData.value.selection.method
+	return railId ? getRailConfig(railId) : null
+})
+
+const localCurrency = computed(() => {
+	// Check if it's Tremendous withdrawal with currency
+	if (withdrawData.value.providerData.type === 'tremendous') {
+		return (withdrawData.value.providerData as TremendousProviderData).currency
+	}
+
+	// Fall back to MuralPay rail currency
+	return selectedRail.value?.currency
+})
+
+const shouldShowExchangeRate = computed(() => {
+	if (!localCurrency.value) return false
+	if (localCurrency.value === 'USD') return false
+	const exchangeRate = withdrawData.value.calculation.exchangeRate
+	return exchangeRate !== null && exchangeRate !== undefined && exchangeRate > 0
+})
+
+const netAmountInLocalCurrency = computed(() => {
+	if (!shouldShowExchangeRate.value) return null
+	const netAmount = result.value?.netAmount || 0
+	const exchangeRate = withdrawData.value.calculation.exchangeRate || 0
+	return netAmount * exchangeRate
+})
+
+const formattedLocalCurrency = computed(() => {
+	if (!shouldShowExchangeRate.value || !netAmountInLocalCurrency.value || !localCurrency.value)
+		return ''
+
+	try {
+		return new Intl.NumberFormat('en-US', {
+			style: 'currency',
+			currency: localCurrency.value,
+			minimumFractionDigits: 2,
+			maximumFractionDigits: 2,
+		}).format(netAmountInLocalCurrency.value)
+	} catch {
+		return `${localCurrency.value} ${netAmountInLocalCurrency.value.toFixed(2)}`
+	}
+})
+
+const isMuralPayWithdrawal = computed(() => {
+	return withdrawData.value.providerData.type === 'muralpay'
+})
+
+const destinationLabel = computed(() => {
+	if (!isMuralPayWithdrawal.value) return null
+
+	const rail = selectedRail.value
+	if (!rail) return null
+
+	if (rail.type === 'crypto') {
+		return formatMessage(messages.wallet)
+	} else if (rail.type === 'fiat') {
+		return formatMessage(messages.account)
+	}
+	return null
+})
+
+const destinationValue = computed(() => {
+	if (!isMuralPayWithdrawal.value || withdrawData.value.providerData.type !== 'muralpay') {
+		return null
+	}
+
+	const accountDetails = withdrawData.value.providerData.accountDetails
+	const rail = selectedRail.value
+
+	if (rail?.type === 'crypto' && accountDetails.walletAddress) {
+		const addr = accountDetails.walletAddress
+		if (addr.length > 10) {
+			return `${addr.slice(0, 6)}...${addr.slice(-4)}`
+		}
+		return addr
+	} else if (rail?.type === 'fiat' && accountDetails.bankAccountNumber) {
+		const accountType = accountDetails.accountType || 'Account'
+		const last4 = accountDetails.bankAccountNumber.slice(-4)
+
+		const formattedType = accountType.charAt(0) + accountType.slice(1).toLowerCase()
+
+		return `${formattedType} (${last4})`
+	}
+
+	return null
+})
+
+const messages = defineMessages({
+	title: {
+		id: 'dashboard.withdraw.completion.title',
+		defaultMessage: 'Withdraw complete',
+	},
+	method: {
+		id: 'dashboard.withdraw.completion.method',
+		defaultMessage: 'Method',
+	},
+	recipient: {
+		id: 'dashboard.withdraw.completion.recipient',
+		defaultMessage: 'Recipient',
+	},
+	wallet: {
+		id: 'dashboard.withdraw.completion.wallet',
+		defaultMessage: 'Wallet',
+	},
+	account: {
+		id: 'dashboard.withdraw.completion.account',
+		defaultMessage: 'Account',
+	},
+	date: {
+		id: 'dashboard.withdraw.completion.date',
+		defaultMessage: 'Date',
+	},
+	amount: {
+		id: 'dashboard.withdraw.completion.amount',
+		defaultMessage: 'Amount',
+	},
+	fee: {
+		id: 'dashboard.withdraw.completion.fee',
+		defaultMessage: 'Fee',
+	},
+	netAmount: {
+		id: 'dashboard.withdraw.completion.net-amount',
+		defaultMessage: 'Net amount',
+	},
+	exchangeRate: {
+		id: 'dashboard.withdraw.completion.exchange-rate',
+		defaultMessage: 'Exchange rate',
+	},
+	emailConfirmation: {
+		id: 'dashboard.withdraw.completion.email-confirmation',
+		defaultMessage:
+			"You'll receive an email at <b>{email}</b> with instructions to redeem your withdrawal.",
+	},
+	closeButton: {
+		id: 'dashboard.withdraw.completion.close-button',
+		defaultMessage: 'Close',
+	},
+	transactionsButton: {
+		id: 'dashboard.withdraw.completion.transactions-button',
+		defaultMessage: 'Transactions',
+	},
+})
+</script>
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue
new file mode 100644
index 00000000..5f4d3838
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue
@@ -0,0 +1,351 @@
+<template>
+	<div class="flex flex-col gap-4 sm:gap-5">
+		<div v-if="isPayPal" class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast"
+					>{{ formatMessage(messages.paypalAccount) }} <span class="text-red">*</span></span
+				>
+			</label>
+
+			<div class="flex flex-col gap-2">
+				<ButtonStyled v-if="!isPayPalAuthenticated" color="standard">
+					<a :href="paypalAuthUrl" class="w-min" @click="handlePayPalAuth">
+						<PayPalColorIcon class="size-5" />
+						{{ formatMessage(messages.signInWithPaypal) }}
+					</a>
+				</ButtonStyled>
+				<ButtonStyled v-else>
+					<button class="w-min" @click="handleDisconnectPaypal">
+						<XIcon /> {{ formatMessage(messages.disconnectButton) }}
+					</button>
+				</ButtonStyled>
+			</div>
+		</div>
+
+		<div v-if="isPayPal && isPayPalAuthenticated" class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast">{{
+					formatMessage(messages.account)
+				}}</span>
+			</label>
+
+			<div class="flex flex-col gap-2 rounded-2xl bg-surface-2 px-4 py-2.5">
+				<span>{{ paypalEmail }}</span>
+			</div>
+		</div>
+
+		<div v-if="isVenmo" class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast"
+					>{{ formatMessage(messages.venmoHandle) }} <span class="text-red">*</span></span
+				>
+			</label>
+			<div class="flex flex-row gap-2">
+				<input
+					v-model="venmoHandle"
+					type="text"
+					:placeholder="formatMessage(messages.venmoHandlePlaceholder)"
+					class="w-full rounded-[14px] bg-surface-4 px-4 py-3 text-contrast placeholder:text-secondary sm:py-2.5"
+				/>
+				<ButtonStyled color="brand">
+					<button
+						v-tooltip="!hasVenmoChanged ? 'Change the venmo username to save.' : undefined"
+						:disabled="venmoSaving || !hasVenmoChanged"
+						@click="saveVenmoHandle"
+					>
+						<CheckIcon v-if="venmoSaveSuccess" />
+						<SaveIcon v-else />
+						{{
+							venmoSaveSuccess
+								? formatMessage(messages.savedButton)
+								: formatMessage(messages.saveButton)
+						}}
+					</button>
+				</ButtonStyled>
+			</div>
+			<span v-if="venmoSaveError" class="text-sm font-bold text-red">
+				{{ venmoSaveError }}
+			</span>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast"
+					>{{ formatMessage(formFieldLabels.amount) }} <span class="text-red">*</span></span
+				>
+			</label>
+
+			<RevenueInputField
+				v-model="formData.amount"
+				:max-amount="effectiveMaxAmount"
+				:min-amount="selectedMethodDetails?.interval?.standard?.min || 0.01"
+			/>
+
+			<WithdrawFeeBreakdown
+				:amount="formData.amount || 0"
+				:fee="calculatedFee"
+				:fee-loading="feeLoading"
+			/>
+
+			<Checkbox v-model="agreedTerms">
+				<span>
+					<IntlFormatted :message-id="financialMessages.rewardsProgramTermsAgreement">
+						<template #terms-link="{ children }">
+							<nuxt-link to="/legal/cmp" class="text-link">
+								<component :is="() => normalizeChildren(children)" />
+							</nuxt-link>
+						</template>
+					</IntlFormatted>
+				</span>
+			</Checkbox>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { CheckIcon, PayPalColorIcon, SaveIcon, XIcon } from '@modrinth/assets'
+import { ButtonStyled, Checkbox, financialMessages, formFieldLabels } from '@modrinth/ui'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { IntlFormatted } from '@vintl/vintl/components'
+import { useDebounceFn } from '@vueuse/core'
+import { computed, onMounted, ref, watch } from 'vue'
+
+import RevenueInputField from '@/components/ui/dashboard/RevenueInputField.vue'
+import WithdrawFeeBreakdown from '@/components/ui/dashboard/WithdrawFeeBreakdown.vue'
+import { getAuthUrl, removeAuthProvider, useAuth } from '@/composables/auth.js'
+import { useWithdrawContext } from '@/providers/creator-withdraw.ts'
+import { normalizeChildren } from '@/utils/vue-children.ts'
+
+const { withdrawData, maxWithdrawAmount, availableMethods, calculateFees, saveStateToStorage } =
+	useWithdrawContext()
+const { formatMessage } = useVIntl()
+const auth = await useAuth()
+
+const isPayPal = computed(() => withdrawData.value.selection.provider === 'paypal')
+const isVenmo = computed(() => withdrawData.value.selection.provider === 'venmo')
+
+const selectedMethodDetails = computed(() => {
+	const methodId = withdrawData.value.selection.methodId
+	if (!methodId) return null
+	return availableMethods.value.find((m) => m.id === methodId) || null
+})
+
+const isPayPalAuthenticated = computed(() => {
+	return (auth.value.user as any)?.auth_providers?.includes('paypal') || false
+})
+
+const paypalEmail = computed(() => {
+	return (auth.value.user as any)?.payout_data?.paypal_address || ''
+})
+
+const paypalAuthUrl = computed(() => {
+	const route = useRoute()
+	const separator = route.fullPath.includes('?') ? '&' : '?'
+	const returnUrl = `${route.fullPath}${separator}paypal_auth_return=true`
+	return getAuthUrl('paypal', returnUrl)
+})
+
+function handlePayPalAuth() {
+	saveStateToStorage()
+}
+
+async function handleDisconnectPaypal() {
+	try {
+		await removeAuthProvider('paypal')
+	} catch (error) {
+		console.error('Failed to disconnect PayPal:', error)
+	}
+}
+
+const venmoHandle = ref<string>((auth.value.user as any)?.venmo_handle || '')
+const initialVenmoHandle = ref<string>((auth.value.user as any)?.venmo_handle || '')
+const venmoSaving = ref(false)
+const venmoSaveSuccess = ref(false)
+const venmoSaveError = ref<string | null>(null)
+
+const hasVenmoChanged = computed(() => {
+	return venmoHandle.value.trim() !== initialVenmoHandle.value.trim()
+})
+
+async function saveVenmoHandle() {
+	if (!venmoHandle.value.trim()) {
+		venmoSaveError.value = 'Please enter a Venmo handle'
+		return
+	}
+
+	venmoSaving.value = true
+	venmoSaveError.value = null
+	venmoSaveSuccess.value = false
+
+	try {
+		await useBaseFetch(`user/${(auth.value.user as any)?.id}`, {
+			method: 'PATCH',
+			body: {
+				venmo_handle: venmoHandle.value.trim(),
+			},
+		})
+
+		// @ts-expect-error auth.js is not typed
+		await useAuth(auth.value.token)
+
+		initialVenmoHandle.value = venmoHandle.value.trim()
+		venmoSaveSuccess.value = true
+
+		setTimeout(() => {
+			venmoSaveSuccess.value = false
+		}, 3000)
+	} catch (error) {
+		console.error('Failed to update Venmo handle:', error)
+		venmoSaveError.value = 'Failed to save Venmo handle. Please try again.'
+	} finally {
+		venmoSaving.value = false
+	}
+}
+
+const maxAmount = computed(() => maxWithdrawAmount.value)
+const roundedMaxAmount = computed(() => Math.floor(maxAmount.value * 100) / 100)
+
+const effectiveMaxAmount = computed(() => {
+	const apiMax = selectedMethodDetails.value?.interval?.standard?.max
+	if (apiMax) {
+		return Math.min(roundedMaxAmount.value, apiMax)
+	}
+	return roundedMaxAmount.value
+})
+
+const formData = ref<Record<string, any>>({
+	amount: withdrawData.value.calculation.amount || undefined,
+})
+
+const agreedTerms = computed({
+	get: () => withdrawData.value.agreedTerms,
+	set: (value) => {
+		withdrawData.value.agreedTerms = value
+	},
+})
+
+const isComponentValid = computed(() => {
+	const hasAmount = (formData.value.amount || 0) > 0
+	const hasAgreed = agreedTerms.value
+
+	if (!hasAmount || !hasAgreed) return false
+
+	if (isPayPal.value) {
+		return isPayPalAuthenticated.value
+	} else if (isVenmo.value) {
+		return venmoHandle.value.trim().length > 0
+	}
+
+	return false
+})
+
+const calculatedFee = ref<number>(0)
+const feeLoading = ref(false)
+
+const calculateFeesDebounced = useDebounceFn(async () => {
+	const amount = formData.value.amount
+	if (!amount || amount <= 0) {
+		calculatedFee.value = 0
+		return
+	}
+
+	const methodId = withdrawData.value.selection.methodId
+	if (!methodId) {
+		calculatedFee.value = 0
+		return
+	}
+
+	feeLoading.value = true
+	try {
+		await calculateFees()
+		calculatedFee.value = withdrawData.value.calculation.fee ?? 0
+	} catch (error) {
+		console.error('Failed to calculate fees:', error)
+		calculatedFee.value = 0
+	} finally {
+		feeLoading.value = false
+	}
+}, 500)
+
+watch(
+	() => formData.value.amount,
+	() => {
+		withdrawData.value.calculation.amount = formData.value.amount ?? 0
+
+		if (formData.value.amount) {
+			feeLoading.value = true
+			calculateFeesDebounced()
+		} else {
+			calculatedFee.value = 0
+			feeLoading.value = false
+		}
+	},
+	{ deep: true },
+)
+
+watch(
+	[isComponentValid, venmoHandle, () => formData.value.amount, agreedTerms, isPayPalAuthenticated],
+	() => {
+		withdrawData.value.stageValidation.paypalDetails = isComponentValid.value
+	},
+	{ immediate: true },
+)
+
+onMounted(async () => {
+	if (formData.value.amount) {
+		feeLoading.value = true
+		calculateFeesDebounced()
+	}
+})
+
+const messages = defineMessages({
+	paymentMethod: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.payment-method',
+		defaultMessage: 'Payment method',
+	},
+	paypalAccount: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.paypal-account',
+		defaultMessage: 'PayPal account',
+	},
+	account: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.account',
+		defaultMessage: 'Account',
+	},
+	signInWithPaypal: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal',
+		defaultMessage: 'Sign in with PayPal',
+	},
+	paypalAuthDescription: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description',
+		defaultMessage: 'Connect your PayPal account to receive payments directly.',
+	},
+	venmoHandle: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.venmo-handle',
+		defaultMessage: 'Venmo handle',
+	},
+	venmoHandlePlaceholder: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder',
+		defaultMessage: '@username',
+	},
+	venmoDescription: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.venmo-description',
+		defaultMessage: 'Enter your Venmo handle to receive payments.',
+	},
+	disconnectButton: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.disconnect-account',
+		defaultMessage: 'Disconnect account',
+	},
+	saveButton: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.save-button',
+		defaultMessage: 'Save',
+	},
+	savedButton: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.saved-button',
+		defaultMessage: 'Saved',
+	},
+	saveSuccess: {
+		id: 'dashboard.creator-withdraw-modal.paypal-details.save-success',
+		defaultMessage: 'Venmo handle saved successfully!',
+	},
+})
+</script>
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/MethodSelectionStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MethodSelectionStage.vue
new file mode 100644
index 00000000..27a228cf
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MethodSelectionStage.vue
@@ -0,0 +1,323 @@
+<template>
+	<div class="flex flex-col gap-4">
+		<Admonition v-if="shouldShowTaxLimitWarning" type="warning">
+			<IntlFormatted
+				:message-id="messages.taxLimitWarning"
+				:values="{
+					amount: formatMoney(maxWithdrawAmount),
+				}"
+			>
+				<template #b="{ children }">
+					<span class="font-semibold">
+						<component :is="() => normalizeChildren(children)" />
+					</span>
+				</template>
+				<template #tax-link="{ children }">
+					<span class="cursor-pointer text-link" @click="onShowTaxForm">
+						<component :is="() => normalizeChildren(children)" />
+					</span>
+				</template>
+			</IntlFormatted>
+		</Admonition>
+		<div class="flex flex-col">
+			<div class="flex flex-col gap-2.5">
+				<div class="flex flex-row gap-1 align-middle">
+					<span class="align-middle font-semibold text-contrast">{{
+						formatMessage(messages.region)
+					}}</span>
+					<UnknownIcon
+						v-tooltip="formatMessage(messages.regionTooltip)"
+						class="mt-auto size-5 text-secondary"
+					/>
+				</div>
+				<Combobox
+					:model-value="selectedCountryCode"
+					:options="countries"
+					:placeholder="formatMessage(messages.countryPlaceholder)"
+					searchable
+					:search-placeholder="formatMessage(messages.countrySearchPlaceholder)"
+					:max-height="240"
+					class="h-12"
+					@update:model-value="handleCountryChange"
+				/>
+			</div>
+			<div class="flex flex-col gap-2.5">
+				<div class="flex flex-row gap-1 align-middle">
+					<span class="align-middle font-semibold text-contrast">{{
+						formatMessage(messages.selectMethod)
+					}}</span>
+				</div>
+				<div v-if="loading" class="flex min-h-[120px] items-center justify-center">
+					<SpinnerIcon class="size-8 animate-spin text-contrast" />
+				</div>
+				<template v-else>
+					<ButtonStyled
+						v-for="method in paymentOptions"
+						:key="method.value"
+						:color="withdrawData.selection.method === method.value ? 'green' : 'standard'"
+						:highlighted="withdrawData.selection.method === method.value"
+						type="chip"
+					>
+						<button
+							class="!justify-start !gap-2 !text-left sm:!h-10"
+							@click="handleMethodSelection(method)"
+						>
+							<component :is="method.icon" class="shrink-0" />
+							<span class="flex-1 truncate text-sm sm:text-[1rem]">
+								{{ typeof method.label === 'string' ? method.label : formatMessage(method.label) }}
+							</span>
+							<span class="ml-auto shrink-0 text-xs font-normal text-secondary sm:text-sm">{{
+								method.fee
+							}}</span>
+						</button>
+					</ButtonStyled>
+				</template>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { SpinnerIcon, UnknownIcon } from '@modrinth/assets'
+import {
+	Admonition,
+	ButtonStyled,
+	Combobox,
+	injectNotificationManager,
+	useDebugLogger,
+} from '@modrinth/ui'
+import { formatMoney } from '@modrinth/utils'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { IntlFormatted } from '@vintl/vintl/components'
+import { useGeolocation } from '@vueuse/core'
+
+import { useCountries, useFormattedCountries, useUserCountry } from '@/composables/country.ts'
+import { type PayoutMethod, useWithdrawContext } from '@/providers/creator-withdraw.ts'
+import { normalizeChildren } from '@/utils/vue-children.ts'
+
+const debug = useDebugLogger('MethodSelectionStage')
+const {
+	withdrawData,
+	availableMethods,
+	paymentOptions,
+	balance,
+	maxWithdrawAmount,
+	paymentMethodsCache,
+} = useWithdrawContext()
+const userCountry = useUserCountry()
+const allCountries = useCountries()
+const { coords } = useGeolocation()
+const { formatMessage } = useVIntl()
+const { addNotification } = injectNotificationManager()
+const auth = await useAuth()
+
+const messages = defineMessages({
+	taxLimitWarning: {
+		id: 'dashboard.creator-withdraw-modal.method-selection.tax-limit-warning',
+		defaultMessage:
+			'Your withdraw limit is <b>{amount}</b>, <tax-link>complete a tax form</tax-link> to withdraw more.',
+	},
+	region: {
+		id: 'dashboard.creator-withdraw-modal.method-selection.region',
+		defaultMessage: 'Region',
+	},
+	regionTooltip: {
+		id: 'dashboard.creator-withdraw-modal.method-selection.region-tooltip',
+		defaultMessage: 'Some payout methods are not available in certain regions.',
+	},
+	countryPlaceholder: {
+		id: 'dashboard.creator-withdraw-modal.method-selection.country-placeholder',
+		defaultMessage: 'Select your country',
+	},
+	countrySearchPlaceholder: {
+		id: 'dashboard.creator-withdraw-modal.method-selection.country-search-placeholder',
+		defaultMessage: 'Search countries...',
+	},
+	selectMethod: {
+		id: 'dashboard.creator-withdraw-modal.method-selection.select-method',
+		defaultMessage: 'Select withdraw method',
+	},
+	errorTitle: {
+		id: 'dashboard.creator-withdraw-modal.method-selection.error-title',
+		defaultMessage: 'Failed to load payment methods',
+	},
+	errorText: {
+		id: 'dashboard.creator-withdraw-modal.method-selection.error-text',
+		defaultMessage: 'Unable to fetch available payment methods. Please try again later.',
+	},
+})
+
+defineProps<{
+	onShowTaxForm: () => void
+}>()
+
+const emit = defineEmits<{
+	(e: 'close-modal'): void
+}>()
+
+const countries = useFormattedCountries()
+
+const selectedCountryCode = computed(() => withdrawData.value.selection.country?.id)
+
+const shouldShowTaxLimitWarning = computed(() => {
+	const balanceValue = balance.value
+	if (!balanceValue) return false
+
+	const formIncomplete = balanceValue.form_completion_status !== 'complete'
+	const wouldHitLimit = (balanceValue.withdrawn_ytd ?? 0) + (balanceValue.available ?? 0) >= 600
+
+	return formIncomplete && wouldHitLimit
+})
+
+const loading = ref(false)
+
+watch(
+	() => withdrawData.value.selection.country,
+	async (country) => {
+		debug('Watch triggered, country:', country)
+		if (!country) {
+			availableMethods.value = []
+			return
+		}
+
+		if (paymentMethodsCache.value[country.id]) {
+			debug('Using cached methods for', country.id)
+			availableMethods.value = paymentMethodsCache.value[country.id]
+			return
+		}
+
+		loading.value = true
+		debug('Fetching payout methods for country:', country.id)
+
+		try {
+			const methods = (await useBaseFetch('payout/methods', {
+				apiVersion: 3,
+				query: { country: country.id },
+			})) as PayoutMethod[]
+			debug('Received payout methods:', methods)
+
+			paymentMethodsCache.value[country.id] = methods
+			availableMethods.value = methods
+		} catch (e) {
+			console.error('[MethodSelectionStage] Failed to fetch payout methods:', e)
+			addNotification({
+				title: formatMessage(messages.errorTitle),
+				text: formatMessage(messages.errorText),
+				type: 'error',
+			})
+			emit('close-modal')
+		} finally {
+			loading.value = false
+		}
+	},
+	{ immediate: true },
+)
+
+function handleMethodSelection(option: {
+	value: string
+	methodId: string | undefined
+	type: string
+}) {
+	withdrawData.value.selection.method = option.value
+	withdrawData.value.selection.methodId = option.methodId ?? null
+
+	if (option.type === 'tremendous') {
+		withdrawData.value.selection.provider = 'tremendous'
+	} else if (option.type === 'fiat' || option.type === 'crypto') {
+		withdrawData.value.selection.provider = 'muralpay'
+	} else if (option.type === 'paypal') {
+		withdrawData.value.selection.provider = 'paypal'
+	} else if (option.type === 'venmo') {
+		withdrawData.value.selection.provider = 'venmo'
+	} else {
+		withdrawData.value.selection.provider = 'muralpay'
+	}
+}
+
+watch(paymentOptions, (newOptions) => {
+	withdrawData.value.selection.method = null
+	withdrawData.value.selection.methodId = null
+	withdrawData.value.selection.provider = null
+
+	if (newOptions.length === 1) {
+		const option = newOptions[0]
+		handleMethodSelection(option)
+	}
+})
+
+watch(
+	() => withdrawData.value.selection.provider,
+	(newProvider) => {
+		if (newProvider === 'tremendous') {
+			const userEmail = (auth.value.user as any)?.email || ''
+			withdrawData.value.providerData = {
+				type: 'tremendous',
+				deliveryEmail: userEmail,
+				giftCardDetails: null,
+				currency: undefined,
+			}
+		} else if (newProvider === 'muralpay') {
+			withdrawData.value.providerData = {
+				type: 'muralpay',
+				kycData: {} as any,
+				accountDetails: {},
+			}
+		} else if (newProvider === 'paypal' || newProvider === 'venmo') {
+			withdrawData.value.providerData = {
+				type: newProvider,
+			}
+		}
+	},
+)
+
+function handleCountryChange(countryCode: string | null) {
+	debug('handleCountryChange called with:', countryCode)
+	if (countryCode) {
+		const normalizedCode = countryCode.toUpperCase()
+		const country = allCountries.value.find((c) => c.alpha2 === normalizedCode)
+		debug('Found country:', country)
+		if (country) {
+			withdrawData.value.selection.country = {
+				id: country.alpha2,
+				name: country.alpha2 === 'TW' ? 'Taiwan' : country.nameShort,
+			}
+			debug('Set selectedCountry to:', withdrawData.value.selection.country)
+		}
+	} else {
+		withdrawData.value.selection.country = null
+	}
+}
+
+debug('Setup: userCountry.value =', userCountry.value)
+debug('Setup: current selectedCountry =', withdrawData.value.selection.country)
+
+if (!withdrawData.value.selection.country) {
+	const defaultCountryCode = userCountry.value || 'US'
+	debug('Setup: calling handleCountryChange with', defaultCountryCode)
+	handleCountryChange(defaultCountryCode)
+	debug('Setup: selectedCountryCode computed =', selectedCountryCode.value)
+}
+
+async function getCountryFromGeoIP(lat: number, lon: number): Promise<string | null> {
+	try {
+		const response = await fetch(
+			`https://api.bigdatacloud.net/data/reverse-geocode-client?latitude=${lat}&longitude=${lon}&localityLanguage=en`,
+		)
+		const data = await response.json()
+		return data.countryCode || null
+	} catch {
+		return null
+	}
+}
+
+onMounted(async () => {
+	if (withdrawData.value.selection.country?.id === 'US' && !userCountry.value) {
+		if (coords.value.latitude && coords.value.longitude) {
+			const geoCountry = await getCountryFromGeoIP(coords.value.latitude, coords.value.longitude)
+			if (geoCountry) {
+				handleCountryChange(geoCountry)
+			}
+		}
+	}
+})
+</script>
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue
new file mode 100644
index 00000000..9a32f8ef
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue
@@ -0,0 +1,516 @@
+<template>
+	<div class="flex flex-col gap-3 sm:gap-4">
+		<Admonition
+			v-if="selectedRail?.warningMessage"
+			type="warning"
+			:header="formatMessage(messages.cryptoWarningHeader)"
+		>
+			{{ formatMessage(selectedRail.warningMessage) }}
+		</Admonition>
+
+		<div v-if="selectedRail?.type === 'crypto'" class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast">
+					{{ formatMessage(messages.coin) }}
+				</span>
+			</label>
+			<div
+				class="flex min-h-[44px] items-center gap-2 rounded-[14px] bg-surface-2 px-4 py-2.5 sm:min-h-0"
+			>
+				<component
+					:is="getCurrencyIcon(selectedRail.currency)"
+					class="size-5 shrink-0"
+					:class="getCurrencyColor(selectedRail.currency)"
+				/>
+				<span class="text-sm font-semibold text-contrast sm:text-[1rem]">{{
+					selectedRail.currency
+				}}</span>
+			</div>
+		</div>
+
+		<div v-if="selectedRail?.type === 'fiat'" class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast">
+					{{ formatMessage(messages.accountOwner) }}
+				</span>
+			</label>
+			<div class="w-full rounded-[14px] bg-surface-2 p-3 sm:p-4">
+				<div class="flex flex-col gap-1">
+					<span class="break-words text-sm font-semibold text-contrast sm:text-[1rem]">
+						{{ accountOwnerName }}
+					</span>
+					<span class="break-words text-xs text-primary sm:text-sm">
+						{{ accountOwnerAddress }}
+					</span>
+				</div>
+			</div>
+		</div>
+
+		<div v-if="selectedRail?.requiresBankName" class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast">
+					{{ formatMessage(formFieldLabels.bankName) }}
+					<span class="text-red">*</span>
+				</span>
+			</label>
+
+			<Combobox
+				v-if="shouldShowBankNameDropdown"
+				v-model="formData.bankName"
+				:options="bankNameOptions"
+				:searchable="true"
+				:placeholder="formatMessage(formFieldPlaceholders.bankNamePlaceholderDropdown)"
+				class="h-10"
+			/>
+
+			<input
+				v-else
+				v-model="formData.bankName"
+				type="text"
+				:placeholder="formatMessage(formFieldPlaceholders.bankNamePlaceholder)"
+				autocomplete="off"
+				class="w-full rounded-[14px] bg-surface-4 px-4 py-3 text-contrast placeholder:text-secondary sm:py-2.5"
+			/>
+		</div>
+
+		<div v-for="field in selectedRail?.fields" :key="field.name" class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast">
+					{{ formatMessage(field.label) }}
+					<span v-if="field.required" class="text-red">*</span>
+				</span>
+			</label>
+
+			<input
+				v-if="['text', 'email', 'tel'].includes(field.type)"
+				v-model="formData[field.name]"
+				:type="field.type"
+				:placeholder="field.placeholder ? formatMessage(field.placeholder) : undefined"
+				:pattern="field.pattern"
+				:autocomplete="field.autocomplete || 'off'"
+				class="w-full rounded-[14px] bg-surface-4 px-4 py-3 text-contrast placeholder:text-secondary sm:py-2.5"
+			/>
+
+			<Combobox
+				v-else-if="field.type === 'select'"
+				v-model="formData[field.name]"
+				:options="
+					(field.options || []).map((opt) => ({
+						value: opt.value,
+						label: formatMessage(opt.label),
+					}))
+				"
+				:placeholder="field.placeholder ? formatMessage(field.placeholder) : undefined"
+				class="h-10"
+			/>
+
+			<input
+				v-else-if="field.type === 'date'"
+				v-model="formData[field.name]"
+				type="date"
+				class="w-full rounded-[14px] bg-surface-4 px-4 py-2.5 text-contrast placeholder:text-secondary"
+			/>
+
+			<span v-if="field.helpText" class="text-sm text-secondary">
+				{{ formatMessage(field.helpText) }}
+			</span>
+		</div>
+
+		<Transition
+			enter-active-class="transition-all duration-300 ease-out"
+			enter-from-class="opacity-0 max-h-0"
+			enter-to-class="opacity-100 max-h-40"
+			leave-active-class="transition-all duration-200 ease-in"
+			leave-from-class="opacity-100 max-h-40"
+			leave-to-class="opacity-0 max-h-0"
+		>
+			<div v-if="dynamicDocumentNumberField" class="overflow-hidden">
+				<div class="flex flex-col gap-2.5">
+					<label>
+						<span class="text-md font-semibold text-contrast">
+							{{ dynamicDocumentNumberField.label }}
+							<span v-if="dynamicDocumentNumberField.required" class="text-red">*</span>
+						</span>
+					</label>
+					<input
+						v-model="formData.documentNumber"
+						:type="dynamicDocumentNumberField.type"
+						:placeholder="dynamicDocumentNumberField.placeholder"
+						autocomplete="off"
+						class="w-full rounded-[14px] bg-surface-4 px-4 py-3 text-contrast placeholder:text-secondary sm:py-2.5"
+					/>
+				</div>
+			</div>
+		</Transition>
+
+		<div v-if="selectedRail?.blockchain" class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast">
+					{{ formatMessage(messages.network) }}
+				</span>
+			</label>
+			<div
+				class="flex min-h-[44px] items-center gap-2 rounded-[14px] bg-surface-2 px-4 py-2.5 sm:min-h-0"
+			>
+				<component
+					:is="getBlockchainIcon(selectedRail.blockchain)"
+					class="size-5 shrink-0"
+					:class="getBlockchainColor(selectedRail.blockchain)"
+				/>
+				<span class="text-sm font-semibold text-contrast sm:text-[1rem]">{{
+					selectedRail.blockchain
+				}}</span>
+			</div>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast">
+					{{ formatMessage(formFieldLabels.amount) }}
+					<span class="text-red">*</span>
+				</span>
+			</label>
+			<RevenueInputField
+				v-model="formData.amount"
+				:min-amount="effectiveMinAmount"
+				:max-amount="effectiveMaxAmount"
+			/>
+
+			<WithdrawFeeBreakdown
+				v-if="allRequiredFieldsFilled"
+				:amount="formData.amount || 0"
+				:fee="calculatedFee"
+				:fee-loading="feeLoading"
+				:exchange-rate="exchangeRate"
+				:local-currency="selectedRail?.currency"
+			/>
+
+			<Checkbox v-model="agreedTerms">
+				<span
+					><IntlFormatted :message-id="financialMessages.rewardsProgramTermsAgreement">
+						<template #terms-link="{ children }">
+							<nuxt-link to="/legal/cmp" class="text-link">
+								<component :is="() => normalizeChildren(children)" />
+							</nuxt-link>
+						</template> </IntlFormatted
+				></span>
+			</Checkbox>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import {
+	Admonition,
+	Checkbox,
+	Combobox,
+	financialMessages,
+	formFieldLabels,
+	formFieldPlaceholders,
+} from '@modrinth/ui'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { IntlFormatted } from '@vintl/vintl/components'
+import { useDebounceFn } from '@vueuse/core'
+import { computed, ref, watch } from 'vue'
+
+import RevenueInputField from '@/components/ui/dashboard/RevenueInputField.vue'
+import WithdrawFeeBreakdown from '@/components/ui/dashboard/WithdrawFeeBreakdown.vue'
+import { useGeneratedState } from '@/composables/generated'
+import { useWithdrawContext } from '@/providers/creator-withdraw.ts'
+import {
+	getBlockchainColor,
+	getBlockchainIcon,
+	getCurrencyColor,
+	getCurrencyIcon,
+} from '@/utils/finance-icons.ts'
+import { getRailConfig } from '@/utils/muralpay-rails'
+import { normalizeChildren } from '@/utils/vue-children.ts'
+
+const { withdrawData, maxWithdrawAmount, availableMethods, calculateFees } = useWithdrawContext()
+const { formatMessage } = useVIntl()
+const generatedState = useGeneratedState()
+
+const selectedRail = computed(() => {
+	const railId = withdrawData.value.selection.method
+	return railId ? getRailConfig(railId) : null
+})
+
+const selectedMethodDetails = computed(() => {
+	const methodId = withdrawData.value.selection.methodId
+	if (!methodId) return null
+	return availableMethods.value.find((m) => m.id === methodId) || null
+})
+
+const maxAmount = computed(() => maxWithdrawAmount.value)
+const roundedMaxAmount = computed(() => Math.floor(maxAmount.value * 100) / 100)
+
+const effectiveMinAmount = computed(
+	() => selectedMethodDetails.value?.interval?.standard?.min || 0.01,
+)
+const effectiveMaxAmount = computed(() => {
+	const apiMax = selectedMethodDetails.value?.interval?.standard?.max
+	if (apiMax) {
+		return Math.min(roundedMaxAmount.value, apiMax)
+	}
+	return roundedMaxAmount.value
+})
+
+const availableBankNames = computed(() => {
+	const rail = selectedRail.value
+	if (!rail || !rail.railCode) return []
+
+	const bankDetails = generatedState.value.muralBankDetails?.[rail.railCode]
+	return bankDetails?.bankNames || []
+})
+
+const shouldShowBankNameDropdown = computed(() => {
+	return availableBankNames.value.length > 0
+})
+
+const bankNameOptions = computed(() => {
+	return availableBankNames.value.map((name) => ({
+		value: name,
+		label: name,
+	}))
+})
+
+const providerData = withdrawData.value.providerData
+const existingAccountDetails = providerData.type === 'muralpay' ? providerData.accountDetails : {}
+const existingAmount = withdrawData.value.calculation.amount
+const formData = ref<Record<string, any>>({
+	amount: existingAmount || undefined,
+	bankName: existingAccountDetails?.bankName ?? '',
+	...existingAccountDetails,
+})
+
+const agreedTerms = computed({
+	get: () => withdrawData.value.agreedTerms,
+	set: (value) => {
+		withdrawData.value.agreedTerms = value
+	},
+})
+
+const calculatedFee = ref<number | null>(null)
+const exchangeRate = ref<number | null>(null)
+const feeLoading = ref(false)
+
+const hasDocumentTypeField = computed(() => {
+	const rail = selectedRail.value
+	if (!rail) return false
+	return rail.fields.some((field) => field.name === 'documentType')
+})
+
+const dynamicDocumentNumberField = computed(() => {
+	if (!hasDocumentTypeField.value) return null
+
+	const documentType = formData.value.documentType
+	if (!documentType) return null
+
+	const labelMap: Record<string, string> = {
+		NATIONAL_ID: formatMessage(messages.documentNumberNationalId),
+		PASSPORT: formatMessage(messages.documentNumberPassport),
+		RESIDENT_ID: formatMessage(messages.documentNumberResidentId),
+		RUC: formatMessage(messages.documentNumberRuc),
+		TAX_ID: formatMessage(messages.documentNumberTaxId),
+	}
+
+	const placeholderMap: Record<string, string> = {
+		NATIONAL_ID: formatMessage(messages.documentNumberNationalIdPlaceholder),
+		PASSPORT: formatMessage(messages.documentNumberPassportPlaceholder),
+		RESIDENT_ID: formatMessage(messages.documentNumberResidentIdPlaceholder),
+		RUC: formatMessage(messages.documentNumberRucPlaceholder),
+		TAX_ID: formatMessage(messages.documentNumberTaxIdPlaceholder),
+	}
+
+	return {
+		name: 'documentNumber',
+		type: 'text' as const,
+		label: labelMap[documentType] || 'Document Number',
+		placeholder: placeholderMap[documentType] || 'Enter document number',
+		required: true,
+	}
+})
+
+const accountOwnerName = computed(() => {
+	const providerDataValue = withdrawData.value.providerData
+	if (providerDataValue.type !== 'muralpay') return ''
+	const kycData = providerDataValue.kycData
+	if (!kycData) return ''
+
+	if (kycData.type === 'individual') {
+		return `${kycData.firstName} ${kycData.lastName}`
+	} else if (kycData.type === 'business') {
+		return kycData.name
+	}
+	return ''
+})
+
+const accountOwnerAddress = computed(() => {
+	const providerDataValue = withdrawData.value.providerData
+	if (providerDataValue.type !== 'muralpay') return ''
+	const kycData = providerDataValue.kycData
+	if (!kycData || !kycData.physicalAddress) return ''
+
+	const addr = kycData.physicalAddress
+	const parts = [
+		addr.address1,
+		addr.address2,
+		addr.city,
+		addr.state,
+		addr.zip,
+		addr.country,
+	].filter(Boolean)
+
+	return parts.join(', ')
+})
+
+const allRequiredFieldsFilled = computed(() => {
+	const rail = selectedRail.value
+	if (!rail) return false
+
+	const amount = formData.value.amount
+	if (!amount || amount <= 0) return false
+
+	if (rail.requiresBankName && !formData.value.bankName) return false
+
+	const requiredFields = rail.fields.filter((f) => f.required)
+	const allRequiredPresent = requiredFields.every((f) => {
+		const value = formData.value[f.name]
+		return value !== undefined && value !== null && value !== ''
+	})
+
+	if (!allRequiredPresent) return false
+
+	if (dynamicDocumentNumberField.value?.required && !formData.value.documentNumber) return false
+
+	return true
+})
+
+const calculateFeesDebounced = useDebounceFn(async () => {
+	const amount = formData.value.amount
+	const rail = selectedRail.value
+	const providerDataValue = withdrawData.value.providerData
+	const kycData = providerDataValue.type === 'muralpay' ? providerDataValue.kycData : null
+
+	if (!amount || amount <= 0 || !rail || !kycData) {
+		calculatedFee.value = null
+		exchangeRate.value = null
+		return
+	}
+
+	feeLoading.value = true
+	try {
+		await calculateFees()
+		calculatedFee.value = withdrawData.value.calculation.fee
+		exchangeRate.value = withdrawData.value.calculation.exchangeRate
+	} catch (error) {
+		console.error('Failed to calculate fees:', error)
+		calculatedFee.value = 0
+		exchangeRate.value = null
+	} finally {
+		feeLoading.value = false
+	}
+}, 500)
+
+watch(
+	formData,
+	() => {
+		withdrawData.value.calculation.amount = formData.value.amount ?? 0
+		if (withdrawData.value.providerData.type === 'muralpay') {
+			withdrawData.value.providerData.accountDetails = { ...formData.value }
+		}
+
+		if (allRequiredFieldsFilled.value) {
+			feeLoading.value = true
+			calculateFeesDebounced()
+		} else {
+			calculatedFee.value = null
+			exchangeRate.value = null
+			feeLoading.value = false
+		}
+	},
+	{ deep: true },
+)
+
+if (allRequiredFieldsFilled.value) {
+	feeLoading.value = true
+	calculateFeesDebounced()
+}
+
+watch(
+	() => withdrawData.value.selection.method,
+	(newMethod, oldMethod) => {
+		if (oldMethod && newMethod !== oldMethod) {
+			formData.value = {
+				amount: undefined,
+				bankName: '',
+			}
+			if (withdrawData.value.providerData.type === 'muralpay') {
+				withdrawData.value.providerData.accountDetails = {}
+			}
+			withdrawData.value.calculation.amount = 0
+			calculatedFee.value = null
+			exchangeRate.value = null
+		}
+	},
+)
+
+const messages = defineMessages({
+	accountOwner: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.account-owner',
+		defaultMessage: 'Account owner',
+	},
+	cryptoWarningHeader: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header',
+		defaultMessage: 'Confirm your wallet address',
+	},
+	coin: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.coin',
+		defaultMessage: 'Coin',
+	},
+	network: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.network',
+		defaultMessage: 'Network',
+	},
+	documentNumberNationalId: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id',
+		defaultMessage: 'National ID Number',
+	},
+	documentNumberPassport: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-passport',
+		defaultMessage: 'Passport Number',
+	},
+	documentNumberResidentId: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id',
+		defaultMessage: 'Resident ID Number',
+	},
+	documentNumberRuc: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc',
+		defaultMessage: 'RUC Number',
+	},
+	documentNumberTaxId: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id',
+		defaultMessage: 'Tax ID Number',
+	},
+	documentNumberNationalIdPlaceholder: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder',
+		defaultMessage: 'Enter national ID number',
+	},
+	documentNumberPassportPlaceholder: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder',
+		defaultMessage: 'Enter passport number',
+	},
+	documentNumberResidentIdPlaceholder: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder',
+		defaultMessage: 'Enter resident ID number',
+	},
+	documentNumberRucPlaceholder: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder',
+		defaultMessage: 'Enter RUC number',
+	},
+	documentNumberTaxIdPlaceholder: {
+		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder',
+		defaultMessage: 'Enter tax ID number',
+	},
+})
+</script>
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayKycStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayKycStage.vue
new file mode 100644
index 00000000..01858885
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayKycStage.vue
@@ -0,0 +1,362 @@
+<template>
+	<div class="flex flex-col gap-3 sm:gap-4">
+		<div class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast">
+					{{ formatMessage(messages.entityQuestion) }}
+					<span class="text-red">*</span>
+				</span>
+			</label>
+			<Chips
+				v-model="entityType"
+				:items="['individual', 'business']"
+				:format-label="
+					(item: string) =>
+						item === 'individual'
+							? formatMessage(messages.privateIndividual)
+							: formatMessage(messages.businessEntity)
+				"
+				:never-empty="false"
+				:capitalize="false"
+			/>
+			<span class="leading-tight text-primary">
+				{{ formatMessage(messages.entityDescription) }}
+			</span>
+		</div>
+
+		<div v-if="entityType" class="flex flex-col gap-4">
+			<div v-if="entityType === 'business'" class="flex flex-col gap-2.5">
+				<label>
+					<span class="text-md font-semibold text-contrast">
+						{{ formatMessage(formFieldLabels.businessName) }}
+						<span class="text-red">*</span>
+					</span>
+				</label>
+				<input
+					v-model="formData.businessName"
+					type="text"
+					:placeholder="formatMessage(formFieldPlaceholders.businessNamePlaceholder)"
+					autocomplete="organization"
+					class="w-full rounded-[14px] bg-surface-4 px-4 py-2.5 text-contrast placeholder:text-secondary"
+				/>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<label>
+					<span class="text-md font-semibold text-contrast">
+						{{ formatMessage(formFieldLabels.email) }}
+						<span class="text-red">*</span>
+					</span>
+				</label>
+				<input
+					v-model="formData.email"
+					type="email"
+					:placeholder="formatMessage(formFieldPlaceholders.emailPlaceholder)"
+					autocomplete="email"
+					class="w-full rounded-[14px] bg-surface-4 px-4 py-2.5 text-contrast placeholder:text-secondary"
+				/>
+			</div>
+
+			<div v-if="entityType === 'individual'" class="flex flex-col gap-6">
+				<div class="flex flex-col gap-3 sm:flex-row sm:gap-4">
+					<div class="flex flex-1 flex-col gap-2.5">
+						<label>
+							<span class="text-md font-semibold text-contrast">
+								{{ formatMessage(formFieldLabels.firstName) }}
+								<span class="text-red">*</span>
+							</span>
+						</label>
+						<input
+							v-model="formData.firstName"
+							type="text"
+							:placeholder="formatMessage(formFieldPlaceholders.firstNamePlaceholder)"
+							autocomplete="given-name"
+							class="w-full rounded-[14px] bg-surface-4 px-4 py-3 text-contrast placeholder:text-secondary sm:py-2.5"
+						/>
+					</div>
+					<div class="flex flex-1 flex-col gap-2.5">
+						<label>
+							<span class="text-md font-semibold text-contrast">
+								{{ formatMessage(formFieldLabels.lastName) }}
+								<span class="text-red">*</span>
+							</span>
+						</label>
+						<input
+							v-model="formData.lastName"
+							type="text"
+							:placeholder="formatMessage(formFieldPlaceholders.lastNamePlaceholder)"
+							autocomplete="family-name"
+							class="w-full rounded-[14px] bg-surface-4 px-4 py-3 text-contrast placeholder:text-secondary sm:py-2.5"
+						/>
+					</div>
+				</div>
+
+				<div class="flex flex-col gap-2.5">
+					<label>
+						<span class="text-md font-semibold text-contrast">
+							{{ formatMessage(formFieldLabels.dateOfBirth) }}
+							<span class="text-red">*</span>
+						</span>
+					</label>
+					<input
+						v-model="formData.dateOfBirth"
+						type="date"
+						:max="maxDate"
+						autocomplete="bday"
+						class="w-full rounded-[14px] bg-surface-4 px-4 py-2.5 text-contrast placeholder:text-secondary"
+					/>
+				</div>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<label>
+					<span class="text-md font-semibold text-contrast">
+						{{ formatMessage(formFieldLabels.addressLine) }}
+						<span class="text-red">*</span>
+					</span>
+				</label>
+				<input
+					v-model="formData.physicalAddress.address1"
+					type="text"
+					:placeholder="formatMessage(formFieldPlaceholders.addressPlaceholder)"
+					autocomplete="address-line1"
+					class="w-full rounded-[14px] bg-surface-4 px-4 py-2.5 text-contrast placeholder:text-secondary"
+				/>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<label>
+					<span class="text-md font-semibold text-contrast">
+						{{ formatMessage(formFieldLabels.addressLine2) }}
+					</span>
+				</label>
+				<input
+					v-model="formData.physicalAddress.address2"
+					type="text"
+					:placeholder="formatMessage(formFieldPlaceholders.address2Placeholder)"
+					autocomplete="address-line2"
+					class="w-full rounded-[14px] bg-surface-4 px-4 py-2.5 text-contrast placeholder:text-secondary"
+				/>
+			</div>
+
+			<div class="flex flex-col gap-3 sm:flex-row sm:gap-4">
+				<div class="flex flex-1 flex-col gap-2.5">
+					<label>
+						<span class="text-md font-semibold text-contrast">
+							{{ formatMessage(formFieldLabels.city) }}
+							<span class="text-red">*</span>
+						</span>
+					</label>
+					<input
+						v-model="formData.physicalAddress.city"
+						type="text"
+						:placeholder="formatMessage(formFieldPlaceholders.cityPlaceholder)"
+						autocomplete="address-level2"
+						class="w-full rounded-[14px] bg-surface-4 px-4 py-3 text-contrast placeholder:text-secondary sm:py-2.5"
+					/>
+				</div>
+				<div class="flex flex-1 flex-col gap-2.5">
+					<label>
+						<span class="text-md font-semibold text-contrast">
+							{{ formatMessage(formFieldLabels.stateProvince) }}
+							<span class="text-red">*</span>
+						</span>
+					</label>
+					<Combobox
+						v-if="subdivisionOptions.length > 0"
+						v-model="formData.physicalAddress.state"
+						:options="subdivisionOptions"
+						:placeholder="formatMessage(formFieldPlaceholders.statePlaceholder)"
+						searchable
+						search-placeholder="Search subdivisions..."
+					/>
+					<input
+						v-else
+						v-model="formData.physicalAddress.state"
+						type="text"
+						:placeholder="formatMessage(formFieldPlaceholders.statePlaceholder)"
+						autocomplete="address-level1"
+						class="w-full rounded-[14px] bg-surface-4 px-4 py-3 text-contrast placeholder:text-secondary sm:py-2.5"
+					/>
+				</div>
+			</div>
+
+			<div class="flex flex-col gap-3 sm:flex-row sm:gap-4">
+				<div class="flex flex-1 flex-col gap-2.5">
+					<label>
+						<span class="text-md font-semibold text-contrast">
+							{{ formatMessage(formFieldLabels.postalCode) }}
+							<span class="text-red">*</span>
+						</span>
+					</label>
+					<input
+						v-model="formData.physicalAddress.zip"
+						type="text"
+						:placeholder="formatMessage(formFieldPlaceholders.postalCodePlaceholder)"
+						autocomplete="postal-code"
+						class="w-full rounded-[14px] bg-surface-4 px-4 py-3 text-contrast placeholder:text-secondary sm:py-2.5"
+					/>
+				</div>
+				<div class="flex flex-1 flex-col gap-2.5">
+					<label>
+						<span class="text-md font-semibold text-contrast">
+							{{ formatMessage(formFieldLabels.country) }}
+							<span class="text-red">*</span>
+						</span>
+					</label>
+					<Combobox
+						v-model="formData.physicalAddress.country"
+						:options="countryOptions"
+						:placeholder="formatMessage(formFieldPlaceholders.countryPlaceholder)"
+						searchable
+						search-placeholder="Search countries..."
+					/>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { Chips, Combobox, formFieldLabels, formFieldPlaceholders } from '@modrinth/ui'
+import { useVIntl } from '@vintl/vintl'
+
+import { useFormattedCountries } from '@/composables/country.ts'
+import { useGeneratedState } from '@/composables/generated.ts'
+import { useWithdrawContext } from '@/providers/creator-withdraw.ts'
+
+const { withdrawData } = useWithdrawContext()
+const { formatMessage } = useVIntl()
+const generatedState = useGeneratedState()
+
+const providerData = withdrawData.value.providerData
+const existingKycData = providerData.type === 'muralpay' ? providerData.kycData : null
+
+const entityType = ref<'individual' | 'business' | null>(existingKycData?.type ?? null)
+
+interface PayoutRecipientInfoMerged {
+	email: string
+	firstName?: string
+	lastName?: string
+	dateOfBirth?: string
+	businessName?: string
+	physicalAddress: {
+		address1: string
+		address2: string | null
+		country: string
+		state: string
+		city: string
+		zip: string
+	}
+}
+
+const auth = await useAuth()
+
+const formData = ref<PayoutRecipientInfoMerged>({
+	email: existingKycData?.email ?? `${(auth.value.user as any)?.email}`,
+	firstName: existingKycData?.type === 'individual' ? existingKycData.firstName : '',
+	lastName: existingKycData?.type === 'individual' ? existingKycData.lastName : '',
+	dateOfBirth: existingKycData?.type === 'individual' ? existingKycData.dateOfBirth : '',
+	businessName: existingKycData?.type === 'business' ? existingKycData.name : '',
+	physicalAddress: {
+		address1: existingKycData?.physicalAddress?.address1 ?? '',
+		address2: existingKycData?.physicalAddress?.address2 ?? null,
+		country:
+			existingKycData?.physicalAddress?.country ?? withdrawData.value.selection.country?.id ?? '',
+		state: existingKycData?.physicalAddress?.state ?? '',
+		city: existingKycData?.physicalAddress?.city ?? '',
+		zip: existingKycData?.physicalAddress?.zip ?? '',
+	},
+})
+
+const maxDate = computed(() => {
+	const today = new Date()
+	const year = today.getFullYear() - 18
+	const month = String(today.getMonth() + 1).padStart(2, '0')
+	const day = String(today.getDate()).padStart(2, '0')
+	return `${year}-${month}-${day}`
+})
+
+const countryOptions = useFormattedCountries()
+
+const subdivisionOptions = computed(() => {
+	const selectedCountry = formData.value.physicalAddress.country
+	if (!selectedCountry) return []
+
+	const subdivisions = generatedState.value.subdivisions?.[selectedCountry] ?? []
+
+	return subdivisions.map((sub) => ({
+		value: sub.code.includes('-') ? sub.code.split('-')[1] : sub.code,
+		label: sub.localVariant || sub.name,
+	}))
+})
+
+watch(
+	[entityType, formData],
+	() => {
+		if (!entityType.value) {
+			if (withdrawData.value.providerData.type === 'muralpay') {
+				withdrawData.value.providerData.kycData = null as any
+			}
+			return
+		}
+
+		if (withdrawData.value.providerData.type !== 'muralpay') return
+
+		if (entityType.value === 'individual') {
+			if (formData.value.dateOfBirth) {
+				withdrawData.value.providerData.kycData = {
+					type: 'individual',
+					firstName: formData.value.firstName || '',
+					lastName: formData.value.lastName || '',
+					email: formData.value.email,
+					dateOfBirth: formData.value.dateOfBirth,
+					physicalAddress: {
+						address1: formData.value.physicalAddress.address1,
+						address2: formData.value.physicalAddress.address2 || undefined,
+						country: formData.value.physicalAddress.country,
+						state: formData.value.physicalAddress.state,
+						city: formData.value.physicalAddress.city,
+						zip: formData.value.physicalAddress.zip,
+					},
+				}
+			}
+		} else {
+			withdrawData.value.providerData.kycData = {
+				type: 'business',
+				name: formData.value.businessName || '',
+				email: formData.value.email,
+				physicalAddress: {
+					address1: formData.value.physicalAddress.address1,
+					address2: formData.value.physicalAddress.address2 || undefined,
+					country: formData.value.physicalAddress.country,
+					state: formData.value.physicalAddress.state,
+					city: formData.value.physicalAddress.city,
+					zip: formData.value.physicalAddress.zip,
+				},
+			}
+		}
+	},
+	{ deep: true },
+)
+
+const messages = defineMessages({
+	entityQuestion: {
+		id: 'dashboard.creator-withdraw-modal.kyc.entity-question',
+		defaultMessage: 'Are you a withdrawing as an individual or business?',
+	},
+	entityDescription: {
+		id: 'dashboard.creator-withdraw-modal.kyc.entity-description',
+		defaultMessage:
+			'A business entity refers to a registered organization such as a corporation, partnership, or LLC.',
+	},
+	privateIndividual: {
+		id: 'dashboard.creator-withdraw-modal.kyc.private-individual',
+		defaultMessage: 'Private individual',
+	},
+	businessEntity: {
+		id: 'dashboard.creator-withdraw-modal.kyc.business-entity',
+		defaultMessage: 'Business entity',
+	},
+})
+</script>
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/TaxFormStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/TaxFormStage.vue
new file mode 100644
index 00000000..7b5846ce
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/TaxFormStage.vue
@@ -0,0 +1,159 @@
+<template>
+	<div class="flex flex-col gap-2.5 sm:gap-3">
+		<div class="flex flex-col gap-3">
+			<div class="flex w-full flex-col gap-1 sm:flex-row sm:justify-between sm:gap-0">
+				<span class="font-semibold text-contrast">{{ formatMessage(messages.withdrawLimit) }}</span>
+				<div>
+					<span class="text-orange">{{ formatMoney(usedLimit) }}</span> /
+					<span class="text-contrast">{{ formatMoney(600) }}</span>
+				</div>
+			</div>
+			<div class="flex h-2.5 w-full overflow-hidden rounded-full bg-surface-2">
+				<div
+					v-if="usedLimit > 0"
+					class="gradient-border bg-orange"
+					:style="{ width: `${(usedLimit / 600) * 100}%` }"
+				></div>
+			</div>
+		</div>
+		<template v-if="remainingLimit > 0">
+			<span>
+				<IntlFormatted
+					:message-id="messages.nearingThreshold"
+					:values="{
+						amountRemaining: formatMoney(remainingLimit),
+					}"
+				>
+					<template #b="{ children }">
+						<span class="font-medium">
+							<component :is="() => normalizeChildren(children)" />
+						</span>
+					</template>
+				</IntlFormatted>
+			</span>
+			<Admonition
+				type="warning"
+				show-actions-underneath
+				:header="formatMessage(messages.taxFormRequiredHeader)"
+			>
+				<span class="text-sm font-normal md:text-base">
+					{{
+						formatMessage(messages.taxFormRequiredBodyWithLimit, {
+							limit: formatMoney(remainingLimit),
+						})
+					}}
+				</span>
+				<template #icon="{ iconClass }">
+					<FileTextIcon :class="iconClass" />
+				</template>
+				<template #actions>
+					<ButtonStyled color="orange">
+						<button @click="showTaxFormModal">
+							{{ formatMessage(messages.completeTaxForm) }}
+						</button>
+					</ButtonStyled>
+				</template>
+			</Admonition>
+		</template>
+		<template v-else>
+			<span>
+				<IntlFormatted
+					:message-id="messages.withdrawLimitUsed"
+					:values="{ withdrawLimit: formatMoney(600) }"
+				>
+					<template #b="{ children }">
+						<b>
+							<component :is="() => normalizeChildren(children)" />
+						</b>
+					</template>
+				</IntlFormatted>
+			</span>
+		</template>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { FileTextIcon } from '@modrinth/assets'
+import { Admonition, ButtonStyled } from '@modrinth/ui'
+import { formatMoney } from '@modrinth/utils'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { IntlFormatted } from '@vintl/vintl/components'
+import { computed } from 'vue'
+
+import { TAX_THRESHOLD_ACTUAL } from '@/providers/creator-withdraw.ts'
+import { normalizeChildren } from '@/utils/vue-children.ts'
+
+const props = defineProps<{
+	balance: any
+	onShowTaxForm: () => void
+}>()
+
+const { formatMessage } = useVIntl()
+
+const usedLimit = computed(() => props.balance?.withdrawn_ytd ?? 0)
+const remainingLimit = computed(() => {
+	const raw = TAX_THRESHOLD_ACTUAL - usedLimit.value
+	if (raw <= 0) return 0
+	const cents = Math.floor(raw * 100)
+	return cents / 100
+})
+
+function showTaxFormModal() {
+	props.onShowTaxForm()
+}
+
+const messages = defineMessages({
+	withdrawLimit: {
+		id: 'dashboard.creator-withdraw-modal.withdraw-limit',
+		defaultMessage: 'Withdraw limit',
+	},
+	nearingThreshold: {
+		id: 'dashboard.creator-withdraw-modal.nearing-threshold',
+		defaultMessage:
+			"You're nearing the withdraw threshold. You can withdraw <b>{amountRemaining}</b> now, but a tax form is required for more.",
+	},
+	taxFormRequiredHeader: {
+		id: 'dashboard.creator-withdraw-modal.tax-form-required.header',
+		defaultMessage: 'Tax form required',
+	},
+	taxFormRequiredBody: {
+		id: 'dashboard.creator-withdraw-modal.tax-form-required.body',
+		defaultMessage:
+			'To withdraw your full <b>{available}</b> available balance please complete the form below. It is required for tax reporting and only needs to be done once.',
+	},
+	taxFormRequiredBodyWithLimit: {
+		id: 'dashboard.creator-withdraw-modal.tax-form-required.body-with-limit',
+		defaultMessage:
+			"You must complete a W-9 or W-8 form for Modrinth's tax records so we remain compliant with tax regulations.",
+	},
+	completeTaxForm: {
+		id: 'dashboard.creator-withdraw-modal.complete-tax-form',
+		defaultMessage: 'Complete tax form',
+	},
+	withdrawLimitUsed: {
+		id: 'dashboard.creator-withdraw-modal.withdraw-limit-used',
+		defaultMessage:
+			"You've used up your <b>{withdrawLimit}</b> withdrawal limit. You must complete a tax form to withdraw more.",
+	},
+})
+</script>
+
+<style lang="css" scoped>
+.gradient-border {
+	position: relative;
+
+	&::after {
+		content: '';
+		position: absolute;
+		inset: 0;
+		background: linear-gradient(to bottom, rgba(255, 255, 255, 0.3), transparent);
+		border-radius: inherit;
+		mask:
+			linear-gradient(#fff 0 0) content-box,
+			linear-gradient(#fff 0 0);
+		mask-composite: xor;
+		padding: 2px;
+		pointer-events: none;
+	}
+}
+</style>
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/TremendousDetailsStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/TremendousDetailsStage.vue
new file mode 100644
index 00000000..f09adc8f
--- /dev/null
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/TremendousDetailsStage.vue
@@ -0,0 +1,649 @@
+<template>
+	<div class="flex flex-col gap-4 sm:gap-5">
+		<Transition
+			enter-active-class="transition-all duration-300 ease-out"
+			enter-from-class="opacity-0 max-h-0"
+			enter-to-class="opacity-100 max-h-40"
+			leave-active-class="transition-all duration-200 ease-in"
+			leave-from-class="opacity-100 max-h-40"
+			leave-to-class="opacity-0 max-h-0"
+		>
+			<div v-if="isUnverifiedEmail" class="overflow-hidden">
+				<Admonition type="warning" :header="formatMessage(messages.unverifiedEmailHeader)">
+					{{ formatMessage(messages.unverifiedEmailMessage) }}
+				</Admonition>
+			</div>
+		</Transition>
+
+		<Transition
+			enter-active-class="transition-all duration-300 ease-out"
+			enter-from-class="opacity-0 max-h-0"
+			enter-to-class="opacity-100 max-h-40"
+			leave-active-class="transition-all duration-200 ease-in"
+			leave-from-class="opacity-100 max-h-40"
+			leave-to-class="opacity-0 max-h-0"
+		>
+			<div v-if="shouldShowUsdWarning" class="overflow-hidden">
+				<Admonition type="warning" :header="formatMessage(messages.usdPaypalWarningHeader)">
+					<IntlFormatted :message-id="messages.usdPaypalWarningMessage">
+						<template #direct-paypal-link="{ children }">
+							<span class="cursor-pointer text-link" @click="switchToDirectPaypal">
+								<component :is="() => normalizeChildren(children)" />
+							</span>
+						</template>
+					</IntlFormatted>
+				</Admonition>
+			</div>
+		</Transition>
+
+		<div v-if="!showGiftCardSelector && selectedMethodDisplay" class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast">
+					{{ formatMessage(messages.paymentMethod) }}
+				</span>
+			</label>
+			<div
+				class="flex min-h-[44px] items-center gap-2 rounded-[14px] bg-surface-2 px-4 py-2.5 sm:min-h-0"
+			>
+				<component :is="selectedMethodDisplay.icon" class="size-5 shrink-0" />
+				<span class="break-words text-sm font-semibold text-contrast sm:text-[1rem]">{{
+					typeof selectedMethodDisplay.label === 'string'
+						? selectedMethodDisplay.label
+						: formatMessage(selectedMethodDisplay.label)
+				}}</span>
+			</div>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast"
+					>{{ formatMessage(formFieldLabels.email) }} <span class="text-red">*</span></span
+				>
+			</label>
+			<input
+				v-model="deliveryEmail"
+				type="email"
+				:placeholder="formatMessage(formFieldPlaceholders.emailPlaceholder)"
+				autocomplete="email"
+				class="w-full rounded-[14px] bg-surface-4 px-4 py-3 text-contrast placeholder:text-secondary sm:py-2.5"
+			/>
+		</div>
+
+		<div v-if="showGiftCardSelector" class="flex flex-col gap-1">
+			<div class="flex flex-col gap-2.5">
+				<label>
+					<span class="text-md font-semibold text-contrast"
+						>{{ categoryLabel }} <span class="text-red">*</span></span
+					>
+				</label>
+				<Combobox
+					v-model="selectedGiftCardId"
+					:options="rewardOptions"
+					:placeholder="`Select ${categoryLabel.toLowerCase()}`"
+					searchable
+					:search-placeholder="`Search ${categoryLabelPlural.toLowerCase()}...`"
+					class="h-10"
+				>
+					<template #selected>
+						<div v-if="selectedRewardOption" class="flex items-center gap-2">
+							<img
+								v-if="selectedRewardOption.imageUrl"
+								:src="selectedRewardOption.imageUrl"
+								:alt="selectedRewardOption.label"
+								class="size-5 rounded-full object-cover"
+								loading="lazy"
+							/>
+							<span class="font-semibold leading-tight">{{ selectedRewardOption.label }}</span>
+						</div>
+					</template>
+					<template v-for="option in rewardOptions" :key="option.value" #[`option-${option.value}`]>
+						<div class="flex items-center gap-2">
+							<img
+								v-if="option.imageUrl"
+								:src="option.imageUrl"
+								:alt="option.label"
+								class="size-5 rounded-full object-cover"
+								loading="lazy"
+							/>
+							<span class="font-semibold leading-tight">{{ option.label }}</span>
+						</div>
+					</template>
+				</Combobox>
+			</div>
+			<span v-if="selectedMethodDetails" class="text-secondary">
+				{{ formatMoney(effectiveMinAmount) }} min,
+				{{ formatMoney(selectedMethodDetails.interval?.standard?.max ?? effectiveMaxAmount) }}
+				max withdrawal amount.
+			</span>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<label>
+				<span class="text-md font-semibold text-contrast"
+					>{{ formatMessage(formFieldLabels.amount) }} <span class="text-red">*</span></span
+				>
+			</label>
+
+			<div v-if="showGiftCardSelector && useFixedDenominations" class="flex flex-col gap-2.5">
+				<Chips
+					v-model="selectedDenomination"
+					:items="denominationOptions"
+					:format-label="(amt: number) => formatMoney(amt)"
+					:never-empty="false"
+					:capitalize="false"
+				/>
+				<span v-if="denominationOptions.length === 0" class="text-error text-sm">
+					No denominations available for your current balance
+				</span>
+			</div>
+
+			<div v-else class="flex flex-col gap-2">
+				<RevenueInputField
+					v-model="formData.amount"
+					v-model:selected-currency="selectedCurrency"
+					:max-amount="effectiveMaxAmount"
+					:min-amount="effectiveMinAmount"
+					:show-currency-selector="showPayPalCurrencySelector"
+					:currency-options="currencyOptions"
+				/>
+			</div>
+
+			<WithdrawFeeBreakdown
+				v-if="allRequiredFieldsFilled"
+				:amount="formData.amount || 0"
+				:fee="calculatedFee"
+				:fee-loading="feeLoading"
+				:exchange-rate="exchangeRate"
+				:local-currency="showPayPalCurrencySelector ? selectedCurrency : undefined"
+			/>
+
+			<Checkbox v-model="agreedTerms">
+				<span>
+					<IntlFormatted :message-id="financialMessages.rewardsProgramTermsAgreement">
+						<template #terms-link="{ children }">
+							<nuxt-link to="/legal/cmp" class="text-link">
+								<component :is="() => normalizeChildren(children)" />
+							</nuxt-link>
+						</template>
+					</IntlFormatted>
+				</span>
+			</Checkbox>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import {
+	Admonition,
+	Checkbox,
+	Chips,
+	Combobox,
+	financialMessages,
+	formFieldLabels,
+	formFieldPlaceholders,
+	paymentMethodMessages,
+	useDebugLogger,
+} from '@modrinth/ui'
+import { formatMoney } from '@modrinth/utils'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { IntlFormatted } from '@vintl/vintl/components'
+import { useDebounceFn } from '@vueuse/core'
+import { computed, onMounted, ref, watch } from 'vue'
+
+import RevenueInputField from '@/components/ui/dashboard/RevenueInputField.vue'
+import WithdrawFeeBreakdown from '@/components/ui/dashboard/WithdrawFeeBreakdown.vue'
+import { useAuth } from '@/composables/auth.js'
+import { useBaseFetch } from '@/composables/fetch.js'
+import { type PayoutMethod, useWithdrawContext } from '@/providers/creator-withdraw.ts'
+import { normalizeChildren } from '@/utils/vue-children.ts'
+
+const debug = useDebugLogger('TremendousDetailsStage')
+const {
+	withdrawData,
+	maxWithdrawAmount,
+	availableMethods,
+	paymentOptions,
+	calculateFees,
+	setStage,
+	paymentMethodsCache,
+} = useWithdrawContext()
+const { formatMessage } = useVIntl()
+const auth = await useAuth()
+
+const userEmail = computed(() => {
+	return (auth.value.user as any)?.email || ''
+})
+
+const providerData = withdrawData.value.providerData
+const initialDeliveryEmail =
+	providerData.type === 'tremendous'
+		? providerData.deliveryEmail || userEmail.value || ''
+		: userEmail.value || ''
+const deliveryEmail = ref<string>(initialDeliveryEmail)
+
+const showGiftCardSelector = computed(() => {
+	const method = withdrawData.value.selection.method
+	return method === 'merchant_card' || method === 'charity'
+})
+
+const showPayPalCurrencySelector = computed(() => {
+	const method = withdrawData.value.selection.method
+	return method === 'paypal'
+})
+
+const shouldShowUsdWarning = computed(() => {
+	const method = withdrawData.value.selection.method
+	const currency = selectedCurrency.value
+	return method === 'paypal' && currency === 'USD'
+})
+
+const selectedMethodDisplay = computed(() => {
+	const method = withdrawData.value.selection.method
+	if (!method) return null
+	return paymentOptions.value.find((m) => m.value === method) || null
+})
+
+const categoryLabel = computed(() => {
+	const method = withdrawData.value.selection.method
+	switch (method) {
+		case 'visa_card':
+			return formatMessage(paymentMethodMessages.virtualVisa)
+		case 'merchant_card':
+			return formatMessage(paymentMethodMessages.giftCard)
+		case 'charity':
+			return formatMessage(paymentMethodMessages.charity)
+		default:
+			return formatMessage(messages.reward)
+	}
+})
+
+const categoryLabelPlural = computed(() => {
+	const method = withdrawData.value.selection.method
+	switch (method) {
+		case 'visa_card':
+			return formatMessage(paymentMethodMessages.virtualVisaPlural)
+		case 'merchant_card':
+			return formatMessage(paymentMethodMessages.giftCardPlural)
+		case 'charity':
+			return formatMessage(paymentMethodMessages.charityPlural)
+		default:
+			return formatMessage(messages.rewardPlural)
+	}
+})
+
+const isUnverifiedEmail = computed(() => {
+	if (!deliveryEmail.value || !userEmail.value) return false
+	return deliveryEmail.value.toLowerCase() !== userEmail.value.toLowerCase()
+})
+
+const maxAmount = computed(() => maxWithdrawAmount.value)
+const roundedMaxAmount = computed(() => Math.floor(maxAmount.value * 100) / 100)
+
+const formData = ref<Record<string, any>>({
+	amount: withdrawData.value.calculation.amount || undefined,
+})
+
+const selectedGiftCardId = ref<string | null>(withdrawData.value.selection.methodId || null)
+
+const currencyOptions = [
+	{ value: 'USD', label: 'USD' },
+	{ value: 'AUD', label: 'AUD' },
+	{ value: 'CAD', label: 'CAD' },
+	{ value: 'CHF', label: 'CHF' },
+	{ value: 'CZK', label: 'CZK' },
+	{ value: 'DKK', label: 'DKK' },
+	{ value: 'EUR', label: 'EUR' },
+	{ value: 'GBP', label: 'GBP' },
+	{ value: 'MXN', label: 'MXN' },
+	{ value: 'NOK', label: 'NOK' },
+	{ value: 'NZD', label: 'NZD' },
+	{ value: 'PLN', label: 'PLN' },
+	{ value: 'SEK', label: 'SEK' },
+	{ value: 'SGD', label: 'SGD' },
+]
+
+function getCurrencyFromCountryCode(countryCode: string | undefined): string {
+	if (!countryCode) return 'USD'
+
+	const code = countryCode.toUpperCase()
+
+	const countryToCurrency: Record<string, string> = {
+		US: 'USD', // United States
+		GB: 'GBP', // UK
+		CA: 'CAD', // Canada
+		AU: 'AUD', // Australia
+		CH: 'CHF', // Switzerland
+		CZ: 'CZK', // Czech Republic
+		DK: 'DKK', // Denmark
+		MX: 'MXN', // Mexico
+		NO: 'NOK', // Norway
+		NZ: 'NZD', // New Zealand
+		PL: 'PLN', // Poland
+		SE: 'SEK', // Sweden
+		SG: 'SGD', // Singapore
+
+		// Eurozone countries
+		AT: 'EUR', // Austria
+		BE: 'EUR', // Belgium
+		CY: 'EUR', // Cyprus
+		EE: 'EUR', // Estonia
+		FI: 'EUR', // Finland
+		FR: 'EUR', // France
+		DE: 'EUR', // Germany
+		GR: 'EUR', // Greece
+		IE: 'EUR', // Ireland
+		IT: 'EUR', // Italy
+		LV: 'EUR', // Latvia
+		LT: 'EUR', // Lithuania
+		LU: 'EUR', // Luxembourg
+		MT: 'EUR', // Malta
+		NL: 'EUR', // Netherlands
+		PT: 'EUR', // Portugal
+		SK: 'EUR', // Slovakia
+		SI: 'EUR', // Slovenia
+		ES: 'EUR', // Spain
+	}
+
+	return countryToCurrency[code] || 'USD'
+}
+
+const initialCurrency = getCurrencyFromCountryCode(withdrawData.value.selection.country?.id)
+const selectedCurrency = ref<string>(initialCurrency)
+
+const agreedTerms = computed({
+	get: () => withdrawData.value.agreedTerms,
+	set: (value) => {
+		withdrawData.value.agreedTerms = value
+	},
+})
+
+const calculatedFee = ref<number>(0)
+const exchangeRate = ref<number | null>(null)
+const feeLoading = ref(false)
+
+const rewardOptions = ref<
+	Array<{
+		value: string
+		label: string
+		imageUrl?: string
+		methodDetails?: {
+			id: string
+			name: string
+			interval?: {
+				fixed?: { values: number[] }
+				standard?: { min: number; max: number }
+			}
+		}
+	}>
+>([])
+
+const selectedRewardOption = computed(() => {
+	if (!selectedGiftCardId.value) return null
+	return rewardOptions.value.find((opt) => opt.value === selectedGiftCardId.value) || null
+})
+
+const selectedMethodDetails = computed(() => {
+	console.log(rewardOptions.value, selectedGiftCardId.value)
+	if (!selectedGiftCardId.value) return null
+	const option = rewardOptions.value.find((opt) => opt.value === selectedGiftCardId.value)
+	debug('Selected method details:', option?.methodDetails)
+	return option?.methodDetails || null
+})
+
+const useFixedDenominations = computed(() => {
+	const hasFixed = !!selectedMethodDetails.value?.interval?.fixed?.values
+	debug('Use fixed denominations:', hasFixed, selectedMethodDetails.value?.interval)
+	return hasFixed
+})
+
+const denominationOptions = computed(() => {
+	const fixedValues = selectedMethodDetails.value?.interval?.fixed?.values
+	if (!fixedValues) return []
+
+	const filtered = fixedValues
+		.filter((amount) => amount <= roundedMaxAmount.value)
+		.sort((a, b) => a - b)
+	debug(
+		'Denomination options (filtered by max):',
+		filtered,
+		'from',
+		fixedValues,
+		'max:',
+		roundedMaxAmount.value,
+	)
+	return filtered
+})
+
+const effectiveMinAmount = computed(() => {
+	return selectedMethodDetails.value?.interval?.standard?.min || 0.01
+})
+
+const effectiveMaxAmount = computed(() => {
+	const methodMax = selectedMethodDetails.value?.interval?.standard?.max
+	if (methodMax !== undefined && methodMax !== null) {
+		return Math.min(roundedMaxAmount.value, methodMax)
+	}
+	return roundedMaxAmount.value
+})
+
+const selectedDenomination = computed({
+	get: () => formData.value.amount,
+	set: (value) => {
+		formData.value.amount = value
+	},
+})
+
+const allRequiredFieldsFilled = computed(() => {
+	const amount = formData.value.amount
+	if (!amount || amount <= 0) return false
+
+	if (!deliveryEmail.value) return false
+
+	if (showGiftCardSelector.value && !selectedGiftCardId.value) return false
+
+	return true
+})
+
+const calculateFeesDebounced = useDebounceFn(async () => {
+	const amount = formData.value.amount
+	if (!amount || amount <= 0) {
+		calculatedFee.value = 0
+		exchangeRate.value = null
+		return
+	}
+
+	const methodId = showGiftCardSelector.value
+		? selectedGiftCardId.value
+		: withdrawData.value.selection.methodId
+
+	if (!methodId) {
+		calculatedFee.value = 0
+		exchangeRate.value = null
+		return
+	}
+
+	feeLoading.value = true
+	try {
+		await calculateFees()
+		calculatedFee.value = withdrawData.value.calculation.fee ?? 0
+		exchangeRate.value = withdrawData.value.calculation.exchangeRate
+	} catch (error) {
+		console.error('Failed to calculate fees:', error)
+		calculatedFee.value = 0
+		exchangeRate.value = null
+	} finally {
+		feeLoading.value = false
+	}
+}, 500)
+
+watch(deliveryEmail, (newEmail) => {
+	if (withdrawData.value.providerData.type === 'tremendous') {
+		withdrawData.value.providerData.deliveryEmail = newEmail
+	}
+})
+
+watch(
+	selectedCurrency,
+	(newCurrency) => {
+		if (withdrawData.value.providerData.type === 'tremendous') {
+			;(withdrawData.value.providerData as any).currency = newCurrency
+		}
+	},
+	{ immediate: true },
+)
+
+watch(
+	() => withdrawData.value.selection.country?.id,
+	(newCountryId) => {
+		if (showPayPalCurrencySelector.value && newCountryId) {
+			const detectedCurrency = getCurrencyFromCountryCode(newCountryId)
+			selectedCurrency.value = detectedCurrency
+		}
+	},
+)
+
+watch(
+	[() => formData.value.amount, selectedGiftCardId, deliveryEmail, selectedCurrency],
+	() => {
+		withdrawData.value.calculation.amount = formData.value.amount ?? 0
+
+		if (showGiftCardSelector.value && selectedGiftCardId.value) {
+			withdrawData.value.selection.methodId = selectedGiftCardId.value
+		}
+
+		if (allRequiredFieldsFilled.value) {
+			feeLoading.value = true
+			calculateFeesDebounced()
+		} else {
+			calculatedFee.value = 0
+			exchangeRate.value = null
+			feeLoading.value = false
+		}
+	},
+	{ deep: true },
+)
+
+onMounted(async () => {
+	const methods = availableMethods.value
+	const selectedMethod = withdrawData.value.selection.method
+
+	rewardOptions.value = methods
+		.filter((m) => m.type === 'tremendous')
+		.filter((m) => m.category === selectedMethod)
+		.map((m) => ({
+			value: m.id,
+			label: m.name,
+			imageUrl: m.image_url || m.image_logo_url || undefined,
+			methodDetails: {
+				id: m.id,
+				name: m.name,
+				interval: m.interval,
+			},
+		}))
+
+	debug('Loaded reward options:', rewardOptions.value.length, 'methods')
+	debug('Sample method with interval:', rewardOptions.value[0]?.methodDetails)
+
+	if (allRequiredFieldsFilled.value) {
+		feeLoading.value = true
+		calculateFeesDebounced()
+	}
+})
+
+watch(
+	() => withdrawData.value.selection.method,
+	(newMethod, oldMethod) => {
+		if (oldMethod && newMethod !== oldMethod) {
+			formData.value = {
+				amount: undefined,
+			}
+			selectedGiftCardId.value = null
+			calculatedFee.value = 0
+			exchangeRate.value = null
+
+			// Clear currency when switching away from PayPal International
+			if (newMethod !== 'paypal' && withdrawData.value.providerData.type === 'tremendous') {
+				;(withdrawData.value.providerData as any).currency = undefined
+			}
+		}
+	},
+)
+
+async function switchToDirectPaypal() {
+	withdrawData.value.selection.country = {
+		id: 'US',
+		name: 'United States',
+	}
+
+	let usMethods = paymentMethodsCache.value['US']
+
+	if (!usMethods) {
+		try {
+			usMethods = (await useBaseFetch('payout/methods', {
+				apiVersion: 3,
+				query: { country: 'US' },
+			})) as PayoutMethod[]
+
+			paymentMethodsCache.value['US'] = usMethods
+		} catch (error) {
+			console.error('Failed to fetch US payment methods:', error)
+			return
+		}
+	}
+
+	availableMethods.value = usMethods
+
+	const directPaypal = usMethods.find((m) => m.type === 'paypal')
+
+	if (directPaypal) {
+		withdrawData.value.selection.provider = 'paypal'
+		withdrawData.value.selection.method = directPaypal.id
+		withdrawData.value.selection.methodId = directPaypal.id
+
+		withdrawData.value.providerData = {
+			type: 'paypal',
+		}
+
+		await setStage('paypal-details', true)
+	} else {
+		console.error('An error occured - no paypal in US region??')
+	}
+}
+
+const messages = defineMessages({
+	unverifiedEmailHeader: {
+		id: 'dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header',
+		defaultMessage: 'Unverified email',
+	},
+	unverifiedEmailMessage: {
+		id: 'dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message',
+		defaultMessage:
+			'The delivery email you have entered is not associated with your Modrinth account. Modrinth cannot recover rewards sent to an incorrect email address.',
+	},
+	paymentMethod: {
+		id: 'dashboard.creator-withdraw-modal.tremendous-details.payment-method',
+		defaultMessage: 'Payment method',
+	},
+	reward: {
+		id: 'dashboard.creator-withdraw-modal.tremendous-details.reward',
+		defaultMessage: 'Reward',
+	},
+	rewardPlaceholder: {
+		id: 'dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder',
+		defaultMessage: 'Select reward',
+	},
+	rewardPlural: {
+		id: 'dashboard.creator-withdraw-modal.tremendous-details.reward-plural',
+		defaultMessage: 'Rewards',
+	},
+	usdPaypalWarningHeader: {
+		id: 'dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header',
+		defaultMessage: 'Lower fees available',
+	},
+	usdPaypalWarningMessage: {
+		id: 'dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message',
+		defaultMessage:
+			'You selected USD for PayPal International. <direct-paypal-link>Switch to direct PayPal</direct-paypal-link> for better fees (≈2% instead of ≈6%).',
+	},
+})
+</script>
diff --git a/apps/frontend/src/components/ui/search/Categories.vue b/apps/frontend/src/components/ui/search/Categories.vue
index 814b1b7f..832de2a5 100644
--- a/apps/frontend/src/components/ui/search/Categories.vue
+++ b/apps/frontend/src/components/ui/search/Categories.vue
@@ -26,7 +26,7 @@ export default {
 		},
 	},
 	setup() {
-		const tags = useTags()
+		const tags = useGeneratedState()
 
 		return { tags }
 	},
diff --git a/apps/frontend/src/components/ui/servers/BackupSettingsModal.vue b/apps/frontend/src/components/ui/servers/BackupSettingsModal.vue
index b3166d99..bbc6911e 100644
--- a/apps/frontend/src/components/ui/servers/BackupSettingsModal.vue
+++ b/apps/frontend/src/components/ui/servers/BackupSettingsModal.vue
@@ -27,13 +27,13 @@
 					</p>
 				</div>
 
-				<TeleportDropdownMenu
+				<Combobox
 					:id="'interval-field'"
 					v-model="backupIntervalsLabel"
 					:disabled="!autoBackupEnabled || isSaving"
 					name="interval"
-					:options="Object.keys(backupIntervals)"
-					placeholder="Backup interval"
+					:options="Object.keys(backupIntervals).map((k) => ({ value: k, label: k }))"
+					:display-value="backupIntervalsLabel"
 				/>
 
 				<div class="mt-4 flex justify-start gap-4">
@@ -57,12 +57,7 @@
 
 <script setup lang="ts">
 import { SaveIcon, XIcon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	injectNotificationManager,
-	NewModal,
-	TeleportDropdownMenu,
-} from '@modrinth/ui'
+import { ButtonStyled, Combobox, injectNotificationManager, NewModal } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
diff --git a/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue b/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
index f952f11b..1e48ae36 100644
--- a/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
+++ b/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
@@ -60,16 +60,24 @@
 							</NuxtLink>
 						</div>
 					</div>
-					<TeleportDropdownMenu
+					<Combobox
 						v-model="selectedVersion"
 						name="Project"
-						:options="filteredVersions"
-						placeholder="No valid versions found"
+						:options="
+							filteredVersions.map((v) => ({
+								value: v,
+								label: typeof v === 'object' ? v.version_number : String(v),
+							}))
+						"
+						:display-value="
+							selectedVersion
+								? typeof selectedVersion === 'object'
+									? selectedVersion.version_number
+									: String(selectedVersion)
+								: 'No valid versions found'
+						"
 						class="!min-w-full"
 						:disabled="filteredVersions.length === 0"
-						:display-name="
-							(version) => (typeof version === 'object' ? version?.version_number : version)
-						"
 					/>
 					<Checkbox v-model="showBetaAlphaReleases"> Show any beta and alpha releases </Checkbox>
 				</template>
@@ -237,14 +245,7 @@ import {
 	LockOpenIcon,
 	XIcon,
 } from '@modrinth/assets'
-import {
-	Admonition,
-	Avatar,
-	ButtonStyled,
-	CopyCode,
-	NewModal,
-	TeleportDropdownMenu,
-} from '@modrinth/ui'
+import { Admonition, Avatar, ButtonStyled, Combobox, CopyCode, NewModal } from '@modrinth/ui'
 import TagItem from '@modrinth/ui/src/components/base/TagItem.vue'
 import { formatCategory, formatVersionsForDisplay, type Mod, type Version } from '@modrinth/utils'
 import { computed, ref } from 'vue'
@@ -282,7 +283,7 @@ const versionsError = ref('')
 const showBetaAlphaReleases = ref(false)
 const unlockFilterAccordion = ref()
 const versionFilter = ref(true)
-const tags = useTags()
+const tags = useGeneratedState()
 const noCompatibleVersions = ref(false)
 
 const { pluginLoaders, modLoaders } = tags.value.loaders.reduce(
diff --git a/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue b/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
index 87cf2c6e..0b31fce7 100644
--- a/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
@@ -17,10 +17,11 @@
 			</div>
 
 			<div class="flex w-full flex-col gap-4">
-				<TeleportDropdownMenu
+				<Combobox
 					v-if="props.versions?.length"
 					v-model="selectedVersion"
-					:options="versionOptions"
+					:options="versionOptions.map((v) => ({ value: v, label: v }))"
+					:display-value="selectedVersion || 'Select version...'"
 					placeholder="Select version..."
 					name="version"
 					class="w-full max-w-full"
@@ -68,12 +69,7 @@
 
 <script setup lang="ts">
 import { DownloadIcon, XIcon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	injectNotificationManager,
-	NewModal,
-	TeleportDropdownMenu,
-} from '@modrinth/ui'
+import { ButtonStyled, Combobox, injectNotificationManager, NewModal } from '@modrinth/ui'
 import { ModrinthServersFetchError } from '@modrinth/utils'
 
 import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
@@ -96,7 +92,7 @@ const emit = defineEmits<{
 const modal = ref()
 const hardReset = ref(false)
 const isLoading = ref(false)
-const selectedVersion = ref('')
+const selectedVersion = ref(props.currentVersion?.version_number || '')
 
 const versionOptions = computed(() => props.versions?.map((v) => v.version_number) || [])
 
diff --git a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
index ebbab8e0..8daf3192 100644
--- a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
@@ -54,11 +54,12 @@
 
 				<div class="flex w-full flex-col gap-2 rounded-2xl bg-table-alternateRow p-4">
 					<div class="text-lg font-bold text-contrast">Minecraft version</div>
-					<TeleportDropdownMenu
+					<Combobox
 						v-model="selectedMCVersion"
 						name="mcVersion"
-						:options="mcVersions"
-						class="w-full max-w-[100%]"
+						:options="mcVersions.map((v) => ({ value: v, label: v }))"
+						:display-value="selectedMCVersion || 'Select Minecraft version...'"
+						class="!w-full"
 						placeholder="Select Minecraft version..."
 					/>
 					<div class="mt-2 flex items-center justify-between gap-2">
@@ -108,10 +109,17 @@
 							</div>
 						</template>
 						<template v-else-if="selectedLoaderVersions.length > 0">
-							<TeleportDropdownMenu
+							<Combobox
 								v-model="selectedLoaderVersion"
 								name="loaderVersion"
-								:options="selectedLoaderVersions"
+								:options="selectedLoaderVersions.map((v) => ({ value: v, label: v }))"
+								:display-value="
+									selectedLoaderVersion ||
+									(selectedLoader.toLowerCase() === 'paper' ||
+									selectedLoader.toLowerCase() === 'purpur'
+										? 'Select build number...'
+										: 'Select loader version...')
+								"
 								class="w-full max-w-[100%]"
 								:placeholder="
 									selectedLoader.toLowerCase() === 'paper' ||
@@ -201,9 +209,9 @@ import { DropdownIcon, RightArrowIcon, ServerIcon, XIcon } from '@modrinth/asset
 import {
 	BackupWarning,
 	ButtonStyled,
+	Combobox,
 	injectNotificationManager,
 	NewModal,
-	TeleportDropdownMenu,
 	Toggle,
 } from '@modrinth/ui'
 import { type Loaders, ModrinthServersFetchError } from '@modrinth/utils'
@@ -433,7 +441,7 @@ onMounted(() => {
 	fetchLoaderVersions()
 })
 
-const tags = useTags()
+const tags = useGeneratedState()
 const mcVersions = computed(() =>
 	tags.value.gameVersions
 		.filter((x) =>
diff --git a/apps/frontend/src/components/ui/servers/TeleportDropdownMenu.vue b/apps/frontend/src/components/ui/servers/TeleportDropdownMenu.vue
deleted file mode 100644
index 33094ed6..00000000
--- a/apps/frontend/src/components/ui/servers/TeleportDropdownMenu.vue
+++ /dev/null
@@ -1,458 +0,0 @@
-<template>
-	<div class="relative inline-block h-9 w-full max-w-80">
-		<button
-			ref="triggerRef"
-			type="button"
-			aria-haspopup="listbox"
-			:aria-expanded="dropdownVisible"
-			:aria-controls="listboxId"
-			:aria-labelledby="listboxId"
-			class="duration-50 flex h-full w-full cursor-pointer select-none appearance-none items-center justify-between gap-4 rounded-xl border-none bg-button-bg px-4 py-2 shadow-sm !outline-none transition-all ease-in-out"
-			:class="triggerClasses"
-			@click="toggleDropdown"
-			@keydown="handleTriggerKeyDown"
-		>
-			<span>{{ selectedOption }}</span>
-			<DropdownIcon
-				class="transition-transform duration-200 ease-in-out"
-				:class="{ 'rotate-180': dropdownVisible }"
-			/>
-		</button>
-
-		<Teleport to="#teleports">
-			<transition
-				enter-active-class="transition-opacity duration-200 ease-out"
-				enter-from-class="opacity-0"
-				enter-to-class="opacity-100"
-				leave-active-class="transition-opacity duration-200 ease-in"
-				leave-from-class="opacity-100"
-				leave-to-class="opacity-0"
-			>
-				<div
-					v-if="dropdownVisible"
-					:id="listboxId"
-					ref="optionsContainer"
-					role="listbox"
-					tabindex="-1"
-					:aria-activedescendant="activeDescendant"
-					class="experimental-styles-within fixed z-50 bg-button-bg shadow-lg outline-none"
-					:class="{
-						'rounded-b-xl': !isRenderingUp,
-						'rounded-t-xl': isRenderingUp,
-					}"
-					:style="positionStyle"
-					@keydown="handleListboxKeyDown"
-				>
-					<div
-						class="overflow-y-auto"
-						:style="{ height: `${virtualListHeight}px` }"
-						@scroll="handleScroll"
-					>
-						<div :style="{ height: `${totalHeight}px`, position: 'relative' }">
-							<div
-								v-for="item in visibleOptions"
-								:key="item.index"
-								:style="{
-									position: 'absolute',
-									top: 0,
-									transform: `translateY(${item.index * ITEM_HEIGHT}px)`,
-									width: '100%',
-									height: `${ITEM_HEIGHT}px`,
-								}"
-							>
-								<div
-									:id="`${listboxId}-option-${item.index}`"
-									role="option"
-									:aria-selected="selectedValue === item.option"
-									class="hover:brightness-85 flex h-full cursor-pointer select-none items-center px-4 transition-colors duration-150 ease-in-out"
-									:class="{
-										'bg-brand font-bold text-brand-inverted': selectedValue === item.option,
-										'bg-bg-raised': focusedOptionIndex === item.index,
-										'rounded-b-xl': item.index === props.options.length - 1 && !isRenderingUp,
-										'rounded-t-xl': item.index === 0 && isRenderingUp,
-									}"
-									@click="selectOption(item.option, item.index)"
-									@mousemove="focusedOptionIndex = item.index"
-								>
-									{{ displayName(item.option) }}
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</transition>
-		</Teleport>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { DropdownIcon } from '@modrinth/assets'
-import type { CSSProperties } from 'vue'
-import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
-
-const ITEM_HEIGHT = 44
-const BUFFER_ITEMS = 5
-
-type OptionValue = string | number | Record<string, any>
-
-interface Props {
-	options: OptionValue[]
-	name: string
-	defaultValue?: OptionValue | null
-	placeholder?: string | number | null
-	modelValue?: OptionValue | null
-	renderUp?: boolean
-	disabled?: boolean
-	displayName?: (option: OptionValue) => string
-}
-
-const props = withDefaults(defineProps<Props>(), {
-	defaultValue: null,
-	placeholder: null,
-	modelValue: null,
-	renderUp: false,
-	disabled: false,
-	displayName: (option: OptionValue) => String(option),
-})
-
-const emit = defineEmits<{
-	(e: 'input' | 'update:modelValue', value: OptionValue): void
-	(e: 'change', value: { option: OptionValue; index: number }): void
-}>()
-
-const dropdownVisible = ref(false)
-const selectedValue = ref<OptionValue | null>(props.modelValue || props.defaultValue)
-const focusedOptionIndex = ref<number | null>(null)
-const optionsContainer = ref<HTMLElement | null>(null)
-const scrollTop = ref(0)
-const isRenderingUp = ref(false)
-const virtualListHeight = ref(300)
-const isOpen = ref(false)
-const openDropdownCount = ref(0)
-const listboxId = `pyro-listbox-${Math.random().toString(36).substring(2, 11)}`
-const triggerRef = ref<HTMLButtonElement | null>(null)
-
-const positionStyle = ref<CSSProperties>({
-	position: 'fixed',
-	top: '0px',
-	left: '0px',
-	width: '0px',
-	zIndex: 999,
-})
-
-const totalHeight = computed(() => props.options.length * ITEM_HEIGHT)
-
-const visibleOptions = computed(() => {
-	const startIndex = Math.floor(scrollTop.value / ITEM_HEIGHT) - BUFFER_ITEMS
-	const visibleCount = Math.ceil(virtualListHeight.value / ITEM_HEIGHT) + 2 * BUFFER_ITEMS
-
-	return Array.from({ length: visibleCount }, (_, i) => {
-		const index = startIndex + i
-		if (index >= 0 && index < props.options.length) {
-			return {
-				index,
-				option: props.options[index],
-			}
-		}
-		return null
-	}).filter((item): item is { index: number; option: OptionValue } => item !== null)
-})
-
-const selectedOption = computed(() => {
-	if (selectedValue.value !== null && selectedValue.value !== undefined) {
-		return props.displayName(selectedValue.value as OptionValue)
-	}
-	return props.placeholder || 'Select an option'
-})
-
-const radioValue = computed<OptionValue>({
-	get() {
-		return props.modelValue ?? selectedValue.value ?? ''
-	},
-	set(newValue: OptionValue) {
-		emit('update:modelValue', newValue)
-		selectedValue.value = newValue
-	},
-})
-
-const triggerClasses = computed(() => ({
-	'!cursor-not-allowed opacity-50 grayscale': props.disabled,
-	'rounded-b-none': dropdownVisible.value && !isRenderingUp.value && !props.disabled,
-	'rounded-t-none': dropdownVisible.value && isRenderingUp.value && !props.disabled,
-}))
-
-const updatePosition = async () => {
-	if (!triggerRef.value) return
-
-	await nextTick()
-	const triggerRect = triggerRef.value.getBoundingClientRect()
-	const viewportHeight = window.innerHeight
-	const margin = 8
-
-	const contentHeight = props.options.length * ITEM_HEIGHT
-	const preferredHeight = Math.min(contentHeight, 300)
-
-	const spaceBelow = viewportHeight - triggerRect.bottom
-	const spaceAbove = triggerRect.top
-
-	isRenderingUp.value = spaceBelow < preferredHeight && spaceAbove > spaceBelow
-
-	virtualListHeight.value = isRenderingUp.value
-		? Math.min(spaceAbove - margin, preferredHeight)
-		: Math.min(spaceBelow - margin, preferredHeight)
-
-	positionStyle.value = {
-		position: 'fixed',
-		left: `${triggerRect.left}px`,
-		width: `${triggerRect.width}px`,
-		zIndex: 999,
-		...(isRenderingUp.value
-			? { bottom: `${viewportHeight - triggerRect.top}px`, top: 'auto' }
-			: { top: `${triggerRect.bottom}px`, bottom: 'auto' }),
-	}
-}
-
-const toggleDropdown = () => {
-	if (!props.disabled) {
-		if (dropdownVisible.value) {
-			closeDropdown()
-		} else {
-			openDropdown()
-		}
-	}
-}
-
-const handleResize = () => {
-	if (dropdownVisible.value) {
-		requestAnimationFrame(() => {
-			updatePosition()
-		})
-	}
-}
-
-const handleScroll = (event: Event) => {
-	const target = event.target as HTMLElement
-	scrollTop.value = target.scrollTop
-}
-
-const closeAllDropdowns = () => {
-	const event = new CustomEvent('close-all-dropdowns')
-	window.dispatchEvent(event)
-}
-
-const selectOption = (option: OptionValue, index: number) => {
-	radioValue.value = option
-	emit('change', { option, index })
-	closeDropdown()
-}
-
-const focusNextOption = () => {
-	if (focusedOptionIndex.value === null) {
-		focusedOptionIndex.value = 0
-	} else {
-		focusedOptionIndex.value = (focusedOptionIndex.value + 1) % props.options.length
-	}
-	scrollToFocused()
-}
-
-const focusPreviousOption = () => {
-	if (focusedOptionIndex.value === null) {
-		focusedOptionIndex.value = props.options.length - 1
-	} else {
-		focusedOptionIndex.value =
-			(focusedOptionIndex.value - 1 + props.options.length) % props.options.length
-	}
-	scrollToFocused()
-}
-
-const scrollToFocused = () => {
-	if (focusedOptionIndex.value === null) return
-
-	const optionsElement = optionsContainer.value?.querySelector('.overflow-y-auto')
-	if (!optionsElement) return
-
-	const targetScrollTop = focusedOptionIndex.value * ITEM_HEIGHT
-	const scrollBottom = optionsElement.clientHeight
-
-	if (targetScrollTop < optionsElement.scrollTop) {
-		optionsElement.scrollTop = targetScrollTop
-	} else if (targetScrollTop + ITEM_HEIGHT > optionsElement.scrollTop + scrollBottom) {
-		optionsElement.scrollTop = targetScrollTop - scrollBottom + ITEM_HEIGHT
-	}
-}
-
-const openDropdown = async () => {
-	if (!props.disabled) {
-		closeAllDropdowns()
-		dropdownVisible.value = true
-		isOpen.value = true
-		openDropdownCount.value++
-		document.body.style.overflow = 'hidden'
-		await updatePosition()
-
-		nextTick(() => {
-			optionsContainer.value?.focus()
-		})
-	}
-}
-
-const closeDropdown = () => {
-	if (isOpen.value) {
-		dropdownVisible.value = false
-		isOpen.value = false
-		openDropdownCount.value--
-		if (openDropdownCount.value === 0) {
-			document.body.style.overflow = ''
-		}
-		focusedOptionIndex.value = null
-		triggerRef.value?.focus()
-	}
-}
-
-const handleTriggerKeyDown = (event: KeyboardEvent) => {
-	switch (event.key) {
-		case 'ArrowDown':
-		case 'ArrowUp':
-			event.preventDefault()
-			if (!dropdownVisible.value) {
-				openDropdown()
-				focusedOptionIndex.value = event.key === 'ArrowUp' ? props.options.length - 1 : 0
-			} else if (event.key === 'ArrowDown') {
-				focusNextOption()
-			} else {
-				focusPreviousOption()
-			}
-			break
-		case 'Enter':
-		case ' ':
-			event.preventDefault()
-			if (!dropdownVisible.value) {
-				openDropdown()
-				focusedOptionIndex.value = 0
-			} else if (focusedOptionIndex.value !== null) {
-				selectOption(props.options[focusedOptionIndex.value], focusedOptionIndex.value)
-			}
-			break
-		case 'Escape':
-			event.preventDefault()
-			closeDropdown()
-			break
-		case 'Tab':
-			if (dropdownVisible.value) {
-				event.preventDefault()
-			}
-			break
-	}
-}
-
-const handleListboxKeyDown = (event: KeyboardEvent) => {
-	switch (event.key) {
-		case 'Enter':
-		case ' ':
-			event.preventDefault()
-			if (focusedOptionIndex.value !== null) {
-				selectOption(props.options[focusedOptionIndex.value], focusedOptionIndex.value)
-			}
-			break
-		case 'ArrowDown':
-			event.preventDefault()
-			focusNextOption()
-			break
-		case 'ArrowUp':
-			event.preventDefault()
-			focusPreviousOption()
-			break
-		case 'Escape':
-			event.preventDefault()
-			closeDropdown()
-			break
-		case 'Tab':
-			event.preventDefault()
-			break
-		case 'Home':
-			event.preventDefault()
-			focusedOptionIndex.value = 0
-			scrollToFocused()
-			break
-		case 'End':
-			event.preventDefault()
-			focusedOptionIndex.value = props.options.length - 1
-			scrollToFocused()
-			break
-		default:
-			if (event.key.length === 1) {
-				const char = event.key.toLowerCase()
-				const index = props.options.findIndex((option) =>
-					props.displayName(option).toLowerCase().startsWith(char),
-				)
-				if (index !== -1) {
-					focusedOptionIndex.value = index
-					scrollToFocused()
-				}
-			}
-			break
-	}
-}
-
-onMounted(() => {
-	window.addEventListener('resize', handleResize)
-	window.addEventListener('scroll', handleResize, true)
-	window.addEventListener('click', (event) => {
-		if (!isChildOfDropdown(event.target as HTMLElement)) {
-			closeDropdown()
-		}
-	})
-	window.addEventListener('close-all-dropdowns', closeDropdown)
-
-	if (selectedValue.value) {
-		focusedOptionIndex.value = props.options.findIndex((option) => option === selectedValue.value)
-	}
-})
-
-onUnmounted(() => {
-	window.removeEventListener('resize', handleResize)
-	window.removeEventListener('scroll', handleResize, true)
-	window.removeEventListener('click', (event) => {
-		if (!isChildOfDropdown(event.target as HTMLElement)) {
-			closeDropdown()
-		}
-	})
-	window.removeEventListener('close-all-dropdowns', closeDropdown)
-
-	if (isOpen.value) {
-		openDropdownCount.value--
-		if (openDropdownCount.value === 0) {
-			document.body.style.overflow = ''
-		}
-	}
-})
-
-watch(
-	() => props.modelValue,
-	(newValue) => {
-		selectedValue.value = newValue
-	},
-)
-
-watch(dropdownVisible, async (newValue) => {
-	if (newValue) {
-		await updatePosition()
-		scrollTop.value = 0
-	}
-})
-
-const activeDescendant = computed(() =>
-	focusedOptionIndex.value !== null ? `${listboxId}-option-${focusedOptionIndex.value}` : undefined,
-)
-
-const isChildOfDropdown = (element: HTMLElement | null): boolean => {
-	let currentNode: HTMLElement | null = element
-	while (currentNode) {
-		if (currentNode === triggerRef.value || currentNode === optionsContainer.value) {
-			return true
-		}
-		currentNode = currentNode.parentElement
-	}
-	return false
-}
-</script>
diff --git a/apps/frontend/src/composables/country.ts b/apps/frontend/src/composables/country.ts
index a47cf47f..06e55dbe 100644
--- a/apps/frontend/src/composables/country.ts
+++ b/apps/frontend/src/composables/country.ts
@@ -1,5 +1,39 @@
+import { useGeneratedState } from '@/composables/generated.ts'
 import { useRequestHeaders, useState } from '#imports'
 
+export const useCountries = () => {
+	const generated = useGeneratedState()
+	return computed(() => generated.value.countries ?? [])
+}
+
+export const useFormattedCountries = () => {
+	const countries = useCountries()
+
+	return computed(() =>
+		countries.value.map((country) => {
+			let label = country.nameShort
+
+			if (country.alpha2 === 'TW') {
+				label = 'Taiwan'
+			} else if (country.nameShort.length > 30) {
+				label = `${country.nameShort} (${country.alpha2})`
+			}
+
+			return {
+				value: country.alpha2,
+				label,
+			}
+		}),
+	)
+}
+
+export const useSubdivisions = (countryCode: ComputedRef<string> | Ref<string> | string) => {
+	const generated = useGeneratedState()
+	const code = isRef(countryCode) ? countryCode : ref(countryCode)
+
+	return computed(() => generated.value.subdivisions?.[unref(code)] ?? [])
+}
+
 export const useUserCountry = () => {
 	const country = useState<string>('userCountry', () => 'US')
 	const fromServer = useState<boolean>('userCountryFromServer', () => false)
diff --git a/apps/frontend/src/composables/featureFlags.ts b/apps/frontend/src/composables/featureFlags.ts
index 2eb9a93d..6951fd42 100644
--- a/apps/frontend/src/composables/featureFlags.ts
+++ b/apps/frontend/src/composables/featureFlags.ts
@@ -19,6 +19,7 @@ const validateValues = <K extends PropertyKey>(flags: Record<K, FlagValue>) => f
 export const DEFAULT_FEATURE_FLAGS = validateValues({
 	// Developer flags
 	developerMode: false,
+	demoMode: false,
 	showVersionFilesInTable: false,
 	showAdsWithPlus: false,
 	alwaysShowChecklistAsPopup: true,
diff --git a/apps/frontend/src/composables/generated.ts b/apps/frontend/src/composables/generated.ts
new file mode 100644
index 00000000..cd7415af
--- /dev/null
+++ b/apps/frontend/src/composables/generated.ts
@@ -0,0 +1,146 @@
+import generatedState from '~/generated/state.json'
+
+export interface ProjectType {
+	actual: string
+	id: string
+	display: string
+}
+
+export interface LoaderData {
+	pluginLoaders: string[]
+	pluginPlatformLoaders: string[]
+	allPluginLoaders: string[]
+	dataPackLoaders: string[]
+	modLoaders: string[]
+	hiddenModLoaders: string[]
+}
+
+export interface Country {
+	alpha2: string
+	alpha3: string
+	numeric: string
+	nameShort: string
+	nameLong: string
+}
+
+export interface Subdivision {
+	code: string // Full ISO 3166-2 code (e.g., "US-NY")
+	name: string // Official name in local language
+	localVariant: string | null // English variant if different
+	category: string // STATE, PROVINCE, REGION, etc.
+	parent: string | null // Parent subdivision code
+	language: string // Language code
+}
+
+export interface GeneratedState {
+	categories: any[]
+	loaders: any[]
+	gameVersions: any[]
+	donationPlatforms: any[]
+	reportTypes: any[]
+	muralBankDetails: Record<
+		string,
+		{
+			bankNames: string[]
+		}
+	>
+	countries: Country[]
+	subdivisions: Record<string, Subdivision[]>
+
+	projectTypes: ProjectType[]
+	loaderData: LoaderData
+	projectViewModes: string[]
+	approvedStatuses: string[]
+	rejectedStatuses: string[]
+	staffRoles: string[]
+
+	homePageProjects?: any[]
+	homePageSearch?: any
+	homePageNotifs?: any
+	products?: any[]
+
+	// Metadata
+	lastGenerated?: string
+	apiUrl?: string
+	errors?: number[]
+}
+
+/**
+ * Composable for accessing the complete generated state.
+ * This includes both fetched data and runtime-defined constants.
+ */
+export const useGeneratedState = () =>
+	useState<GeneratedState>('generatedState', () => ({
+		categories: generatedState.categories ?? [],
+		loaders: generatedState.loaders ?? [],
+		gameVersions: generatedState.gameVersions ?? [],
+		donationPlatforms: generatedState.donationPlatforms ?? [],
+		reportTypes: generatedState.reportTypes ?? [],
+		muralBankDetails: generatedState.muralBankDetails ?? null,
+		countries: generatedState.countries ?? [],
+		subdivisions: generatedState.subdivisions ?? {},
+
+		projectTypes: [
+			{
+				actual: 'mod',
+				id: 'mod',
+				display: 'mod',
+			},
+			{
+				actual: 'mod',
+				id: 'plugin',
+				display: 'plugin',
+			},
+			{
+				actual: 'mod',
+				id: 'datapack',
+				display: 'data pack',
+			},
+			{
+				actual: 'shader',
+				id: 'shader',
+				display: 'shader',
+			},
+			{
+				actual: 'resourcepack',
+				id: 'resourcepack',
+				display: 'resource pack',
+			},
+			{
+				actual: 'modpack',
+				id: 'modpack',
+				display: 'modpack',
+			},
+		],
+		loaderData: {
+			pluginLoaders: ['bukkit', 'spigot', 'paper', 'purpur', 'sponge', 'folia'],
+			pluginPlatformLoaders: ['bungeecord', 'waterfall', 'velocity'],
+			allPluginLoaders: [
+				'bukkit',
+				'spigot',
+				'paper',
+				'purpur',
+				'sponge',
+				'bungeecord',
+				'waterfall',
+				'velocity',
+				'folia',
+			],
+			dataPackLoaders: ['datapack'],
+			modLoaders: ['forge', 'fabric', 'quilt', 'liteloader', 'modloader', 'rift', 'neoforge'],
+			hiddenModLoaders: ['liteloader', 'modloader', 'rift'],
+		},
+		projectViewModes: ['list', 'grid', 'gallery'],
+		approvedStatuses: ['approved', 'archived', 'unlisted', 'private'],
+		rejectedStatuses: ['rejected', 'withheld'],
+		staffRoles: ['moderator', 'admin'],
+
+		homePageProjects: generatedState.homePageProjects,
+		homePageSearch: generatedState.homePageSearch,
+		homePageNotifs: generatedState.homePageNotifs,
+		products: generatedState.products,
+
+		lastGenerated: generatedState.lastGenerated,
+		apiUrl: generatedState.apiUrl,
+		errors: generatedState.errors,
+	}))
diff --git a/apps/frontend/src/composables/tag.js b/apps/frontend/src/composables/tag.js
deleted file mode 100644
index 229dd8f2..00000000
--- a/apps/frontend/src/composables/tag.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import tags from '~/generated/state.json'
-
-export const useTags = () =>
-	useState('tags', () => ({
-		categories: tags.categories,
-		loaders: tags.loaders,
-		gameVersions: tags.gameVersions,
-		donationPlatforms: tags.donationPlatforms,
-		reportTypes: tags.reportTypes,
-		projectTypes: [
-			{
-				actual: 'mod',
-				id: 'mod',
-				display: 'mod',
-			},
-			{
-				actual: 'mod',
-				id: 'plugin',
-				display: 'plugin',
-			},
-			{
-				actual: 'mod',
-				id: 'datapack',
-				display: 'data pack',
-			},
-			{
-				actual: 'shader',
-				id: 'shader',
-				display: 'shader',
-			},
-			{
-				actual: 'resourcepack',
-				id: 'resourcepack',
-				display: 'resource pack',
-			},
-			{
-				actual: 'modpack',
-				id: 'modpack',
-				display: 'modpack',
-			},
-		],
-		loaderData: {
-			pluginLoaders: ['bukkit', 'spigot', 'paper', 'purpur', 'sponge', 'folia'],
-			pluginPlatformLoaders: ['bungeecord', 'waterfall', 'velocity'],
-			allPluginLoaders: [
-				'bukkit',
-				'spigot',
-				'paper',
-				'purpur',
-				'sponge',
-				'bungeecord',
-				'waterfall',
-				'velocity',
-				'folia',
-			],
-			dataPackLoaders: ['datapack'],
-			modLoaders: ['forge', 'fabric', 'quilt', 'liteloader', 'modloader', 'rift', 'neoforge'],
-			hiddenModLoaders: ['liteloader', 'modloader', 'rift'],
-		},
-		projectViewModes: ['list', 'grid', 'gallery'],
-		approvedStatuses: ['approved', 'archived', 'unlisted', 'private'],
-		rejectedStatuses: ['rejected', 'withheld'],
-		staffRoles: ['moderator', 'admin'],
-	}))
diff --git a/apps/frontend/src/helpers/projects.js b/apps/frontend/src/helpers/projects.js
index 51d94a8d..422545ae 100644
--- a/apps/frontend/src/helpers/projects.js
+++ b/apps/frontend/src/helpers/projects.js
@@ -3,7 +3,7 @@ export const getProjectTypeForUrl = (type, categories) => {
 }
 
 export const getProjectTypeForUrlShorthand = (type, categories, overrideTags) => {
-	const tags = overrideTags ?? useTags().value
+	const tags = overrideTags ?? useGeneratedState().value
 
 	if (type === 'mod') {
 		const isMod = categories.some((category) => {
@@ -87,7 +87,7 @@ export function getVersionsToDisplay(project) {
 }
 
 export function formatVersionsForDisplay(gameVersions, overrideTags) {
-	const tags = overrideTags ?? useTags().value
+	const tags = overrideTags ?? useGeneratedState().value
 
 	const inputVersions = gameVersions.slice()
 	const allVersions = tags.gameVersions.slice()
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index abfefe74..834a08b8 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -552,11 +552,14 @@
 					<template #notifications>
 						<BellIcon aria-hidden="true" /> {{ formatMessage(commonMessages.notificationsLabel) }}
 					</template>
+					<template #reports>
+						<ReportIcon aria-hidden="true" /> {{ formatMessage(messages.activeReports) }}
+					</template>
 					<template #saved>
-						<BookmarkIcon aria-hidden="true" /> {{ formatMessage(messages.savedProjects) }}
+						<LibraryIcon aria-hidden="true" /> {{ formatMessage(commonMessages.collectionsLabel) }}
 					</template>
 					<template #servers>
-						<ServerIcon aria-hidden="true" /> {{ formatMessage(commonMessages.serversLabel) }}
+						<ServerIcon aria-hidden="true" /> {{ formatMessage(messages.myServers) }}
 					</template>
 					<template #plus>
 						<ArrowBigUpDashIcon aria-hidden="true" />
@@ -750,7 +753,9 @@
 				<button
 					class="tab button-animation"
 					:title="formatMessage(messages.toggleMenu)"
-					:aria-label="isMobileMenuOpen ? 'Close menu' : 'Open menu'"
+					:aria-label="
+						isMobileMenuOpen ? formatMessage(messages.closeMenu) : formatMessage(messages.openMenu)
+					"
 					@click="toggleMobileMenu()"
 				>
 					<template v-if="!auth.user">
@@ -825,7 +830,9 @@
 									</template>
 								</IntlFormatted>
 							</p>
-							<p class="m-0">© 2025 Rinth, Inc.</p>
+							<p class="m-0">
+								{{ formatMessage(footerMessages.copyright, { year: currentYear }) }}
+							</p>
 						</div>
 					</div>
 					<div class="mt-4 grid grid-cols-1 gap-6 sm:grid-cols-2 lg:contents">
@@ -869,7 +876,6 @@ import {
 	ArrowBigUpDashIcon,
 	BellIcon,
 	BlueskyIcon,
-	BookmarkIcon,
 	BookTextIcon,
 	BoxIcon,
 	BracesIcon,
@@ -1224,6 +1230,22 @@ const messages = defineMessages({
 		id: 'layout.nav.analytics',
 		defaultMessage: 'Analytics',
 	},
+	activeReports: {
+		id: 'layout.nav.active-reports',
+		defaultMessage: 'Active reports',
+	},
+	myServers: {
+		id: 'layout.nav.my-servers',
+		defaultMessage: 'My servers',
+	},
+	openMenu: {
+		id: 'layout.mobile.open-menu',
+		defaultMessage: 'Open menu',
+	},
+	closeMenu: {
+		id: 'layout.mobile.close-menu',
+		defaultMessage: 'Close menu',
+	},
 })
 
 const footerMessages = defineMessages({
@@ -1236,6 +1258,10 @@ const footerMessages = defineMessages({
 		defaultMessage:
 			'NOT AN OFFICIAL MINECRAFT SERVICE. NOT APPROVED BY OR ASSOCIATED WITH MOJANG OR MICROSOFT.',
 	},
+	copyright: {
+		id: 'layout.footer.copyright',
+		defaultMessage: '© {year} Rinth, Inc.',
+	},
 })
 
 useHead({
@@ -1278,6 +1304,8 @@ useSeoMeta({
 
 const developerModeCounter = ref(0)
 
+const currentYear = new Date().getFullYear()
+
 const isMobileMenuOpen = ref(false)
 const isBrowseMenuOpen = ref(false)
 const navRoutes = computed(() => [
@@ -1320,14 +1348,6 @@ const userMenuOptions = computed(() => {
 			color: 'purple',
 			shown: !flags.value.hidePlusPromoInUserMenu && !isPermission(auth.value.user.badges, 1 << 0),
 		},
-		{
-			id: 'notifications',
-			link: '/dashboard/notifications',
-		},
-		{
-			id: 'saved',
-			link: '/dashboard/collections',
-		},
 		{
 			id: 'servers',
 			link: '/servers/manage',
@@ -1349,6 +1369,21 @@ const userMenuOptions = computed(() => {
 		{
 			divider: true,
 		},
+		{
+			id: 'notifications',
+			link: '/dashboard/notifications',
+		},
+		{
+			id: 'reports',
+			link: '/dashboard/reports',
+		},
+		{
+			id: 'saved',
+			link: '/dashboard/collections',
+		},
+		{
+			divider: true,
+		},
 		{
 			id: 'projects',
 			link: '/dashboard/projects',
@@ -1357,6 +1392,10 @@ const userMenuOptions = computed(() => {
 			id: 'organizations',
 			link: '/dashboard/organizations',
 		},
+		{
+			id: 'analytics',
+			link: '/dashboard/analytics',
+		},
 		{
 			id: 'affiliate-links',
 			link: '/dashboard/affiliate-links',
@@ -1366,10 +1405,6 @@ const userMenuOptions = computed(() => {
 			id: 'revenue',
 			link: '/dashboard/revenue',
 		},
-		{
-			id: 'analytics',
-			link: '/dashboard/analytics',
-		},
 	]
 
 	options = [
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 50eebb06..c3207c08 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -635,6 +635,291 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "Are you a US citizen?"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Complete tax form"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Continue with limit"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Details"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Amount"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "FX rate"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Fee"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Net amount"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Business entity"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "A business entity refers to a registered organization such as a corporation, partnership, or LLC."
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "Are you a withdrawing as an individual or business?"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Private individual"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Select your country"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Search countries..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "Unable to fetch available payment methods. Please try again later."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Failed to load payment methods"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Region"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Some payout methods are not available in certain regions."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Select withdraw method"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "Your withdraw limit is <b>{amount}</b>, <tax-link>complete a tax form</tax-link> to withdraw more."
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Account owner"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Coin"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Confirm your wallet address"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "National ID Number"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "Enter national ID number"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "Passport Number"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "Enter passport number"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
+    "message": "Resident ID Number"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "Enter resident ID number"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "RUC Number"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "Enter RUC number"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "Tax ID Number"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "Enter tax ID number"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Network"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "You're nearing the withdraw threshold. You can withdraw <b>{amountRemaining}</b> now, but a tax form is required for more."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Account"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Disconnect account"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Payment method"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "PayPal account"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Connect your PayPal account to receive payments directly."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Save"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Venmo handle saved successfully!"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Saved"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Sign in with PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "Enter your Venmo handle to receive payments."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Venmo handle"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@username"
+  },
+  "dashboard.creator-withdraw-modal.stage.completion": {
+    "message": "Complete"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Method"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Account Details"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "Verification"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "Tax form"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "Details"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "To withdraw your full <b>{available}</b> available balance please complete the form below. It is required for tax reporting and only needs to be done once."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body-with-limit": {
+    "message": "You must complete a W-9 or W-8 form for Modrinth's tax records so we remain compliant with tax regulations."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.header": {
+    "message": "Tax form required"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Payment method"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward": {
+    "message": "Reward"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "Select reward"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
+    "message": "Rewards"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "Unverified email"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message": {
+    "message": "The delivery email you have entered is not associated with your Modrinth account. Modrinth cannot recover rewards sent to an incorrect email address."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
+    "message": "Lower fees available"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message": {
+    "message": "You selected USD for PayPal International. <direct-paypal-link>Switch to direct PayPal</direct-paypal-link> for better fees (≈2% instead of ≈6%)."
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Withdraw"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit": {
+    "message": "Withdraw limit"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit-used": {
+    "message": "You've used up your <b>{withdrawLimit}</b> withdrawal limit. You must complete a tax form to withdraw more."
+  },
+  "dashboard.revenue.available-now": {
+    "message": "Available now"
+  },
+  "dashboard.revenue.balance": {
+    "message": "Balance"
+  },
+  "dashboard.revenue.estimated-tooltip.msg1": {
+    "message": "Estimated revenue may be subject to change until it is made available."
+  },
+  "dashboard.revenue.estimated-tooltip.msg2": {
+    "message": "Click to read about how Modrinth handles your revenue."
+  },
+  "dashboard.revenue.estimated-with-date": {
+    "message": "Estimated {date}"
+  },
+  "dashboard.revenue.processing": {
+    "message": "Processing"
+  },
+  "dashboard.revenue.processing.tooltip": {
+    "message": "Revenue stays in processing until the end of the month, then becomes available 60 days later."
+  },
+  "dashboard.revenue.tos": {
+    "message": "By uploading projects to Modrinth and withdrawing money from your account, you agree to our <terms-link>Rewards Program Terms</terms-link>. Learn more about the <info-link>Reward Program</info-link>."
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "Transactions"
+  },
+  "dashboard.revenue.transactions.none": {
+    "message": "No transactions"
+  },
+  "dashboard.revenue.transactions.none.desc": {
+    "message": "Your payouts and withdrawals will appear here."
+  },
+  "dashboard.revenue.transactions.see-all": {
+    "message": "See all"
+  },
+  "dashboard.revenue.withdraw.blocked-tin-mismatch": {
+    "message": "Your withdrawals are temporarily locked because your TIN or SSN didn't match IRS records. Please contact support to reset and resubmit your tax form."
+  },
+  "dashboard.revenue.withdraw.card.description": {
+    "message": "Withdraw from your available balance to any payout method."
+  },
+  "dashboard.revenue.withdraw.card.title": {
+    "message": "Withdraw"
+  },
+  "dashboard.revenue.withdraw.header": {
+    "message": "Withdraw"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "Account"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Amount"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Close"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Date"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "You'll receive an email at <b>{email}</b> with instructions to redeem your withdrawal."
+  },
+  "dashboard.withdraw.completion.exchange-rate": {
+    "message": "Exchange rate"
+  },
+  "dashboard.withdraw.completion.fee": {
+    "message": "Fee"
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "Method"
+  },
+  "dashboard.withdraw.completion.net-amount": {
+    "message": "Net amount"
+  },
+  "dashboard.withdraw.completion.recipient": {
+    "message": "Recipient"
+  },
+  "dashboard.withdraw.completion.title": {
+    "message": "Withdraw complete"
+  },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "Transactions"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "Wallet"
+  },
   "error.collection.404.list_item.1": {
     "message": "You may have mistyped the collection's URL."
   },
@@ -986,6 +1271,9 @@
   "layout.footer.about.status": {
     "message": "Status"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "Legal"
   },
@@ -1064,6 +1352,15 @@
   "layout.meta.og-description": {
     "message": "Discover and publish Minecraft content!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Close menu"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Open menu"
+  },
+  "layout.nav.active-reports": {
+    "message": "Active reports"
+  },
   "layout.nav.analytics": {
     "message": "Analytics"
   },
@@ -1091,6 +1388,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Modrinth home page"
   },
+  "layout.nav.my-servers": {
+    "message": "My servers"
+  },
   "layout.nav.organizations": {
     "message": "Organizations"
   },
@@ -1136,6 +1436,273 @@
   "moderation.technical.search.placeholder": {
     "message": "Search tech reviews..."
   },
+  "muralpay.account-type.checking": {
+    "message": "Checking"
+  },
+  "muralpay.account-type.savings": {
+    "message": "Savings"
+  },
+  "muralpay.country.at": {
+    "message": "Austria"
+  },
+  "muralpay.country.be": {
+    "message": "Belgium"
+  },
+  "muralpay.country.cy": {
+    "message": "Cyprus"
+  },
+  "muralpay.country.de": {
+    "message": "Germany"
+  },
+  "muralpay.country.ee": {
+    "message": "Estonia"
+  },
+  "muralpay.country.es": {
+    "message": "Spain"
+  },
+  "muralpay.country.fi": {
+    "message": "Finland"
+  },
+  "muralpay.country.fr": {
+    "message": "France"
+  },
+  "muralpay.country.gr": {
+    "message": "Greece"
+  },
+  "muralpay.country.ie": {
+    "message": "Ireland"
+  },
+  "muralpay.country.it": {
+    "message": "Italy"
+  },
+  "muralpay.country.lt": {
+    "message": "Lithuania"
+  },
+  "muralpay.country.lu": {
+    "message": "Luxembourg"
+  },
+  "muralpay.country.lv": {
+    "message": "Latvia"
+  },
+  "muralpay.country.mt": {
+    "message": "Malta"
+  },
+  "muralpay.country.nl": {
+    "message": "Netherlands"
+  },
+  "muralpay.country.pt": {
+    "message": "Portugal"
+  },
+  "muralpay.country.sk": {
+    "message": "Slovakia"
+  },
+  "muralpay.document-type.national-id": {
+    "message": "National ID"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Passport"
+  },
+  "muralpay.document-type.resident-id": {
+    "message": "Resident ID"
+  },
+  "muralpay.document-type.ruc": {
+    "message": "RUC"
+  },
+  "muralpay.document-type.tax-id": {
+    "message": "Tax ID"
+  },
+  "muralpay.field.account-number": {
+    "message": "Account Number"
+  },
+  "muralpay.field.account-number-cbu-cvu": {
+    "message": "Account Number (CBU/CVU)"
+  },
+  "muralpay.field.account-number-cci": {
+    "message": "Account Number (CCI)"
+  },
+  "muralpay.field.account-number-type": {
+    "message": "Account Number Type"
+  },
+  "muralpay.field.account-type": {
+    "message": "Account Type"
+  },
+  "muralpay.field.bank-account-number": {
+    "message": "Account Number"
+  },
+  "muralpay.field.branch-code": {
+    "message": "Branch Code"
+  },
+  "muralpay.field.clabe": {
+    "message": "CLABE"
+  },
+  "muralpay.field.country": {
+    "message": "Country"
+  },
+  "muralpay.field.cpf-cnpj": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.field.cuit-cuil": {
+    "message": "CUIT/CUIL"
+  },
+  "muralpay.field.document-type": {
+    "message": "Document Type"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.field.phone-number": {
+    "message": "Phone Number"
+  },
+  "muralpay.field.pix-email": {
+    "message": "PIX Email"
+  },
+  "muralpay.field.pix-key-type": {
+    "message": "PIX Key Type"
+  },
+  "muralpay.field.pix-phone": {
+    "message": "PIX Phone"
+  },
+  "muralpay.field.routing-number": {
+    "message": "Routing Number"
+  },
+  "muralpay.field.swift-bic": {
+    "message": "SWIFT/BIC"
+  },
+  "muralpay.field.wallet-address": {
+    "message": "Wallet Address"
+  },
+  "muralpay.help.cbu-cvu": {
+    "message": "Clave Bancaria Uniforme or Clave Virtual Uniforme"
+  },
+  "muralpay.help.cci": {
+    "message": "Código de Cuenta Interbancaria"
+  },
+  "muralpay.help.clabe": {
+    "message": "Clave Bancaria Estandarizada (Mexican bank account number)"
+  },
+  "muralpay.help.cpf-cnpj": {
+    "message": "Brazilian tax identification number"
+  },
+  "muralpay.help.cuit-cuil": {
+    "message": "Argentine tax ID"
+  },
+  "muralpay.help.iban": {
+    "message": "International Bank Account Number"
+  },
+  "muralpay.help.swift-bic": {
+    "message": "Bank Identifier Code"
+  },
+  "muralpay.pix-type.bank-account": {
+    "message": "Bank Account"
+  },
+  "muralpay.pix-type.document": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.pix-type.email": {
+    "message": "Email"
+  },
+  "muralpay.pix-type.phone": {
+    "message": "Phone Number"
+  },
+  "muralpay.placeholder.account-number": {
+    "message": "Enter account number"
+  },
+  "muralpay.placeholder.cbu-cvu": {
+    "message": "Enter CBU or CVU"
+  },
+  "muralpay.placeholder.cbu-cvu-type": {
+    "message": "CBU or CVU"
+  },
+  "muralpay.placeholder.cci": {
+    "message": "Enter 20-digit CCI"
+  },
+  "muralpay.placeholder.cuit-cuil": {
+    "message": "Enter CUIT or CUIL"
+  },
+  "muralpay.placeholder.enter-account-number": {
+    "message": "Enter account number"
+  },
+  "muralpay.placeholder.enter-branch-code": {
+    "message": "Enter branch code"
+  },
+  "muralpay.placeholder.enter-clabe": {
+    "message": "Enter 18-digit CLABE"
+  },
+  "muralpay.placeholder.enter-cpf-cnpj": {
+    "message": "Enter CPF or CNPJ"
+  },
+  "muralpay.placeholder.enter-iban": {
+    "message": "Enter IBAN"
+  },
+  "muralpay.placeholder.enter-pix-email": {
+    "message": "Enter PIX email"
+  },
+  "muralpay.placeholder.enter-routing-number": {
+    "message": "Enter 9-digit routing number"
+  },
+  "muralpay.placeholder.enter-swift-bic": {
+    "message": "Enter SWIFT/BIC code"
+  },
+  "muralpay.placeholder.iban-crc": {
+    "message": "Enter Costa Rican IBAN"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
+  "muralpay.rail.fiat-ars.name": {
+    "message": "Bank Transfer (ARS)"
+  },
+  "muralpay.rail.fiat-brl.name": {
+    "message": "PIX Transfer (BRL)"
+  },
+  "muralpay.rail.fiat-clp.name": {
+    "message": "Bank Transfer (CLP)"
+  },
+  "muralpay.rail.fiat-cop.name": {
+    "message": "Bank Transfer (COP)"
+  },
+  "muralpay.rail.fiat-crc.name": {
+    "message": "Bank Transfer (CRC)"
+  },
+  "muralpay.rail.fiat-eur.name": {
+    "message": "Bank Transfer (EUR)"
+  },
+  "muralpay.rail.fiat-mxn.name": {
+    "message": "Bank Transfer (MXN)"
+  },
+  "muralpay.rail.fiat-pen.name": {
+    "message": "Bank Transfer (PEN)"
+  },
+  "muralpay.rail.fiat-usd-peru.name": {
+    "message": "Bank Transfer (USD - Peru)"
+  },
+  "muralpay.rail.fiat-usd.name": {
+    "message": "Bank Transfer (USD)"
+  },
+  "muralpay.rail.fiat-zar.name": {
+    "message": "Bank Transfer (ZAR)"
+  },
+  "muralpay.rail.usdc-base.name": {
+    "message": "USDC (Base)"
+  },
+  "muralpay.rail.usdc-celo.name": {
+    "message": "USDC (Celo)"
+  },
+  "muralpay.rail.usdc-ethereum.name": {
+    "message": "USDC (Ethereum)"
+  },
+  "muralpay.rail.usdc-polygon.name": {
+    "message": "Crypto (USDC)"
+  },
+  "muralpay.warning.wallet-address": {
+    "message": "Double-check your wallet address. Funds sent to an incorrect address cannot be recovered."
+  },
   "profile.bio.fallback.creator": {
     "message": "A Modrinth creator."
   },
@@ -1691,18 +2258,6 @@
   "report.submit": {
     "message": "Submit report"
   },
-  "revenue.transfers.total": {
-    "message": "You have withdrawn {amount} in total."
-  },
-  "revenue.transfers.total.method": {
-    "message": "You have withdrawn {amount} through {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "You have withdrawn {amount} in {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "You have withdrawn {amount} in {year} through {method}."
-  },
   "scopes.analytics.description": {
     "message": "Access your analytics data"
   },
diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index ff480bfb..54b1c6b3 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -1032,7 +1032,7 @@ const { addNotification } = notifications
 const auth = await useAuth()
 const user = await useUser()
 
-const tags = useTags()
+const tags = useGeneratedState()
 const flags = useFeatureFlags()
 const cosmetics = useCosmetics()
 
diff --git a/apps/frontend/src/pages/[type]/[id]/changelog.vue b/apps/frontend/src/pages/[type]/[id]/changelog.vue
index ba4a9ad6..4dced874 100644
--- a/apps/frontend/src/pages/[type]/[id]/changelog.vue
+++ b/apps/frontend/src/pages/[type]/[id]/changelog.vue
@@ -112,7 +112,7 @@ useSeoMeta({
 
 const router = useNativeRouter()
 const route = useNativeRoute()
-const tags = useTags()
+const tags = useGeneratedState()
 
 const currentPage = ref(Number(route.query.page ?? 1))
 const filteredVersions = computed(() => {
diff --git a/apps/frontend/src/pages/[type]/[id]/settings.vue b/apps/frontend/src/pages/[type]/[id]/settings.vue
index 99c7c33a..948abe5c 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings.vue
@@ -14,9 +14,9 @@ import {
 import { commonMessages, commonProjectSettingsMessages } from '@modrinth/ui'
 import type { Project, ProjectV3Partial } from '@modrinth/utils'
 import { useVIntl } from '@vintl/vintl'
+import { computed } from 'vue'
 
 import NavStack from '~/components/ui/NavStack.vue'
-import NavStackItem from '~/components/ui/NavStackItem.vue'
 
 const { formatMessage } = useVIntl()
 
@@ -38,106 +38,85 @@ const members = defineModel<any>('members')
 const allMembers = defineModel<any>('allMembers')
 const dependencies = defineModel<any>('dependencies')
 const organization = defineModel<any>('organization')
+
+const navItems = computed(() => {
+	const base = `${project.value.project_type}/${project.value.slug ? project.value.slug : project.value.id}`
+	const items = [
+		{
+			link: `/${base}/settings`,
+			label: formatMessage(commonProjectSettingsMessages.general),
+			icon: InfoIcon,
+		},
+		flags.value.newProjectGeneralSettings
+			? {
+					link: `/${base}/settings/general`,
+					label: formatMessage(commonProjectSettingsMessages.general),
+					badge: formatMessage(commonMessages.newBadge),
+					icon: InfoIcon,
+				}
+			: null,
+		flags.value.newProjectEnvironmentSettings &&
+		projectV3.value.project_types.some((type: string) => ['mod', 'modpack'].includes(type))
+			? {
+					link: `/${base}/settings/environment`,
+					label: formatMessage(commonProjectSettingsMessages.environment),
+					badge: formatMessage(commonMessages.newBadge),
+					icon: GlobeIcon,
+				}
+			: null,
+		{
+			link: `/${base}/settings/tags`,
+			label: formatMessage(commonProjectSettingsMessages.tags),
+			icon: TagsIcon,
+		},
+		{
+			link: `/${base}/settings/description`,
+			label: formatMessage(commonProjectSettingsMessages.description),
+			icon: AlignLeftIcon,
+		},
+		{
+			link: `/${base}/settings/license`,
+			label: formatMessage(commonProjectSettingsMessages.license),
+			icon: BookTextIcon,
+		},
+		{
+			link: `/${base}/settings/links`,
+			label: formatMessage(commonProjectSettingsMessages.links),
+			icon: LinkIcon,
+		},
+		{
+			link: `/${base}/settings/members`,
+			label: formatMessage(commonProjectSettingsMessages.members),
+			icon: UsersIcon,
+		},
+		{ type: 'heading', label: formatMessage(commonProjectSettingsMessages.view) },
+		{
+			link: `/${base}/settings/analytics`,
+			label: formatMessage(commonProjectSettingsMessages.analytics),
+			icon: ChartIcon,
+			chevron: true,
+		},
+		{ type: 'heading', label: formatMessage(commonProjectSettingsMessages.upload) },
+		{
+			link: `/${base}/gallery`,
+			label: formatMessage(commonProjectSettingsMessages.gallery),
+			icon: ImageIcon,
+			chevron: true,
+		},
+		{
+			link: `/${base}/versions`,
+			label: formatMessage(commonProjectSettingsMessages.versions),
+			icon: VersionIcon,
+			chevron: true,
+		},
+	]
+	return items.filter(Boolean) as any[]
+})
 </script>
 <template>
 	<div class="experimental-styles-within grid gap-4 lg:grid-cols-[1fr_3fr]">
 		<div>
-			<aside class="universal-card">
-				<NavStack>
-					<NavStackItem
-						:link="`/${project.project_type}/${project.slug ? project.slug : project.id}/settings`"
-						:label="formatMessage(commonProjectSettingsMessages.general)"
-					>
-						<InfoIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem
-						v-if="flags.newProjectGeneralSettings"
-						:link="`/${project.project_type}/${project.slug ? project.slug : project.id}/settings/general`"
-						:label="formatMessage(commonProjectSettingsMessages.general)"
-						:badge="formatMessage(commonMessages.newBadge)"
-					>
-						<InfoIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem
-						v-if="
-							flags.newProjectEnvironmentSettings &&
-							projectV3.project_types.some((type) => ['mod', 'modpack'].includes(type))
-						"
-						:link="`/${project.project_type}/${
-							project.slug ? project.slug : project.id
-						}/settings/environment`"
-						:label="formatMessage(commonProjectSettingsMessages.environment)"
-						:badge="formatMessage(commonMessages.newBadge)"
-					>
-						<GlobeIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem
-						:link="`/${project.project_type}/${
-							project.slug ? project.slug : project.id
-						}/settings/tags`"
-						:label="formatMessage(commonProjectSettingsMessages.tags)"
-					>
-						<TagsIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem
-						:link="`/${project.project_type}/${
-							project.slug ? project.slug : project.id
-						}/settings/description`"
-						:label="formatMessage(commonProjectSettingsMessages.description)"
-					>
-						<AlignLeftIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem
-						:link="`/${project.project_type}/${
-							project.slug ? project.slug : project.id
-						}/settings/license`"
-						:label="formatMessage(commonProjectSettingsMessages.license)"
-					>
-						<BookTextIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem
-						:link="`/${project.project_type}/${
-							project.slug ? project.slug : project.id
-						}/settings/links`"
-						:label="formatMessage(commonProjectSettingsMessages.links)"
-					>
-						<LinkIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem
-						:link="`/${project.project_type}/${
-							project.slug ? project.slug : project.id
-						}/settings/members`"
-						:label="formatMessage(commonProjectSettingsMessages.members)"
-					>
-						<UsersIcon aria-hidden="true" />
-					</NavStackItem>
-					<h3>{{ formatMessage(commonProjectSettingsMessages.view) }}</h3>
-					<NavStackItem
-						:link="`/${project.project_type}/${
-							project.slug ? project.slug : project.id
-						}/settings/analytics`"
-						:label="formatMessage(commonProjectSettingsMessages.analytics)"
-						chevron
-					>
-						<ChartIcon aria-hidden="true" />
-					</NavStackItem>
-					<h3>{{ formatMessage(commonProjectSettingsMessages.upload) }}</h3>
-					<NavStackItem
-						:link="`/${project.project_type}/${project.slug ? project.slug : project.id}/gallery`"
-						:label="formatMessage(commonProjectSettingsMessages.gallery)"
-						chevron
-					>
-						<ImageIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem
-						:link="`/${project.project_type}/${project.slug ? project.slug : project.id}/versions`"
-						:label="formatMessage(commonProjectSettingsMessages.versions)"
-						chevron
-					>
-						<VersionIcon aria-hidden="true" />
-					</NavStackItem>
-				</NavStack>
-			</aside>
+			<NavStack :items="navItems" />
 		</div>
 		<div class="min-w-0">
 			<NuxtPage
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/index.vue b/apps/frontend/src/pages/[type]/[id]/settings/index.vue
index 8824d178..6a77e910 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/index.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/index.vue
@@ -300,7 +300,7 @@ const props = defineProps({
 	},
 })
 
-const tags = useTags()
+const tags = useGeneratedState()
 const router = useNativeRouter()
 
 const name = ref(props.project.title)
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/links.vue b/apps/frontend/src/pages/[type]/[id]/settings/links.vue
index 57155476..fd6f23cf 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/links.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/links.vue
@@ -176,7 +176,7 @@ import { SaveIcon, TriangleAlertIcon } from '@modrinth/assets'
 import { commonLinkDomains, isCommonUrl, isDiscordUrl, isLinkShortener } from '@modrinth/moderation'
 import { DropdownSelect } from '@modrinth/ui'
 
-const tags = useTags()
+const tags = useGeneratedState()
 
 const props = defineProps({
 	project: {
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/tags.vue b/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
index 4bae5e8a..f46fe6d8 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
@@ -161,7 +161,7 @@ interface Props {
 	patchProject?: (data: any) => void
 }
 
-const tags = useTags()
+const tags = useGeneratedState()
 
 const props = withDefaults(defineProps<Props>(), {
 	allMembers: () => [],
diff --git a/apps/frontend/src/pages/[type]/[id]/version/[version]-new.vue b/apps/frontend/src/pages/[type]/[id]/version/[version]-new.vue
index d7bb6103..fe6b6d53 100644
--- a/apps/frontend/src/pages/[type]/[id]/version/[version]-new.vue
+++ b/apps/frontend/src/pages/[type]/[id]/version/[version]-new.vue
@@ -130,7 +130,7 @@ const version = computed(() => {
 const route = useNativeRoute()
 
 // const auth = await useAuth();
-// const tags = useTags();
+// const tags = useGeneratedState();
 
 const versionsListLink = computed(() => {
 	if (router.options.history.state.back) {
diff --git a/apps/frontend/src/pages/[type]/[id]/version/[version].vue b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
index dad61838..14557fa9 100644
--- a/apps/frontend/src/pages/[type]/[id]/version/[version].vue
+++ b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
@@ -744,7 +744,7 @@ export default defineNuxtComponent({
 		const route = useNativeRoute()
 
 		const auth = await useAuth()
-		const tags = useTags()
+		const tags = useGeneratedState()
 		const flags = useFeatureFlags()
 
 		const path = route.name.split('-')
diff --git a/apps/frontend/src/pages/[type]/[id]/versions.vue b/apps/frontend/src/pages/[type]/[id]/versions.vue
index 4e6f94e6..2eb25a06 100644
--- a/apps/frontend/src/pages/[type]/[id]/versions.vue
+++ b/apps/frontend/src/pages/[type]/[id]/versions.vue
@@ -226,7 +226,7 @@ const props = defineProps({
 	},
 })
 
-const tags = useTags()
+const tags = useGeneratedState()
 const flags = useFeatureFlags()
 const auth = await useAuth()
 
diff --git a/apps/frontend/src/pages/admin/servers/nodes.vue b/apps/frontend/src/pages/admin/servers/nodes.vue
index a23a9293..162c3310 100644
--- a/apps/frontend/src/pages/admin/servers/nodes.vue
+++ b/apps/frontend/src/pages/admin/servers/nodes.vue
@@ -20,11 +20,10 @@
 						<span class="text-lg font-semibold text-contrast"> Type </span>
 						<span>Select target to credit.</span>
 					</label>
-					<TeleportDropdownMenu
+					<Combobox
 						v-model="mode"
 						:options="modeOptions"
-						:display-name="(x) => x.name"
-						name="Type"
+						placeholder="Select type"
 						class="max-w-[8rem]"
 					/>
 				</div>
@@ -42,7 +41,7 @@
 					/>
 				</div>
 
-				<div v-if="mode.id === 'nodes'" class="flex flex-col gap-3">
+				<div v-if="mode === 'nodes'" class="flex flex-col gap-3">
 					<div class="flex flex-col gap-2">
 						<label for="node-input" class="flex flex-col gap-1">
 							<span class="text-lg font-semibold text-contrast"> Node hostnames </span>
@@ -77,12 +76,10 @@
 							<span class="text-lg font-semibold text-contrast"> Region </span>
 							<span>This will credit all active servers in the region.</span>
 						</label>
-						<TeleportDropdownMenu
-							id="region-select"
+						<Combobox
 							v-model="selectedRegion"
 							:options="regions"
-							:display-name="(x) => x.display"
-							name="Region"
+							placeholder="Select region"
 							class="max-w-[24rem]"
 						/>
 					</div>
@@ -147,10 +144,10 @@
 import { CheckIcon, PlusIcon, XIcon } from '@modrinth/assets'
 import {
 	ButtonStyled,
+	Combobox,
 	injectNotificationManager,
 	NewModal,
 	TagItem,
-	TeleportDropdownMenu,
 	Toggle,
 } from '@modrinth/ui'
 import { DEFAULT_CREDIT_EMAIL_MESSAGE } from '@modrinth/utils/utils.ts'
@@ -168,17 +165,17 @@ const sendEmail = ref(true)
 const message = ref('')
 
 const modeOptions = [
-	{ id: 'nodes', name: 'Nodes' },
-	{ id: 'region', name: 'Region' },
+	{ value: 'nodes', label: 'Nodes' },
+	{ value: 'region', label: 'Region' },
 ]
-const mode = ref(modeOptions[0])
+const mode = ref<string>('nodes')
 
 const nodeInput = ref('')
 const selectedNodes = ref<string[]>([])
 
-type RegionOpt = { key: string; display: string }
+type RegionOpt = { value: string; label: string }
 const regions = ref<RegionOpt[]>([])
-const selectedRegion = ref<RegionOpt | null>(null)
+const selectedRegion = ref<string | null>(null)
 const nodeHostnames = ref<string[]>([])
 
 function openBatchModal() {
@@ -209,7 +206,7 @@ function removeNode(v: string) {
 
 const applyDisabled = computed(() => {
 	if (days.value < 1) return true
-	if (mode.value.id === 'nodes') return selectedNodes.value.length === 0
+	if (mode.value === 'nodes') return selectedNodes.value.length === 0
 	return !selectedRegion.value
 })
 
@@ -218,11 +215,11 @@ async function ensureOverview() {
 	try {
 		const data = await useServersFetch<any>('/nodes/overview', { version: 'internal' })
 		regions.value = (data.regions || []).map((r: any) => ({
-			key: r.key,
-			display: `${r.display_name} (${r.key})`,
+			value: r.key,
+			label: `${r.display_name} (${r.key})`,
 		}))
 		nodeHostnames.value = data.node_hostnames || []
-		if (!selectedRegion.value && regions.value.length) selectedRegion.value = regions.value[0]
+		if (!selectedRegion.value && regions.value.length) selectedRegion.value = regions.value[0].value
 	} catch (err) {
 		addNotification({ title: 'Failed to load nodes overview', text: String(err), type: 'error' })
 	}
@@ -231,7 +228,7 @@ async function ensureOverview() {
 async function apply() {
 	try {
 		const body =
-			mode.value.id === 'nodes'
+			mode.value === 'nodes'
 				? {
 						nodes: selectedNodes.value.slice(),
 						days: Math.max(1, Math.floor(days.value)),
@@ -239,7 +236,7 @@ async function apply() {
 						message: message.value?.trim() || DEFAULT_CREDIT_EMAIL_MESSAGE,
 					}
 				: {
-						region: selectedRegion.value!.key,
+						region: selectedRegion.value!,
 						days: Math.max(1, Math.floor(days.value)),
 						send_email: sendEmail.value,
 						message: message.value?.trim() || DEFAULT_CREDIT_EMAIL_MESSAGE,
diff --git a/apps/frontend/src/pages/admin/servers/notices.vue b/apps/frontend/src/pages/admin/servers/notices.vue
index b9bc34df..bc22a53d 100644
--- a/apps/frontend/src/pages/admin/servers/notices.vue
+++ b/apps/frontend/src/pages/admin/servers/notices.vue
@@ -11,12 +11,12 @@
 					<span class="text-lg font-semibold text-contrast"> Level </span>
 					<span>Determines how the notice should be styled.</span>
 				</label>
-				<TeleportDropdownMenu
+				<Combobox
 					id="level-selector"
 					v-model="newNoticeLevel"
 					class="max-w-[10rem]"
-					:options="levelOptions"
-					:display-name="(x) => formatMessage(x.name)"
+					:options="levelOptions.map((x) => ({ value: x, label: formatMessage(x.name) }))"
+					:display-value="newNoticeLevel ? formatMessage(newNoticeLevel.name) : 'Select level'"
 					name="Level"
 				/>
 			</div>
@@ -264,13 +264,13 @@
 import { EditIcon, PlusIcon, SaveIcon, SettingsIcon, TrashIcon, XIcon } from '@modrinth/assets'
 import {
 	ButtonStyled,
+	Combobox,
 	commonMessages,
 	CopyCode,
 	injectNotificationManager,
 	NewModal,
 	ServerNotice,
 	TagItem,
-	TeleportDropdownMenu,
 	Toggle,
 	useRelativeTime,
 } from '@modrinth/ui'
diff --git a/apps/frontend/src/pages/auth/sign-in.vue b/apps/frontend/src/pages/auth/sign-in.vue
index 9e3b146c..a7e50926 100644
--- a/apps/frontend/src/pages/auth/sign-in.vue
+++ b/apps/frontend/src/pages/auth/sign-in.vue
@@ -33,27 +33,27 @@
 
 			<section class="third-party">
 				<a class="btn" :href="getAuthUrl('discord', redirectTarget)">
-					<SSODiscordIcon />
+					<DiscordColorIcon />
 					<span>Discord</span>
 				</a>
 				<a class="btn" :href="getAuthUrl('github', redirectTarget)">
-					<SSOGitHubIcon />
+					<GitHubColorIcon />
 					<span>GitHub</span>
 				</a>
 				<a class="btn" :href="getAuthUrl('microsoft', redirectTarget)">
-					<SSOMicrosoftIcon />
+					<MicrosoftColorIcon />
 					<span>Microsoft</span>
 				</a>
 				<a class="btn" :href="getAuthUrl('google', redirectTarget)">
-					<SSOGoogleIcon />
+					<GoogleColorIcon />
 					<span>Google</span>
 				</a>
 				<a class="btn" :href="getAuthUrl('steam', redirectTarget)">
-					<SSOSteamIcon />
+					<SteamColorIcon />
 					<span>Steam</span>
 				</a>
 				<a class="btn" :href="getAuthUrl('gitlab', redirectTarget)">
-					<SSOGitLabIcon />
+					<GitLabColorIcon />
 					<span>GitLab</span>
 				</a>
 			</section>
@@ -130,15 +130,15 @@
 
 <script setup>
 import {
+	DiscordColorIcon,
+	GitHubColorIcon,
+	GitLabColorIcon,
+	GoogleColorIcon,
 	KeyIcon,
 	MailIcon,
+	MicrosoftColorIcon,
 	RightArrowIcon,
-	SSODiscordIcon,
-	SSOGitHubIcon,
-	SSOGitLabIcon,
-	SSOGoogleIcon,
-	SSOMicrosoftIcon,
-	SSOSteamIcon,
+	SteamColorIcon,
 } from '@modrinth/assets'
 import { commonMessages, injectNotificationManager } from '@modrinth/ui'
 import { IntlFormatted } from '@vintl/vintl/components'
diff --git a/apps/frontend/src/pages/auth/sign-up.vue b/apps/frontend/src/pages/auth/sign-up.vue
index c03830d2..a0458043 100644
--- a/apps/frontend/src/pages/auth/sign-up.vue
+++ b/apps/frontend/src/pages/auth/sign-up.vue
@@ -4,27 +4,27 @@
 
 		<section class="third-party">
 			<a class="btn discord-btn" :href="getAuthUrl('discord', redirectTarget)">
-				<SSODiscordIcon />
+				<DiscordColorIcon />
 				<span>Discord</span>
 			</a>
 			<a class="btn" :href="getAuthUrl('github', redirectTarget)">
-				<SSOGitHubIcon />
+				<GitHubColorIcon />
 				<span>GitHub</span>
 			</a>
 			<a class="btn" :href="getAuthUrl('microsoft', redirectTarget)">
-				<SSOMicrosoftIcon />
+				<MicrosoftColorIcon />
 				<span>Microsoft</span>
 			</a>
 			<a class="btn" :href="getAuthUrl('google', redirectTarget)">
-				<SSOGoogleIcon />
+				<GoogleColorIcon />
 				<span>Google</span>
 			</a>
 			<a class="btn" :href="getAuthUrl('steam', redirectTarget)">
-				<SSOSteamIcon />
+				<SteamColorIcon />
 				<span>Steam</span>
 			</a>
 			<a class="btn" :href="getAuthUrl('gitlab', redirectTarget)">
-				<SSOGitLabIcon />
+				<GitLabColorIcon />
 				<span>GitLab</span>
 			</a>
 		</section>
@@ -134,15 +134,15 @@
 
 <script setup>
 import {
+	DiscordColorIcon,
+	GitHubColorIcon,
+	GitLabColorIcon,
+	GoogleColorIcon,
 	KeyIcon,
 	MailIcon,
+	MicrosoftColorIcon,
 	RightArrowIcon,
-	SSODiscordIcon,
-	SSOGitHubIcon,
-	SSOGitLabIcon,
-	SSOGoogleIcon,
-	SSOMicrosoftIcon,
-	SSOSteamIcon,
+	SteamColorIcon,
 	UserIcon,
 } from '@modrinth/assets'
 import { Checkbox, commonMessages, injectNotificationManager } from '@modrinth/ui'
diff --git a/apps/frontend/src/pages/collection/[id].vue b/apps/frontend/src/pages/collection/[id].vue
index 4236129e..1d01bb5f 100644
--- a/apps/frontend/src/pages/collection/[id].vue
+++ b/apps/frontend/src/pages/collection/[id].vue
@@ -503,7 +503,7 @@ const data = useNuxtApp()
 const route = useNativeRoute()
 const auth = await useAuth()
 const cosmetics = useCosmetics()
-const tags = useTags()
+const tags = useGeneratedState()
 
 const isEditing = ref(false)
 
diff --git a/apps/frontend/src/pages/dashboard.vue b/apps/frontend/src/pages/dashboard.vue
index f9e43449..5b398bf9 100644
--- a/apps/frontend/src/pages/dashboard.vue
+++ b/apps/frontend/src/pages/dashboard.vue
@@ -1,49 +1,32 @@
 <template>
-	<div class="normal-page">
+	<div class="normal-page !mt-8">
 		<div class="normal-page__sidebar">
-			<aside class="universal-card">
-				<h1>Dashboard</h1>
-				<NavStack>
-					<NavStackItem link="/dashboard" label="Overview">
-						<DashboardIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem link="/dashboard/notifications" label="Notifications">
-						<NotificationsIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem link="/dashboard/reports" label="Active reports">
-						<ReportIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem link="/dashboard/analytics" label="Analytics">
-						<ChartIcon aria-hidden="true" />
-					</NavStackItem>
-
-					<h3>Manage</h3>
-					<NavStackItem v-if="true" link="/dashboard/projects" label="Projects">
-						<ListIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem v-if="true" link="/dashboard/organizations" label="Organizations">
-						<OrganizationIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem
-						link="/dashboard/collections"
-						:label="formatMessage(commonMessages.collectionsLabel)"
-					>
-						<LibraryIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem
-						v-if="isAffiliate"
-						link="/dashboard/affiliate-links"
-						:label="formatMessage(commonMessages.affiliateLinksButton)"
-					>
-						<AffiliateIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem link="/dashboard/revenue" label="Revenue">
-						<CurrencyIcon aria-hidden="true" />
-					</NavStackItem>
-				</NavStack>
-			</aside>
+			<NavStack
+				:items="[
+					{ type: 'heading', label: 'Dashboard' },
+					{ link: '/dashboard', label: 'Overview', icon: DashboardIcon },
+					{ link: '/dashboard/notifications', label: 'Notifications', icon: NotificationsIcon },
+					{ link: '/dashboard/reports', label: 'Active reports', icon: ReportIcon },
+					{
+						link: '/dashboard/collections',
+						label: formatMessage(commonMessages.collectionsLabel),
+						icon: LibraryIcon,
+					},
+					{ type: 'heading', label: 'Creators' },
+					{ link: '/dashboard/projects', label: 'Projects', icon: ListIcon },
+					{ link: '/dashboard/organizations', label: 'Organizations', icon: OrganizationIcon },
+					{ link: '/dashboard/analytics', label: 'Analytics', icon: ChartIcon },
+					{
+						link: '/dashboard/affiliates',
+						label: formatMessage(commonMessages.affiliateLinksButton),
+						icon: AffiliateIcon,
+						shown: isAffiliate,
+					},
+					{ link: '/dashboard/revenue', label: 'Revenue', icon: CurrencyIcon },
+				]"
+			/>
 		</div>
-		<div class="normal-page__content">
+		<div class="normal-page__content mt-4 lg:!mt-0">
 			<NuxtPage :route="route" />
 		</div>
 	</div>
@@ -64,7 +47,6 @@ import { commonMessages } from '@modrinth/ui'
 import { type User, UserBadge } from '@modrinth/utils'
 
 import NavStack from '~/components/ui/NavStack.vue'
-import NavStackItem from '~/components/ui/NavStackItem.vue'
 
 const auth = (await useAuth()) as Ref<{ user: User | null }>
 
diff --git a/apps/frontend/src/pages/dashboard/revenue/index.vue b/apps/frontend/src/pages/dashboard/revenue/index.vue
index f85873b9..464ef028 100644
--- a/apps/frontend/src/pages/dashboard/revenue/index.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/index.vue
@@ -1,256 +1,675 @@
 <template>
-	<div class="experimental-styles-within">
-		<section class="universal-card">
-			<h2 class="text-2xl">Revenue</h2>
-			<div class="grid-display">
-				<div class="grid-display__item">
-					<div class="label">Available now</div>
-					<div class="value">
-						{{ $formatMoney(userBalance.available) }}
-					</div>
-				</div>
-				<div class="grid-display__item">
-					<div class="label">
-						Total pending
-						<nuxt-link
-							v-tooltip="`Click to read about how Modrinth handles your revenue.`"
-							class="align-middle text-link"
-							to="/legal/cmp-info#pending"
-						>
-							<UnknownIcon />
-						</nuxt-link>
-					</div>
-					<div class="value">
-						{{ $formatMoney(userBalance.pending) }}
-					</div>
-				</div>
-				<div class="grid-display__item">
-					<h3 class="label m-0">
-						Available soon
-						<nuxt-link
-							v-tooltip="`Click to read about how Modrinth handles your revenue.`"
-							class="align-middle text-link"
-							to="/legal/cmp-info#pending"
-						>
-							<UnknownIcon />
-						</nuxt-link>
-					</h3>
-					<ul class="m-0 list-none p-0">
-						<li
-							v-for="date in availableSoonDateKeys"
-							:key="date"
-							class="flex items-center justify-between border-0 border-solid border-b-divider p-0 [&:not(:last-child)]:mb-1 [&:not(:last-child)]:border-b-[1px] [&:not(:last-child)]:pb-1"
-						>
-							<span
-								v-tooltip="
-									availableSoonDateKeys.indexOf(date) === availableSoonDateKeys.length - 1
-										? `Revenue period is ongoing. \nThis amount is not yet finalized.`
-										: null
-								"
-								:class="{
-									'cursor-help':
-										availableSoonDateKeys.indexOf(date) === availableSoonDateKeys.length - 1,
-								}"
-								class="inline-flex items-center gap-1 font-bold"
-							>
-								{{ $formatMoney(availableSoonDates[date]) }}
-								<template
-									v-if="availableSoonDateKeys.indexOf(date) === availableSoonDateKeys.length - 1"
-								>
-									<InProgressIcon />
-								</template>
-							</span>
-							<span class="text-sm text-secondary">
-								{{ formatDate(dayjs(date)) }}
-							</span>
-						</li>
-					</ul>
-				</div>
+	<CreatorWithdrawModal
+		ref="withdrawModal"
+		:balance="userBalance"
+		:preloaded-payment-data="preloadedPaymentMethods"
+		@refresh-data="refreshData"
+	/>
+	<div class="mb-20 flex flex-col gap-6 lg:pl-8">
+		<div class="flex flex-col gap-4 md:gap-5">
+			<div class="flex flex-col gap-1">
+				<span class="text-xl font-semibold text-contrast md:text-2xl">{{
+					formatMessage(messages.balanceLabel)
+				}}</span>
+				<span
+					class="bg-gradient-to-r from-brand-purple via-brand-orange via-20% to-brand-orange bg-clip-text text-3xl font-extrabold text-transparent md:text-4xl"
+					>{{ formatMoney(grandTotal) }}</span
+				>
 			</div>
-			<div class="input-group mt-4">
-				<ButtonStyled color="brand">
-					<nuxt-link
-						v-if="!(userBalance.available < minWithdraw || blockedByTax)"
-						to="/dashboard/revenue/withdraw"
-					>
-						<TransferIcon /> Withdraw
-					</nuxt-link>
-					<button v-else class="disabled"><TransferIcon /> Withdraw</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<NuxtLink to="/dashboard/revenue/transfers">
-						<HistoryIcon />
-						View transfer history
-					</NuxtLink>
-				</ButtonStyled>
-			</div>
-			<p v-if="blockedByTax" class="text-sm font-bold text-orange">
-				You have withdrawn over $600 this year. To continue withdrawing, you must complete a tax
-				form.
-			</p>
 
-			<p class="text-sm text-secondary">
-				By uploading projects to Modrinth and withdrawing money from your account, you agree to the
-				<nuxt-link class="text-link" to="/legal/cmp">Rewards Program Terms</nuxt-link>. For more
-				information on how the rewards system works, see our information page
-				<nuxt-link class="text-link" to="/legal/cmp-info">here</nuxt-link>.
-			</p>
-		</section>
-		<section class="universal-card">
-			<h2 class="text-2xl">Payout methods</h2>
-			<h3>PayPal</h3>
-			<template v-if="auth.user.auth_providers.includes('paypal')">
-				<p>
-					Your PayPal {{ auth.user.payout_data.paypal_country }} account is currently connected with
-					email
-					{{ auth.user.payout_data.paypal_address }}
-				</p>
-				<ButtonStyled>
-					<button class="mt-4" @click="handleRemoveAuthProvider('paypal')">
-						<XIcon />
-						Disconnect account
-					</button>
-				</ButtonStyled>
-			</template>
-			<template v-else>
-				<p>Connect your PayPal account to enable withdrawing to your PayPal balance.</p>
-				<a :href="`${getAuthUrl('paypal')}&token=${auth.token}`" class="btn mt-4">
-					<PayPalIcon />
-					Sign in with PayPal
-				</a>
-			</template>
-			<h3>Tremendous</h3>
-			<p>
-				Tremendous payments are sent to your Modrinth email. To change/set your Modrinth email,
-				visit
-				<nuxt-link class="text-link" to="/settings/account">here</nuxt-link>.
-			</p>
-			<h3>Venmo</h3>
-			<p>Enter your Venmo username below to enable withdrawing to your Venmo balance.</p>
-			<label class="hidden" for="venmo">Venmo address</label>
-			<input
-				id="venmo"
-				v-model="auth.user.payout_data.venmo_handle"
-				autocomplete="off"
-				name="search"
-				placeholder="@example"
-				type="search"
-			/>
-			<ButtonStyled color="brand">
-				<button class="mt-4" @click="updateVenmo">
-					<SaveIcon />
-					Save information
+			<div class="flex h-3 w-full gap-2 overflow-hidden rounded-full bg-bg-raised md:h-4">
+				<div
+					v-for="(seg, index) in segments"
+					:key="seg.key"
+					class="h-full hover:brightness-105"
+					:style="{ width: seg.widthPct }"
+					@mouseenter="hoveredSeg = seg.key"
+					@mouseleave="hoveredSeg = null"
+				>
+					<span
+						class="block h-full w-full transition duration-150"
+						:class="[
+							seg.class,
+							seg.key === 'available' ? 'gradient-border' : '',
+							index === 0 ? 'rounded-l-full' : '',
+							index === segments.length - 1 ? 'rounded-r-full' : '',
+						]"
+					></span>
+				</div>
+			</div>
+
+			<div class="flex flex-col">
+				<div
+					class="flex flex-row justify-between border-0 !border-b-[2px] border-solid border-button-bg p-1.5 md:p-2"
+				>
+					<span class="my-auto flex flex-row items-center gap-2 text-sm leading-none md:text-base"
+						><span
+							class="gradient-border my-auto block size-4 rounded-full bg-brand-green md:size-5"
+						></span>
+						{{ formatMessage(messages.availableNow) }}</span
+					>
+					<span
+						class="text-base font-semibold text-contrast md:text-lg"
+						:class="{ '!text-green': hoveredSeg === 'available' }"
+						>{{ formatMoney(totalAvailable) }}</span
+					>
+				</div>
+
+				<div
+					v-for="(date, i) in dateSegments"
+					:key="date.date"
+					class="flex flex-row justify-between border-0 !border-b-[2px] border-solid border-button-bg p-1.5 md:p-2"
+				>
+					<span class="my-auto flex flex-row items-center gap-2 text-sm leading-none md:text-base">
+						<span
+							class="zone--striped-small my-auto block size-4 rounded-full md:size-5"
+							:class="[date.stripeClass, date.highlightClass]"
+						></span>
+						{{
+							formatMessage(messages.estimatedWithDate, {
+								date: date.date ? dayjs(date.date).format('MMM D, YYYY') : '',
+							})
+						}}
+						<Tooltip theme="dismissable-prompt" :triggers="['hover', 'focus']" no-auto-focus>
+							<nuxt-link
+								class="inline-flex items-center justify-center text-link"
+								to="/legal/cmp-info#pending"
+							>
+								<UnknownIcon class="inline-block size-4 align-middle md:size-5" />
+							</nuxt-link>
+							<template #popper>
+								<div class="w-[250px] font-semibold text-contrast">
+									{{ formatMessage(messages.estimatedTooltip1) }}
+									<br /><br />
+									{{ formatMessage(messages.estimatedTooltip2) }}
+								</div>
+							</template>
+						</Tooltip>
+					</span>
+					<span
+						class="text-base font-semibold text-contrast md:text-lg"
+						:class="{ [date.textClass]: hoveredSeg === `upcoming-${date.date}-${i}` }"
+						>{{ formatMoney(date?.amount ?? 0) }}</span
+					>
+				</div>
+
+				<div class="flex flex-row justify-between p-1.5 md:p-2">
+					<span class="my-auto flex flex-row items-center gap-2 text-sm leading-none md:text-base">
+						<span
+							class="zone--striped-small zone--striped--gray my-auto block size-4 rounded-full bg-button-bg opacity-90 md:size-5"
+						></span>
+						{{ formatMessage(messages.processing) }}
+						<Tooltip theme="dismissable-prompt" :triggers="['hover', 'focus']" no-auto-focus>
+							<InProgressIcon class="inline-block size-4 align-middle md:size-5" />
+							<template #popper>
+								<div class="w-[250px] font-semibold text-contrast">
+									{{ formatMessage(messages.processingTooltip) }}
+								</div>
+							</template>
+						</Tooltip>
+					</span>
+					<span
+						class="text-base font-semibold text-contrast md:text-lg"
+						:class="{ '!text-gray': hoveredSeg === 'processing' }"
+						>{{ formatMoney(processingDate?.amount ?? 0) }}</span
+					>
+				</div>
+			</div>
+		</div>
+
+		<div class="flex flex-col gap-3 md:gap-4">
+			<span class="text-xl font-semibold text-contrast md:text-2xl">{{
+				formatMessage(messages.withdrawHeader)
+			}}</span>
+			<div class="grid grid-cols-1 gap-x-4 gap-y-2 md:grid-cols-2 lg:grid-cols-3">
+				<button
+					class="relative flex flex-col overflow-hidden rounded-2xl bg-gradient-to-r from-green to-green-700 p-4 text-inverted shadow-md transition-all duration-200 hover:brightness-105 disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:brightness-100 md:p-5"
+					:disabled="hasTinMismatch"
+					@click="openWithdrawModal"
+				>
+					<div class="relative z-10 flex flex-row justify-between">
+						<span class="text-base font-semibold md:text-lg">{{
+							formatMessage(messages.withdrawCardTitle)
+						}}</span>
+						<ArrowUpRightIcon class="my-auto size-5 md:size-6" />
+					</div>
+					<div class="relative z-10 text-left text-sm font-medium">
+						{{ formatMessage(messages.withdrawCardDescription) }}
+					</div>
+					<svg
+						aria-hidden="true"
+						class="pointer-events-none absolute bottom-0 right-0 z-0 h-full w-auto"
+						xmlns="http://www.w3.org/2000/svg"
+						viewBox="0 0 266 100"
+						fill="none"
+					>
+						<path
+							fill-rule="evenodd"
+							clip-rule="evenodd"
+							d="M319.052 54.2233C319.058 37.6952 315.689 21.3441 309.156 6.19864C302.624 -8.94682 293.07 -22.559 281.094 -33.7816C269.119 -45.0042 254.982 -53.5944 239.573 -59.012C224.164 -64.4295 207.815 -66.5571 191.556 -65.2609C175.297 -63.9648 159.479 -59.2729 145.097 -51.4805C130.715 -43.688 118.08 -32.9636 107.987 -19.9818C97.8942 -6.99995 90.5617 7.95837 86.4509 23.9523C82.3401 39.9462 81.5398 56.6297 84.1004 72.9533L103.415 67.7101C100.452 45.7823 104.805 23.4811 115.783 4.35031C126.761 -14.7805 143.734 -29.6435 164.005 -37.8768C184.275 -46.1102 206.681 -47.2415 227.661 -41.0911C248.641 -34.9407 266.991 -21.8613 279.797 -3.93146L262.376 6.25239C255.476 -2.83248 246.698 -10.2779 236.659 -15.5617C226.619 -20.8455 215.561 -23.8398 204.26 -24.3345L206.032 -3.60929C217.266 -2.58081 227.949 1.79213 236.737 8.95915C245.524 16.1262 252.024 25.767 255.418 36.6684C258.812 47.5697 258.949 59.2444 255.81 70.223C252.672 81.2017 246.398 90.9937 237.78 98.3668L248.048 116.384C261.575 105.867 271.303 91.124 275.725 74.437C280.146 57.7501 279.016 40.0505 272.507 24.079L289.873 13.9453C295.192 26.0533 298.028 39.1299 298.209 52.3816L319.052 54.2233Z"
+							fill="#1BD96A"
+							fill-opacity="0.16"
+						/>
+						<path
+							d="M145.331 -51.0364C159.653 -58.796 175.404 -63.4691 191.595 -64.7598C207.786 -66.0504 224.065 -63.9308 239.41 -58.5361C254.754 -53.1414 268.832 -44.5878 280.757 -33.4124C292.682 -22.2369 302.196 -8.68194 308.702 6.39988C315.134 21.3138 318.483 37.4019 318.551 53.6733L298.696 51.919C298.455 38.7552 295.611 25.7724 290.326 13.7409L290.103 13.2307L289.625 13.5089L272.26 23.6428L271.882 23.8634L272.048 24.2711C278.514 40.1402 279.638 57.7262 275.245 74.3061C270.901 90.7012 261.401 105.207 248.194 115.632L238.415 98.4753C246.945 91.0702 253.16 81.3016 256.287 70.3626C259.453 59.2887 259.315 47.5128 255.892 36.5169C252.469 25.5209 245.912 15.7962 237.048 8.56694C228.292 1.42595 217.67 -2.9636 206.491 -4.06957L204.803 -23.8035C215.835 -23.2382 226.622 -20.2771 236.429 -15.1154L236.43 -15.1156C246.405 -9.8657 255.126 -2.46736 261.982 6.5593L262.247 6.9086L262.624 6.68831L280.046 -3.49542L280.522 -3.7744L280.2 -4.2262C267.329 -22.247 248.885 -35.3926 227.798 -41.5743C206.712 -47.7558 184.193 -46.6194 163.82 -38.3444C143.447 -30.0694 126.388 -15.1307 115.354 4.09694C104.394 23.1968 100.004 45.441 102.865 67.338L84.5078 72.3214C82.0618 56.2426 82.8841 39.8252 86.9313 24.0789C91.0248 8.15219 98.3266 -6.74338 108.377 -19.6706C118.427 -32.5979 131.01 -43.2767 145.331 -51.0364Z"
+							stroke="#1BD96A"
+							stroke-opacity="0.12"
+						/>
+						<path
+							d="M260.003 157.491C244.923 166.318 228.106 171.665 210.752 173.15C193.397 174.636 175.935 172.223 159.61 166.084C143.286 159.945 128.503 150.231 116.318 137.637C104.132 125.042 94.8439 109.878 89.1171 93.226L108.448 87.9782C110.395 93.3018 112.784 98.4486 115.59 103.363C118.525 108.52 121.913 113.398 125.713 117.939L140.152 102.814C131.996 92.3742 126.591 80.0086 124.444 66.8751C122.296 53.7416 123.476 40.2699 127.873 27.7219C132.27 15.1739 139.74 3.96017 149.584 -4.86882C159.427 -13.6978 171.322 -19.8532 184.154 -22.7584L185.891 -2.02536C177.437 0.311457 169.624 4.57902 163.052 10.4495C156.48 16.3201 151.323 23.6373 147.979 31.8393C144.634 40.0412 143.191 48.9096 143.759 57.7633C144.327 66.6169 146.892 75.2202 151.257 82.9123C152.243 84.6198 153.258 86.3022 154.382 87.7452L172.854 68.4135L161.573 52.4568L176.638 25.2047L201.398 12.3472L211.468 19.805L202.636 35.5055L192.974 41.7298L187.498 51.6422L193.955 61.0422C193.955 61.0422 203.56 67.0702 203.576 67.0659L213.41 61.3547L218.72 50.9454L233.753 41.2004L241.537 51.0445L230.214 76.6512L204.201 93.4501L187.642 82.5445L169.003 102.096C176.464 107.133 184.988 110.331 193.89 111.432C202.792 112.534 211.826 111.509 220.268 108.44L230.553 126.503C218.179 131.679 204.694 133.531 191.407 131.879C178.121 130.227 165.481 125.128 154.715 117.075L140.327 132.134C153.557 142.488 169.184 149.244 185.722 151.759C202.26 154.274 219.16 152.465 234.815 146.503C250.471 140.542 264.362 130.626 275.169 117.699C285.976 104.771 293.339 89.2611 296.56 72.6427L317.419 74.4794C314.438 91.7283 307.75 108.104 297.828 122.449C287.906 136.794 274.993 148.756 260.003 157.491Z"
+							fill="#1BD96A"
+							fill-opacity="0.16"
+						/>
+						<path
+							d="M149.913 -4.49238C159.551 -13.1371 171.169 -19.2006 183.706 -22.1377L185.36 -2.39778C176.987 -0.0177107 169.248 4.24324 162.723 10.0719C156.094 15.9933 150.893 23.3739 147.519 31.6468C144.146 39.9199 142.69 48.8658 143.263 57.7963C143.837 66.7266 146.424 75.4045 150.826 83.1632L150.828 83.1668C151.816 84.8756 152.845 86.5845 153.993 88.0571L154.344 88.5081L154.739 88.0956L173.211 68.7634L173.5 68.4621L173.258 68.1208L162.16 52.4243L176.998 25.5829L201.351 12.9363L210.816 19.9464L202.265 35.1485L192.707 41.3047L192.602 41.373L192.541 41.4842L187.064 51.3967L186.912 51.6708L187.09 51.9298L193.547 61.3299L193.606 61.4157L193.693 61.4702L193.7 61.4744C193.705 61.4773 193.712 61.4815 193.721 61.4871C193.739 61.4985 193.766 61.5158 193.801 61.5377C193.871 61.5819 193.975 61.6461 194.106 61.7285C194.369 61.8933 194.744 62.1297 195.194 62.4122C196.095 62.9772 197.296 63.7303 198.498 64.4836C199.7 65.2368 200.903 65.9902 201.806 66.5549C202.257 66.8371 202.634 67.0726 202.898 67.2372C203.03 67.3195 203.136 67.3844 203.208 67.4289C203.244 67.4509 203.273 67.4687 203.293 67.4811C203.303 67.487 203.312 67.4932 203.321 67.498C203.324 67.5001 203.332 67.5044 203.341 67.5089C203.344 67.5108 203.354 67.516 203.367 67.522C203.375 67.5257 203.397 67.5353 203.411 67.5406C203.444 67.5507 203.59 67.5693 203.705 67.5525L203.767 67.5355L203.823 67.5021L213.656 61.7911L213.783 61.7179L213.851 61.5856L219.099 51.2968L233.644 41.8683L240.959 51.1188L229.821 76.3076L204.202 92.8511L187.912 82.1225L187.569 81.8961L187.285 82.1952L168.646 101.746L168.233 102.18L168.728 102.515C176.254 107.596 184.85 110.821 193.829 111.932C202.671 113.026 211.64 112.038 220.043 109.052L229.836 126.252C217.685 131.229 204.482 132.997 191.468 131.379C178.266 129.738 165.708 124.671 155.01 116.67L154.66 116.409L154.358 116.725L139.97 131.784L139.584 132.189L140.024 132.532C153.321 142.939 169.026 149.729 185.648 152.257C202.269 154.785 219.255 152.966 234.99 146.974C250.724 140.983 264.686 131.017 275.548 118.024C286.313 105.146 293.676 89.7174 296.957 73.1823L316.833 74.9331C313.819 91.9106 307.198 108.026 297.421 122.16C287.541 136.444 274.683 148.357 259.755 157.055L259.754 157.055C244.738 165.845 227.991 171.169 210.71 172.648C193.429 174.128 176.039 171.725 159.783 165.612C143.528 159.499 128.806 149.826 116.672 137.284C104.662 124.872 95.4819 109.951 89.7657 93.5707L108.141 88.5822C109.945 93.4461 112.116 98.1617 114.637 102.686L115.16 103.615C118.11 108.797 121.515 113.7 125.333 118.264L125.689 118.688L126.07 118.289L140.509 103.163L140.811 102.847L140.541 102.501C132.438 92.1288 127.067 79.8422 124.933 66.7929C122.799 53.7434 123.973 40.3579 128.341 27.8902C132.71 15.4225 140.132 4.28013 149.913 -4.49238Z"
+							stroke="#1BD96A"
+							stroke-opacity="0.12"
+						/>
+					</svg>
 				</button>
-			</ButtonStyled>
-		</section>
+			</div>
+			<span v-if="hasTinMismatch" class="text-sm font-semibold text-red">
+				{{ formatMessage(messages.withdrawBlockedTinMismatch) }}
+			</span>
+		</div>
+
+		<div class="flex flex-col gap-4">
+			<div class="flex flex-col gap-2 sm:flex-row sm:justify-between">
+				<span class="text-xl font-semibold text-contrast md:text-2xl">{{
+					formatMessage(messages.transactionsHeader)
+				}}</span>
+				<nuxt-link
+					v-if="sortedPayouts.length > 0"
+					class="mt-0 font-semibold text-contrast underline underline-offset-2 sm:my-auto"
+					to="/dashboard/revenue/transfers"
+					>{{ formatMessage(messages.seeAll) }}</nuxt-link
+				>
+			</div>
+			<div v-if="sortedPayouts.length > 0" class="flex flex-col gap-3 md:gap-4">
+				<RevenueTransaction
+					v-for="transaction in sortedPayouts.slice(0, 3)"
+					:key="transaction.id || transaction.created"
+					:transaction="transaction"
+					@cancelled="refreshPayouts"
+				/>
+			</div>
+			<div v-else class="mx-auto flex flex-col justify-center p-6 text-center">
+				<div data-svg-wrapper className="relative w-full">
+					<svg
+						width="250"
+						height="200"
+						viewBox="0 0 250 200"
+						fill="none"
+						xmlns="http://www.w3.org/2000/svg"
+						class="h-auto w-full"
+					>
+						<rect width="250" height="200" fill="var(--surface-1)" />
+						<path
+							fill-rule="evenodd"
+							clip-rule="evenodd"
+							d="M207 65C210.866 65 214 68.134 214 72C214 75.866 210.866 79 207 79H167C170.866 79 174 82.134 174 86C174 89.866 170.866 93 167 93H189C192.866 93 196 96.134 196 100C196 103.866 192.866 107 189 107H178.826C173.952 107 170 110.134 170 114C170 116.577 172 118.911 176 121C179.866 121 183 124.134 183 128C183 131.866 179.866 135 176 135H93C89.134 135 86 131.866 86 128C86 124.134 89.134 121 93 121H54C50.134 121 47 117.866 47 114C47 110.134 50.134 107 54 107H94C97.866 107 101 103.866 101 100C101 96.134 97.866 93 94 93H69C65.134 93 62 89.866 62 86C62 82.134 65.134 79 69 79H109C105.134 79 102 75.866 102 72C102 68.134 105.134 65 109 65H207ZM207 93C210.866 93 214 96.134 214 100C214 103.866 210.866 107 207 107C203.134 107 200 103.866 200 100C200 96.134 203.134 93 207 93Z"
+							fill="var(--surface-2)"
+						/>
+						<path
+							fill-rule="evenodd"
+							clip-rule="evenodd"
+							d="M153.672 63.9999L162.974 131.843L163.809 138.649C164.079 140.842 162.519 142.837 160.327 143.107L101.767 150.297C99.5739 150.566 97.5781 149.007 97.3089 146.814L88.2931 73.3867C88.1585 72.2904 88.9381 71.2925 90.0345 71.1579C90.0414 71.157 90.0483 71.1562 90.0553 71.1554L94.9136 70.6104M98.8422 70.1698L103.429 69.6552L98.8422 70.1698Z"
+							fill="var(--surface-1)"
+						/>
+						<path
+							d="M154.91 63.8302C154.817 63.1462 154.186 62.6678 153.502 62.7615C152.818 62.8553 152.34 63.4858 152.433 64.1697L153.672 63.9999L154.91 63.8302ZM162.974 131.843L164.214 131.69C164.214 131.685 164.213 131.679 164.212 131.673L162.974 131.843ZM163.809 138.649L165.05 138.497L163.809 138.649ZM160.327 143.107L160.479 144.347L160.327 143.107ZM101.767 150.297L101.919 151.538L101.767 150.297ZM97.3089 146.814L98.5496 146.662L97.3089 146.814ZM90.0553 71.1554L90.1946 72.3976L90.0553 71.1554ZM95.053 71.8527C95.739 71.7757 96.2328 71.1572 96.1558 70.4711C96.0789 69.7851 95.4603 69.2913 94.7743 69.3682L94.9136 70.6104L95.053 71.8527ZM98.7028 68.9276C98.0168 69.0045 97.523 69.6231 97.5999 70.3091C97.6769 70.9952 98.2954 71.4889 98.9815 71.412L98.8422 70.1698L98.7028 68.9276ZM103.569 70.8974C104.255 70.8205 104.748 70.2019 104.671 69.5159C104.594 68.8298 103.976 68.3361 103.29 68.413L103.429 69.6552L103.569 70.8974ZM153.672 63.9999L152.433 64.1697L161.735 132.012L162.974 131.843L164.212 131.673L154.91 63.8302L153.672 63.9999ZM162.974 131.843L161.733 131.995L162.569 138.801L163.809 138.649L165.05 138.497L164.214 131.69L162.974 131.843ZM163.809 138.649L162.569 138.801C162.754 140.309 161.682 141.681 160.174 141.866L160.327 143.107L160.479 144.347C163.357 143.994 165.404 141.375 165.05 138.497L163.809 138.649ZM160.327 143.107L160.174 141.866L101.614 149.056L101.767 150.297L101.919 151.538L160.479 144.347L160.327 143.107ZM101.767 150.297L101.614 149.056C100.107 149.241 98.7347 148.169 98.5496 146.662L97.3089 146.814L96.0682 146.967C96.4216 149.844 99.041 151.891 101.919 151.538L101.767 150.297ZM97.3089 146.814L98.5496 146.662L89.5338 73.2344L88.2931 73.3867L87.0524 73.539L96.0682 146.967L97.3089 146.814ZM88.2931 73.3867L89.5338 73.2344C89.4833 72.8232 89.7757 72.449 90.1868 72.3986L90.0345 71.1579L89.8821 69.9172C88.1006 70.1359 86.8337 71.7575 87.0524 73.539L88.2931 73.3867ZM90.0345 71.1579L90.1868 72.3986C90.1894 72.3982 90.192 72.3979 90.1946 72.3976L90.0553 71.1554L89.9159 69.9132C89.9046 69.9145 89.8934 69.9158 89.8821 69.9172L90.0345 71.1579ZM90.0553 71.1554L90.1946 72.3976L95.053 71.8527L94.9136 70.6104L94.7743 69.3682L89.9159 69.9132L90.0553 71.1554ZM98.8422 70.1698L98.9815 71.412L103.569 70.8974L103.429 69.6552L103.29 68.413L98.7028 68.9276L98.8422 70.1698Z"
+							fill="var(--surface-4)"
+						/>
+						<path
+							fill-rule="evenodd"
+							clip-rule="evenodd"
+							d="M151.14 68.2691L159.56 129.753L160.317 135.921C160.561 137.908 159.167 139.714 157.203 139.956L104.761 146.395C102.798 146.636 101.008 145.22 100.764 143.233L92.6142 76.8567C92.4795 75.7603 93.2592 74.7625 94.3555 74.6278L100.843 73.8313"
+							fill="var(--surface-2)"
+						/>
+						<path
+							d="M110.672 51.25H156.229C156.958 51.25 157.657 51.5393 158.173 52.0547L171.616 65.4902C172.132 66.0059 172.422 66.7053 172.422 67.4346V130C172.422 131.519 171.191 132.75 169.672 132.75H110.672C109.153 132.75 107.922 131.519 107.922 130V54C107.922 52.4812 109.153 51.25 110.672 51.25Z"
+							fill="var(--surface-1)"
+							stroke="var(--surface-4)"
+							stroke-width="2.5"
+						/>
+						<path
+							d="M156.672 52.4028V64C156.672 65.6569 158.015 67 159.672 67H167.605"
+							stroke="var(--surface-4)"
+							stroke-width="2.5"
+							stroke-linecap="round"
+							stroke-linejoin="round"
+						/>
+						<path
+							d="M118 118H144M118 67H144H118ZM118 79H161H118ZM118 92H161H118ZM118 105H161H118Z"
+							stroke="var(--surface-3)"
+							stroke-width="2.5"
+							stroke-linecap="round"
+							stroke-linejoin="round"
+						/>
+					</svg>
+				</div>
+				<span class="text-lg text-contrast md:text-xl">{{
+					formatMessage(messages.noTransactions)
+				}}</span>
+				<span class="max-w-[256px] text-lg leading-none text-secondary">{{
+					formatMessage(messages.noTransactionsDesc)
+				}}</span>
+			</div>
+		</div>
 	</div>
 </template>
-<script setup>
-import {
-	HistoryIcon,
-	InProgressIcon,
-	PayPalIcon,
-	SaveIcon,
-	TransferIcon,
-	UnknownIcon,
-	XIcon,
-} from '@modrinth/assets'
-import { ButtonStyled, injectNotificationManager } from '@modrinth/ui'
-import { formatDate } from '@modrinth/utils'
+
+<script setup lang="ts">
+import { ArrowUpRightIcon, InProgressIcon, UnknownIcon } from '@modrinth/assets'
+import { formatMoney } from '@modrinth/utils'
+import { defineMessages, useVIntl } from '@vintl/vintl'
 import dayjs from 'dayjs'
-import { computed } from 'vue'
+import { Tooltip } from 'floating-vue'
 
-import { getAuthUrl, removeAuthProvider } from '~/composables/auth.js'
+import { useUserCountry } from '@/composables/country.ts'
+import type { PayoutMethod } from '@/providers/creator-withdraw.ts'
+import CreatorWithdrawModal from '~/components/ui/dashboard/CreatorWithdrawModal.vue'
+import RevenueTransaction from '~/components/ui/dashboard/RevenueTransaction.vue'
 
-const { addNotification, handleError } = injectNotificationManager()
-const auth = await useAuth()
-const minWithdraw = ref(0.01)
+const { formatMessage } = useVIntl()
 
-const { data: userBalance } = await useAsyncData(`payout/balance`, async () => {
-	const response = await useBaseFetch(`payout/balance`, { apiVersion: 3 })
-	return {
-		...response,
-		available: parseFloat(response.available),
-		withdrawn_lifetime: parseFloat(response.withdrawn_lifetime),
-		withdrawn_ytd: parseFloat(response.withdrawn_ytd),
-		pending: parseFloat(response.pending),
-		dates: Object.fromEntries(
-			Object.entries(response.dates).map(([date, value]) => [date, parseFloat(value)]),
-		),
-	}
+await useAuth()
+
+// TODO: Deduplicate these types & interfaces in @modrinth/api-client PR.
+type FormCompletionStatus = 'unknown' | 'unrequested' | 'unsigned' | 'tin-mismatch' | 'complete'
+
+type UserBalanceResponse = {
+	available: number
+	withdrawn_lifetime: number
+	withdrawn_ytd: number
+	pending: number
+	// ISO 8601 date string -> amount
+	dates: Record<string, number>
+	// backend returns null when not applicable
+	requested_form_type: string | null
+	form_completion_status: FormCompletionStatus | null
+}
+
+type RevenueBarSegment = {
+	key: string
+	class: string
+	widthPct: string
+	amount: number
+}
+
+const hoveredSeg = ref<string | null>(null)
+
+const withdrawModal = ref<InstanceType<typeof CreatorWithdrawModal>>()
+async function openWithdrawModal() {
+	withdrawModal.value?.show?.()
+}
+
+const messages = defineMessages({
+	balanceLabel: { id: 'dashboard.revenue.balance', defaultMessage: 'Balance' },
+	availableNow: { id: 'dashboard.revenue.available-now', defaultMessage: 'Available now' },
+	estimatedWithDate: {
+		id: 'dashboard.revenue.estimated-with-date',
+		defaultMessage: 'Estimated {date}',
+	},
+	estimatedTooltip1: {
+		id: 'dashboard.revenue.estimated-tooltip.msg1',
+		defaultMessage: 'Estimated revenue may be subject to change until it is made available.',
+	},
+	estimatedTooltip2: {
+		id: 'dashboard.revenue.estimated-tooltip.msg2',
+		defaultMessage: 'Click to read about how Modrinth handles your revenue.',
+	},
+	processing: { id: 'dashboard.revenue.processing', defaultMessage: 'Processing' },
+	processingTooltip: {
+		id: 'dashboard.revenue.processing.tooltip',
+		defaultMessage:
+			'Revenue stays in processing until the end of the month, then becomes available 60 days later.',
+	},
+	withdrawHeader: { id: 'dashboard.revenue.withdraw.header', defaultMessage: 'Withdraw' },
+	withdrawCardTitle: { id: 'dashboard.revenue.withdraw.card.title', defaultMessage: 'Withdraw' },
+	withdrawCardDescription: {
+		id: 'dashboard.revenue.withdraw.card.description',
+		defaultMessage: 'Withdraw from your available balance to any payout method.',
+	},
+	withdrawBlockedTinMismatch: {
+		id: 'dashboard.revenue.withdraw.blocked-tin-mismatch',
+		defaultMessage:
+			"Your withdrawals are temporarily locked because your TIN or SSN didn't match IRS records. Please contact support to reset and resubmit your tax form.",
+	},
+	tosLabel: {
+		id: 'dashboard.revenue.tos',
+		defaultMessage:
+			'By uploading projects to Modrinth and withdrawing money from your account, you agree to our <terms-link>Rewards Program Terms</terms-link>. Learn more about the <info-link>Reward Program</info-link>.',
+	},
+	transactionsHeader: {
+		id: 'dashboard.revenue.transactions.header',
+		defaultMessage: 'Transactions',
+	},
+	seeAll: { id: 'dashboard.revenue.transactions.see-all', defaultMessage: 'See all' },
+	noTransactions: {
+		id: 'dashboard.revenue.transactions.none',
+		defaultMessage: 'No transactions',
+	},
+	noTransactionsDesc: {
+		id: 'dashboard.revenue.transactions.none.desc',
+		defaultMessage: 'Your payouts and withdrawals will appear here.',
+	},
 })
 
-const blockedByTax = computed(() => {
-	const status = userBalance.value?.form_completion_status ?? 'unknown'
-	const thresholdMet = (userBalance.value?.withdrawn_ytd ?? 0) >= 600
-	return thresholdMet && status !== 'complete'
-})
+const { data: userBalance, refresh: refreshUserBalance } = await useAsyncData(
+	`payout/balance`,
+	async () => {
+		const response = (await useBaseFetch(`payout/balance`, {
+			apiVersion: 3,
+		})) as UserBalanceResponse
+		return {
+			...response,
+			available: Number(response.available),
+			withdrawn_lifetime: Number(response.withdrawn_lifetime),
+			withdrawn_ytd: Number(response.withdrawn_ytd),
+			pending: Number(response.pending),
+		}
+	},
+)
 
-const deadlineEnding = computed(() => {
-	let deadline = dayjs().subtract(2, 'month').endOf('month').add(60, 'days')
-	if (deadline.isBefore(dayjs().startOf('day'))) {
-		deadline = dayjs().subtract(1, 'month').endOf('month').add(60, 'days')
-	}
-	return deadline
-})
+const { data: payouts, refresh: refreshPayouts } = await useAsyncData(`payout/history`, () =>
+	useBaseFetch(`payout/history`, {
+		apiVersion: 3,
+	}),
+)
 
-async function handleRemoveAuthProvider(provider) {
+const userCountry = useUserCountry()
+const { data: preloadedPaymentMethods } = await useAsyncData(`payout/methods-preload`, async () => {
+	const defaultCountry = userCountry.value || 'US'
 	try {
-		await removeAuthProvider(provider)
+		return {
+			country: defaultCountry,
+			methods: (await useBaseFetch('payout/methods', {
+				apiVersion: 3,
+				query: { country: defaultCountry },
+			})) as PayoutMethod[],
+		}
+	} catch {
+		return null
+	}
+})
+
+const sortedPayouts = computed(() => {
+	if (!payouts.value) return []
+
+	return [...payouts.value].sort((a, b) => {
+		return new Date(b.created).getTime() - new Date(a.created).getTime()
+	})
+})
+
+const totalAvailable = computed(() => (userBalance.value ? userBalance.value.available : 0))
+const nextDate = computed<{ date: string; amount: number }[]>(() => {
+	const dates = userBalance.value?.dates
+	if (!dates) return []
+
+	const now = Date.now()
+
+	return Object.entries(dates)
+		.map(([date, amount]) => ({ date, amount: Number(amount) }))
+		.filter(({ date }) => new Date(date).getTime() > now)
+		.sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime())
+})
+
+const processingDate = computed<{ date: string; amount: number }>(() => {
+	const nextDates = nextDate.value
+	if (!nextDates.length) return { date: '', amount: 0 }
+
+	const now = dayjs()
+	const currentMonth = now.format('YYYY-MM')
+
+	// Find revenue from the current month (still "processing")
+	// Revenue earned in month X becomes available at end_of_month(X) + 60 days
+	// So we calculate: source_month = (date_available - 60 days).startOf('month')
+	for (const { date, amount } of nextDates) {
+		const availableDate = dayjs(date)
+		const sourceMonthEnd = availableDate.subtract(60, 'days')
+		const sourceMonth = sourceMonthEnd.startOf('month').format('YYYY-MM')
+
+		// If this revenue is from the current month, it's still "processing"
+		if (sourceMonth === currentMonth) {
+			return { date, amount: Number(amount) }
+		}
+	}
+
+	// No revenue from current month found
+	return { date: '', amount: 0 }
+})
+
+const grandTotal = computed(() =>
+	userBalance.value ? userBalance.value.available + userBalance.value.pending : 0,
+)
+
+const hasTinMismatch = computed(() => {
+	const bal = userBalance.value
+	if (!bal) return false
+	const status = bal.form_completion_status ?? 'unknown'
+	return status === 'tin-mismatch'
+})
+
+async function refreshData() {
+	try {
+		await Promise.all([refreshUserBalance(), refreshPayouts()])
 	} catch (error) {
-		handleError(error)
+		console.error('Failed to refresh data:', error)
 	}
 }
 
-const availableSoonDates = computed(() => {
-	// Get the next 3 dates from userBalance.dates that are from now to the deadline + 4 months to make sure we get all the pending ones.
-	const dates = Object.keys(userBalance.value.dates)
-		.filter((date) => {
-			const dateObj = dayjs(date)
-			return (
-				dateObj.isAfter(dayjs()) && dateObj.isBefore(dayjs(deadlineEnding.value).add(4, 'month'))
-			)
-		})
-		.sort((a, b) => dayjs(a).diff(dayjs(b)))
+const dateStripeClasses = [
+	'zone--striped--blue bg-gradient-to-b from-[#4E9CFF] to-[#4181D3]',
+	'zone--striped--purple bg-gradient-to-b from-[#c084fc] to-[#a855f7]',
+	'zone--striped--orange bg-gradient-to-b from-[#fb923c] to-[#f97316]',
+	'zone--striped--red bg-gradient-to-b from-[#f87171] to-[#ef4444]',
+] as const
 
-	return dates.reduce((acc, date) => {
-		acc[date] = userBalance.value.dates[date]
-		return acc
-	}, {})
+const dateHighlightClasses = [
+	'bg-highlight-blue',
+	'bg-highlight-purple',
+	'bg-highlight-orange',
+	'bg-highlight-red',
+] as const
+
+const dateTextClasses = ['!text-brand-blue', '!text-purple', '!text-orange', '!text-red'] as const
+
+const dateSegments = computed(() => {
+	const dates = nextDate.value
+	if (!dates?.length)
+		return [] as Array<{
+			date: string
+			amount: number
+			stripeClass: string
+			highlightClass: string
+			textClass: string
+		}>
+
+	const processing = processingDate.value
+
+	// Filter out the processing date (current month's revenue)
+	// Show only finalized pending dates as "Estimated"
+	const estimatedDates = processing.date ? dates.filter((d) => d.date !== processing.date) : dates
+
+	return estimatedDates.map((d, i) => ({
+		...d,
+		stripeClass: dateStripeClasses[i % dateStripeClasses.length],
+		highlightClass: dateHighlightClasses[i % dateHighlightClasses.length],
+		textClass: dateTextClasses[i % dateTextClasses.length],
+	}))
 })
 
-const availableSoonDateKeys = computed(() => Object.keys(availableSoonDates.value))
+const segments = computed<RevenueBarSegment[]>(() => {
+	const available = totalAvailable.value || 0
+	const dates = nextDate.value || []
+	const processing = processingDate.value
 
-async function updateVenmo() {
-	startLoading()
-	try {
-		const data = {
-			venmo_handle: auth.value.user.payout_data.venmo_handle ?? null,
+	// Filter out processing date from upcoming dates (same logic as dateSegments)
+	const upcoming = processing.date ? dates.filter((d) => d.date !== processing.date) : dates
+
+	const totalPending = userBalance.value?.pending ?? 0
+	const total = available + totalPending
+
+	if (total <= 0) return [] as RevenueBarSegment[]
+
+	const segs: Array<{ key: string; class: string; width: number; amount: number }> = []
+
+	if (available > 0) {
+		segs.push({
+			key: 'available',
+			class: 'bg-gradient-to-b from-[#1CD96A] to-[#17B257]',
+			width: available / total,
+			amount: available,
+		})
+	}
+
+	upcoming.forEach((d, i) => {
+		const amt = Number(d.amount) || 0
+		if (amt <= 0) return
+		const stripe = dateStripeClasses[i % dateStripeClasses.length]
+		const hi = dateHighlightClasses[i % dateHighlightClasses.length]
+		segs.push({
+			key: `upcoming-${d.date}-${i}`,
+			class: `${stripe} ${hi}`,
+			width: amt / total,
+			amount: amt,
+		})
+	})
+
+	// Always show processing section (even if $0)
+	const processingAmt = Number(processing.amount) || 0
+	segs.push({
+		key: 'processing',
+		class: 'zone--striped--gray bg-button-bg',
+		width: processingAmt / total,
+		amount: processingAmt,
+	})
+
+	let acc = 0
+	const normalized = segs.map((s, idx) => {
+		let pct = Math.round(s.width * 10000) / 100
+		if (idx === segs.length - 1) {
+			pct = Math.max(0, 100 - acc)
+		}
+		acc += pct
+		return { key: s.key, class: s.class, pct, amount: s.amount }
+	})
+
+	const filtered = normalized.filter((s) => s.pct > 0)
+	if (!filtered.length) return [] as RevenueBarSegment[]
+
+	const sumExceptLast = filtered.slice(0, -1).reduce((sum, s) => sum + s.pct, 0)
+	filtered[filtered.length - 1].pct = Math.max(0, 100 - sumExceptLast)
+
+	return filtered.map((s) => ({
+		key: s.key,
+		class: s.class,
+		widthPct: `${s.pct}%`,
+		amount: s.amount,
+	})) as RevenueBarSegment[]
+})
+</script>
+
+<style scoped lang="scss">
+%zone--striped-common {
+	/* Use scroll so stripes remain static relative to element when page scrolls */
+	background-attachment: scroll;
+	background-position: 0 0;
+	background-size: 9.38px 9.38px;
+}
+
+@mixin striped-background($color-variable) {
+	background-image: linear-gradient(
+		135deg,
+		$color-variable 11.54%,
+		transparent 11.54%,
+		transparent 50%,
+		$color-variable 50%,
+		$color-variable 61.54%,
+		transparent 61.54%,
+		transparent 100%
+	);
+}
+
+$striped-colors: 'green', 'blue', 'purple', 'orange', 'red';
+
+@each $color in $striped-colors {
+	.zone--striped--#{$color} {
+		@include striped-background(var(--color-#{$color}));
+		@extend %zone--striped-common;
+	}
+}
+
+.zone--striped--gray {
+	@extend %zone--striped-common;
+	background-image: linear-gradient(
+		135deg,
+		var(--color-divider-dark) 11.54%,
+		transparent 11.54%,
+		transparent 50%,
+		var(--color-divider-dark) 50%,
+		var(--color-divider-dark) 61.54%,
+		transparent 61.54%,
+		transparent 100%
+	);
+}
+
+.zone--striped-small {
+	background-size: 6.19px 6.19px !important;
+	background-position: unset !important;
+	background-attachment: unset !important;
+}
+
+$flash-colors: 'green', 'blue', 'purple', 'orange', 'red', 'gray';
+
+@each $color in $flash-colors {
+	@keyframes flash-#{$color} {
+		0%,
+		100% {
+			color: var(--color-contrast);
 		}
 
-		await useBaseFetch(`user/${auth.value.user.id}`, {
-			method: 'PATCH',
-			body: data,
-			apiVersion: 3,
-		})
-		await useAuth(auth.value.token)
-	} catch (err) {
-		addNotification({
-			title: 'An error occurred',
-			text: err.data ? err.data.description : err,
-			type: 'error',
-		})
+		50% {
+			color: var(--color-#{$color});
+		}
+	}
+
+	.animate-flash-#{$color} {
+		animation: flash-#{$color} 1.5s ease-in-out infinite;
+	}
+
+	.text-#{$color}.animate-flash-color {
+		animation: flash-#{$color} 1.5s ease-in-out infinite;
 	}
-	stopLoading()
-}
-</script>
-<style lang="scss" scoped>
-strong {
-	color: var(--color-text-dark);
-	font-weight: 500;
 }
 
-.grid-display {
-	grid-template-columns: repeat(auto-fit, minmax(16rem, 1fr));
+.gradient-border {
+	position: relative;
+
+	&::after {
+		content: '';
+		position: absolute;
+		inset: 0;
+		background: linear-gradient(to bottom, rgba(255, 255, 255, 0.3), transparent);
+		border-radius: inherit;
+		mask:
+			linear-gradient(#fff 0 0) content-box,
+			linear-gradient(#fff 0 0);
+		mask-composite: xor;
+		padding: 2px;
+		pointer-events: none;
+	}
+}
+</style>
+
+<style>
+.v-popper--theme-dismissable-prompt .v-popper__inner {
+	border-color: transparent !important;
+}
+
+.v-popper--theme-dismissable-prompt .v-popper__arrow-outer,
+.v-popper--theme-dismissable-prompt .v-popper__arrow-inner {
+	border-color: transparent !important;
 }
 </style>
diff --git a/apps/frontend/src/pages/dashboard/revenue/transfers.vue b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
index 4e651b20..54ce5019 100644
--- a/apps/frontend/src/pages/dashboard/revenue/transfers.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
@@ -1,228 +1,204 @@
 <template>
-	<div>
-		<section class="universal-card payout-history">
-			<Breadcrumbs
-				current-title="Transfer history"
-				:link-stack="[{ href: '/dashboard/revenue', label: 'Revenue' }]"
-			/>
-			<h2>Transfer history</h2>
-			<p>All of your withdrawals from your Modrinth balance will be listed here:</p>
-			<div class="input-group">
-				<DropdownSelect
-					v-model="selectedYear"
-					:options="years"
-					:display-name="(x) => (x === 'all' ? 'All years' : x)"
-					name="Year filter"
-				/>
-				<DropdownSelect
-					v-model="selectedMethod"
-					:options="methods"
-					:display-name="
-						(x) => (x === 'all' ? 'Any method' : x === 'paypal' ? 'PayPal' : capitalizeString(x))
-					"
-					name="Method filter"
-				/>
-			</div>
-			<p>
-				{{
-					selectedYear !== 'all'
-						? selectedMethod !== 'all'
-							? formatMessage(messages.transfersTotalYearMethod, {
-									amount: $formatMoney(totalAmount),
-									year: selectedYear,
-									method: selectedMethod,
-								})
-							: formatMessage(messages.transfersTotalYear, {
-									amount: $formatMoney(totalAmount),
-									year: selectedYear,
-								})
-						: selectedMethod !== 'all'
-							? formatMessage(messages.transfersTotalMethod, {
-									amount: $formatMoney(totalAmount),
-									method: selectedMethod,
-								})
-							: formatMessage(messages.transfersTotal, {
-									amount: $formatMoney(totalAmount),
-								})
-				}}
-			</p>
+	<div class="mb-6 flex flex-col gap-4 p-4 py-0 !pt-4 md:p-8 lg:p-12">
+		<div class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+			<span class="text-xl font-semibold text-contrast md:text-2xl">{{
+				formatMessage(messages.transactionsHeader)
+			}}</span>
 			<div
-				v-for="payout in filteredPayouts"
-				:key="payout.id"
-				class="universal-card recessed payout"
+				class="flex w-full flex-col gap-2 min-[480px]:flex-row min-[480px]:items-center sm:max-w-[400px]"
 			>
-				<div class="platform">
-					<PayPalIcon v-if="payout.method === 'paypal'" />
-					<TremendousIcon v-else-if="payout.method === 'tremendous'" />
-					<VenmoIcon v-else-if="payout.method === 'venmo'" />
-					<UnknownIcon v-else />
-				</div>
-				<div class="payout-info">
-					<div>
-						<strong>
-							{{ $dayjs(payout.created).format('MMMM D, YYYY [at] h:mm A') }}
-						</strong>
-					</div>
-					<div>
-						<span class="amount">{{ $formatMoney(payout.amount) }}</span>
-						<template v-if="payout.fee">⋅ Fee {{ $formatMoney(payout.fee) }}</template>
-					</div>
-					<div class="payout-status">
-						<span>
-							<Badge v-if="payout.status === 'success'" color="green" type="Success" />
-							<Badge v-else-if="payout.status === 'cancelling'" color="yellow" type="Cancelling" />
-							<Badge v-else-if="payout.status === 'cancelled'" color="red" type="Cancelled" />
-							<Badge v-else-if="payout.status === 'failed'" color="red" type="Failed" />
-							<Badge v-else-if="payout.status === 'in-transit'" color="yellow" type="In transit" />
-							<Badge v-else :type="payout.status" />
-						</span>
-						<template v-if="payout.method">
-							<span>⋅</span>
-							<span>{{ formatWallet(payout.method) }} ({{ payout.method_address }})</span>
-						</template>
-					</div>
-				</div>
-				<div class="input-group">
-					<button
-						v-if="payout.status === 'in-transit'"
-						class="iconified-button raised-button"
-						@click="cancelPayout(payout.id)"
-					>
-						<XIcon /> Cancel payment
-					</button>
+				<Combobox
+					v-model="selectedYear"
+					:options="yearOptions"
+					:display-value="selectedYear === 'all' ? 'All years' : String(selectedYear)"
+					listbox
+				/>
+				<Combobox
+					v-model="selectedMethod"
+					:options="methodOptions"
+					:display-value="selectedMethod === 'all' ? 'All types' : formatTypeLabel(selectedMethod)"
+					listbox
+				/>
+			</div>
+		</div>
+
+		<div v-if="Object.keys(groupedTransactions).length > 0" class="flex flex-col gap-5 md:gap-6">
+			<div
+				v-for="(transactions, period) in groupedTransactions"
+				:key="period"
+				class="flex flex-col"
+			>
+				<h3 class="text-sm font-medium text-primary md:text-base">{{ period }}</h3>
+				<div class="flex flex-col gap-3 md:gap-4">
+					<RevenueTransaction
+						v-for="transaction in transactions"
+						:key="transaction.id || transaction.created"
+						:transaction="transaction"
+						@cancelled="refresh"
+					/>
 				</div>
 			</div>
-		</section>
+		</div>
+		<div v-else class="mx-auto flex flex-col justify-center p-6 text-center">
+			<span class="text-lg text-contrast md:text-xl">{{
+				formatMessage(messages.noTransactions)
+			}}</span>
+			<span class="max-w-[256px] text-base text-secondary md:text-lg">{{
+				formatMessage(messages.noTransactionsDesc)
+			}}</span>
+		</div>
 	</div>
 </template>
 <script setup>
-import { PayPalIcon, UnknownIcon, XIcon } from '@modrinth/assets'
-import { Badge, Breadcrumbs, DropdownSelect, injectNotificationManager } from '@modrinth/ui'
-import { capitalizeString, formatWallet } from '@modrinth/utils'
+import { Combobox } from '@modrinth/ui'
+import { capitalizeString } from '@modrinth/utils'
+import { defineMessages, useVIntl } from '@vintl/vintl'
 import dayjs from 'dayjs'
 
-import TremendousIcon from '~/assets/images/external/tremendous.svg?component'
-import VenmoIcon from '~/assets/images/external/venmo-small.svg?component'
+import RevenueTransaction from '~/components/ui/dashboard/RevenueTransaction.vue'
 
-const { addNotification } = injectNotificationManager()
-const vintl = useVIntl()
-const { formatMessage } = vintl
+const { formatMessage } = useVIntl()
 
 useHead({
-	title: 'Transfer history - Modrinth',
+	title: 'Transaction history - Modrinth',
 })
 
-const auth = await useAuth()
-
-const { data: payouts, refresh } = await useAsyncData(`payout`, () =>
-	useBaseFetch(`payout`, {
+const { data: transactions, refresh } = await useAsyncData(`payout-history`, () =>
+	useBaseFetch(`payout/history`, {
 		apiVersion: 3,
 	}),
 )
 
-const sortedPayouts = computed(() =>
-	(payouts.value ? [...payouts.value] : []).sort((a, b) => dayjs(b.created) - dayjs(a.created)),
+const allTransactions = computed(() => {
+	if (!transactions.value) return []
+
+	return transactions.value.map((txn) => ({
+		...txn,
+		type: txn.type || (txn.method_type || txn.method ? 'withdrawal' : 'payout_available'),
+	}))
+})
+
+const sortedTransactions = computed(() =>
+	[...allTransactions.value].sort((a, b) => dayjs(b.created).diff(dayjs(a.created))),
 )
 
-const years = computed(() => {
-	const values = sortedPayouts.value.map((x) => dayjs(x.created).year())
-	return ['all', ...new Set(values)]
+const yearOptions = computed(() => {
+	const yearSet = new Set(sortedTransactions.value.map((x) => dayjs(x.created).year()))
+	const yearValues = ['all', ...Array.from(yearSet).sort((a, b) => b - a)]
+
+	return yearValues.map((year) => ({
+		value: year,
+		label: year === 'all' ? 'All years' : String(year),
+	}))
 })
 
 const selectedYear = ref('all')
 
-const methods = computed(() => {
-	const values = sortedPayouts.value.filter((x) => x.method).map((x) => x.method)
-	return ['all', ...new Set(values)]
+const methodOptions = computed(() => {
+	const types = new Set()
+
+	sortedTransactions.value.forEach((x) => {
+		if (x.type === 'payout_available' && x.payout_source) {
+			types.add(x.payout_source)
+		} else if (x.type === 'withdrawal' && (x.method_type || x.method)) {
+			types.add(x.method_type || x.method)
+		}
+	})
+
+	const typeValues = ['all', ...Array.from(types)]
+
+	return typeValues.map((type) => ({
+		value: type,
+		label: type === 'all' ? 'All types' : formatTypeLabel(type),
+	}))
 })
 
 const selectedMethod = ref('all')
 
-const filteredPayouts = computed(() =>
-	sortedPayouts.value
-		.filter((x) => selectedYear.value === 'all' || dayjs(x.created).year() === selectedYear.value)
-		.filter((x) => selectedMethod.value === 'all' || x.method === selectedMethod.value),
-)
-
-const totalAmount = computed(() =>
-	filteredPayouts.value.reduce((sum, payout) => sum + payout.amount, 0),
-)
-
-async function cancelPayout(id) {
-	startLoading()
-	try {
-		await useBaseFetch(`payout/${id}`, {
-			method: 'DELETE',
-			apiVersion: 3,
-		})
-		await refresh()
-		await useAuth(auth.value.token)
-	} catch (err) {
-		addNotification({
-			title: 'An error occurred',
-			text: err.data ? err.data.description : err,
-			type: 'error',
-		})
+function formatMethodLabel(method) {
+	switch (method) {
+		case 'paypal':
+			return 'PayPal'
+		case 'venmo':
+			return 'Venmo'
+		case 'tremendous':
+			return 'Tremendous'
+		case 'muralpay':
+			return 'Muralpay'
+		default:
+			return capitalizeString(method)
 	}
-	stopLoading()
 }
 
+function formatTypeLabel(type) {
+	// Check if it's a payout method (withdrawal)
+	const payoutMethods = ['paypal', 'venmo', 'tremendous', 'muralpay']
+	if (payoutMethods.includes(type)) {
+		return formatMethodLabel(type)
+	}
+	// Otherwise it's a payout_source (income), convert snake_case to Title Case
+	return type
+		.split('_')
+		.map((word) => capitalizeString(word))
+		.join(' ')
+}
+
+const filteredTransactions = computed(() =>
+	sortedTransactions.value
+		.filter((x) => selectedYear.value === 'all' || dayjs(x.created).year() === selectedYear.value)
+		.filter((x) => {
+			if (selectedMethod.value === 'all') return true
+			// Check if it's an income source
+			if (x.type === 'payout_available') {
+				return x.payout_source === selectedMethod.value
+			}
+			// Check if it's a withdrawal method
+			return x.type === 'withdrawal' && (x.method_type || x.method) === selectedMethod.value
+		}),
+)
+
+function getPeriodLabel(date) {
+	const txnDate = dayjs(date)
+	const now = dayjs()
+
+	if (txnDate.isSame(now, 'month')) {
+		return 'This month'
+	} else if (txnDate.isSame(now.subtract(1, 'month'), 'month')) {
+		return 'Last month'
+	} else {
+		return txnDate.format('MMMM YYYY')
+	}
+}
+
+const groupedTransactions = computed(() => {
+	const groups = {}
+
+	filteredTransactions.value.forEach((transaction) => {
+		const period = getPeriodLabel(transaction.created)
+
+		if (!groups[period]) {
+			groups[period] = []
+		}
+
+		groups[period].push(transaction)
+	})
+
+	return groups
+})
+
 const messages = defineMessages({
-	transfersTotal: {
-		id: 'revenue.transfers.total',
-		defaultMessage: 'You have withdrawn {amount} in total.',
+	transactionsHeader: {
+		id: 'dashboard.revenue.transactions.header',
+		defaultMessage: 'Transactions',
 	},
-	transfersTotalYear: {
-		id: 'revenue.transfers.total.year',
-		defaultMessage: 'You have withdrawn {amount} in {year}.',
+	noTransactions: {
+		id: 'dashboard.revenue.transactions.none',
+		defaultMessage: 'No transactions',
 	},
-	transfersTotalMethod: {
-		id: 'revenue.transfers.total.method',
-		defaultMessage: 'You have withdrawn {amount} through {method}.',
-	},
-	transfersTotalYearMethod: {
-		id: 'revenue.transfers.total.year_method',
-		defaultMessage: 'You have withdrawn {amount} in {year} through {method}.',
+	noTransactionsDesc: {
+		id: 'dashboard.revenue.transactions.none.desc',
+		defaultMessage: 'Your payouts and withdrawals will appear here.',
 	},
 })
 </script>
-<style lang="scss" scoped>
-.payout {
-	display: flex;
-	flex-direction: column;
-	gap: 0.5rem;
-
-	.platform {
-		display: flex;
-		padding: 0.75rem;
-		background-color: var(--color-raised-bg);
-		width: fit-content;
-		height: fit-content;
-		border-radius: 20rem;
-
-		svg {
-			width: 2rem;
-			height: 2rem;
-		}
-	}
-
-	.payout-status {
-		display: flex;
-		gap: 0.5ch;
-	}
-
-	.amount {
-		color: var(--color-heading);
-		font-weight: 500;
-	}
-
-	@media screen and (min-width: 800px) {
-		flex-direction: row;
-		align-items: center;
-
-		.input-group {
-			margin-left: auto;
-		}
-	}
-}
-</style>
+<style scoped></style>
diff --git a/apps/frontend/src/pages/dashboard/revenue/withdraw.vue b/apps/frontend/src/pages/dashboard/revenue/withdraw.vue
deleted file mode 100644
index 8f9b533b..00000000
--- a/apps/frontend/src/pages/dashboard/revenue/withdraw.vue
+++ /dev/null
@@ -1,630 +0,0 @@
-<template>
-	<CreatorTaxFormModal
-		ref="taxFormModalRef"
-		close-button-text="Continue"
-		@success="onTaxFormSuccess"
-		@cancelled="onTaxFormCancelled"
-	/>
-	<section class="universal-card">
-		<Breadcrumbs
-			current-title="Withdraw"
-			:link-stack="[{ href: '/dashboard/revenue', label: 'Revenue' }]"
-		/>
-
-		<h2>Withdraw</h2>
-
-		<h3>Region</h3>
-		<Multiselect
-			id="country-multiselect"
-			v-model="country"
-			class="country-multiselect"
-			placeholder="Select country..."
-			track-by="id"
-			label="name"
-			:options="countries"
-			:searchable="true"
-			:close-on-select="true"
-			:show-labels="false"
-			:allow-empty="false"
-		/>
-
-		<h3>Withdraw method</h3>
-
-		<div class="iconified-input">
-			<label class="hidden" for="search">Search</label>
-			<SearchIcon aria-hidden="true" />
-			<input
-				id="search"
-				v-model="search"
-				name="search"
-				placeholder="Search options..."
-				autocomplete="off"
-			/>
-		</div>
-		<div class="withdraw-options-scroll">
-			<div class="withdraw-options">
-				<button
-					v-for="method in payoutMethods
-						.filter((x) => x.name.toLowerCase().includes(search.toLowerCase()))
-						.sort((a, b) =>
-							a.type !== 'tremendous'
-								? -1
-								: a.name.toLowerCase().localeCompare(b.name.toLowerCase()),
-						)"
-					:key="method.id"
-					class="withdraw-option button-base"
-					:class="{ selected: selectedMethodId === method.id }"
-					@click="() => (selectedMethodId = method.id)"
-				>
-					<div class="preview" :class="{ 'show-bg': !method.image_url || method.name === 'ACH' }">
-						<template v-if="method.image_url && method.name !== 'ACH'">
-							<div class="preview-badges">
-								<span class="badge">
-									{{
-										getRangeOfMethod(method)
-											.map($formatMoney)
-											.map((i) => i.replace('.00', ''))
-											.join('–')
-									}}
-								</span>
-							</div>
-							<img
-								v-if="method.image_url && method.name !== 'ACH'"
-								class="preview-img"
-								:src="method.image_url"
-								:alt="method.name"
-							/>
-						</template>
-						<div v-else class="placeholder">
-							<template v-if="method.type === 'venmo'">
-								<VenmoIcon class="enlarge" />
-							</template>
-							<template v-else>
-								<PayPalIcon v-if="method.type === 'paypal'" />
-								<span>{{ method.name }}</span>
-							</template>
-						</div>
-					</div>
-					<div class="label">
-						<RadioButtonCheckedIcon v-if="selectedMethodId === method.id" class="radio" />
-						<RadioButtonIcon v-else class="radio" />
-						<span>{{ method.name }}</span>
-					</div>
-				</button>
-			</div>
-		</div>
-
-		<h3>Amount</h3>
-		<p>
-			You are initiating a transfer of your revenue from Modrinth's Creator Monetization Program.
-			How much of your
-			<strong>{{ $formatMoney(userBalance.available) }}</strong> balance would you like to transfer
-			transfer to {{ selectedMethod.name }}?
-		</p>
-		<div class="confirmation-input">
-			<template v-if="selectedMethod.interval.fixed">
-				<Chips
-					v-model="amount"
-					:items="selectedMethod.interval.fixed.values"
-					:format-label="(val) => '$' + val"
-				/>
-			</template>
-			<template v-else-if="minWithdrawAmount == maxWithdrawAmount">
-				<div>
-					<p>
-						This method has a fixed transfer amount of
-						<strong>{{ $formatMoney(minWithdrawAmount) }}</strong
-						>.
-					</p>
-				</div>
-			</template>
-			<template v-else>
-				<div>
-					<p>
-						This method has a minimum transfer amount of
-						<strong>{{ $formatMoney(minWithdrawAmount) }}</strong> and a maximum transfer amount of
-						<strong>{{ $formatMoney(maxWithdrawAmount) }}</strong
-						>.
-					</p>
-					<input
-						id="confirmation"
-						v-model="amount"
-						type="text"
-						pattern="^\d*(\.\d{0,2})?$"
-						autocomplete="off"
-						placeholder="Amount to transfer..."
-					/>
-					<p>
-						You have entered <strong>{{ $formatMoney(parsedAmount) }}</strong> to transfer.
-					</p>
-				</div>
-			</template>
-		</div>
-
-		<p v-if="willTriggerTaxForm" class="font-bold text-orange">
-			This withdrawal will exceed $600 for the year. You will be prompted to complete a tax form
-			before proceeding.
-		</p>
-
-		<p v-else-if="blockedByTax" class="font-bold text-orange">
-			You have withdrawn over $600 this year. To continue withdrawing, you must complete a tax form.
-		</p>
-
-		<div class="confirm-text">
-			<template v-if="knownErrors.length === 0 && amount">
-				<Checkbox v-if="fees > 0" v-model="agreedFees" description="Consent to fee">
-					I acknowledge that an estimated
-					{{ formatMoney(fees) }} will be deducted from the amount I receive to cover
-					{{ formatWallet(selectedMethod.type) }} processing fees.
-				</Checkbox>
-				<Checkbox v-model="agreedTransfer" description="Confirm transfer">
-					<template v-if="selectedMethod.type === 'tremendous'">
-						I confirm that I am initiating a transfer and I will receive further instructions on how
-						to redeem this payment via email to:
-						{{ withdrawAccount }}
-					</template>
-					<template v-else>
-						I confirm that I am initiating a transfer to the following
-						{{ formatWallet(selectedMethod.type) }} account: {{ withdrawAccount }}
-					</template>
-				</Checkbox>
-				<Checkbox v-model="agreedTerms" class="rewards-checkbox">
-					I agree to the
-					<nuxt-link to="/legal/cmp" class="text-link">Rewards Program Terms</nuxt-link>
-				</Checkbox>
-			</template>
-			<template v-else>
-				<span v-for="(error, index) in knownErrors" :key="index" class="invalid">
-					{{ error }}
-				</span>
-			</template>
-		</div>
-		<div class="button-group">
-			<nuxt-link to="/dashboard/revenue" class="iconified-button">
-				<XIcon />
-				Cancel
-			</nuxt-link>
-			<button
-				:disabled="
-					knownErrors.length > 0 ||
-					!amount ||
-					!agreedTransfer ||
-					!agreedTerms ||
-					(fees > 0 && !agreedFees) ||
-					blockedByTax
-				"
-				class="iconified-button brand-button"
-				@click="withdraw"
-			>
-				<TransferIcon />
-				Withdraw
-			</button>
-		</div>
-	</section>
-</template>
-
-<script setup>
-import {
-	PayPalIcon,
-	RadioButtonCheckedIcon,
-	RadioButtonIcon,
-	SearchIcon,
-	TransferIcon,
-	XIcon,
-} from '@modrinth/assets'
-import { Breadcrumbs, Checkbox, Chips, injectNotificationManager } from '@modrinth/ui'
-import { formatMoney, formatWallet } from '@modrinth/utils'
-import { all } from 'iso-3166-1'
-import { Multiselect } from 'vue-multiselect'
-
-import VenmoIcon from '~/assets/images/external/venmo.svg?component'
-import CreatorTaxFormModal from '~/components/ui/dashboard/CreatorTaxFormModal.vue'
-
-const { addNotification } = injectNotificationManager()
-const auth = await useAuth()
-const data = useNuxtApp()
-
-const countries = computed(() =>
-	all().map((x) => ({
-		id: x.alpha2,
-		name: x.alpha2 === 'TW' ? 'Taiwan' : x.country,
-	})),
-)
-const search = ref('')
-
-const amount = ref('')
-const country = ref(
-	countries.value.find((x) => x.id === (auth.value.user.payout_data.paypal_region ?? 'US')),
-)
-
-const [{ data: userBalance }, { data: payoutMethods, refresh: refreshPayoutMethods }] =
-	await Promise.all([
-		useAsyncData(`payout/balance`, async () => {
-			const response = await useBaseFetch(`payout/balance`, { apiVersion: 3 })
-			return {
-				...response,
-				available: parseFloat(response.available),
-				withdrawn_lifetime: parseFloat(response.withdrawn_lifetime),
-				withdrawn_ytd: parseFloat(response.withdrawn_ytd),
-				pending: parseFloat(response.pending),
-				dates: Object.fromEntries(
-					Object.entries(response.dates).map(([date, value]) => [date, parseFloat(value)]),
-				),
-			}
-		}),
-		useAsyncData(`payout/methods?country=${country.value.id}`, () =>
-			useBaseFetch(`payout/methods?country=${country.value.id}`, { apiVersion: 3 }),
-		),
-	])
-
-const selectedMethodId = ref(payoutMethods.value[0].id)
-const selectedMethod = computed(() =>
-	payoutMethods.value.find((x) => x.id === selectedMethodId.value),
-)
-
-const parsedAmount = computed(() => {
-	const regex = /^\$?(\d*(\.\d{2})?)$/gm
-	const matches = regex.exec(amount.value)
-	return matches && matches[1] ? parseFloat(matches[1]) : 0.0
-})
-const fees = computed(() => {
-	return Math.min(
-		Math.max(
-			selectedMethod.value.fee.min,
-			selectedMethod.value.fee.percentage * parsedAmount.value,
-		),
-		selectedMethod.value.fee.max ?? Number.MAX_VALUE,
-	)
-})
-
-const getIntervalRange = (intervalType) => {
-	if (!intervalType) {
-		return []
-	}
-
-	const { min, max, values } = intervalType
-	if (values) {
-		const first = values[0]
-		const last = values.slice(-1)[0]
-		return first === last ? [first] : [first, last]
-	}
-
-	return min === max ? [min] : [min, max]
-}
-
-const getRangeOfMethod = (method) => {
-	return getIntervalRange(method.interval?.fixed || method.interval?.standard)
-}
-
-const maxWithdrawAmount = computed(() => {
-	const interval = selectedMethod.value.interval
-	return interval?.standard ? interval.standard.max : (interval?.fixed?.values.slice(-1)[0] ?? 0)
-})
-
-const minWithdrawAmount = computed(() => {
-	const interval = selectedMethod.value.interval
-	return interval?.standard ? interval.standard.min : (interval?.fixed?.values?.[0] ?? fees.value)
-})
-
-const withdrawAccount = computed(() => {
-	if (selectedMethod.value.type === 'paypal') {
-		return auth.value.user.payout_data.paypal_address
-	} else if (selectedMethod.value.type === 'venmo') {
-		return auth.value.user.payout_data.venmo_handle
-	} else {
-		return auth.value.user.email
-	}
-})
-const knownErrors = computed(() => {
-	const errors = []
-	if (selectedMethod.value.type === 'paypal' && !auth.value.user.payout_data.paypal_address) {
-		errors.push('Please link your PayPal account in the dashboard to proceed.')
-	}
-	if (selectedMethod.value.type === 'venmo' && !auth.value.user.payout_data.venmo_handle) {
-		errors.push('Please set your Venmo handle in the dashboard to proceed.')
-	}
-	if (selectedMethod.value.type === 'tremendous') {
-		if (!auth.value.user.email) {
-			errors.push('Please set your email address in your account settings to proceed.')
-		}
-		if (!auth.value.user.email_verified) {
-			errors.push('Please verify your email address to proceed.')
-		}
-	}
-
-	if (!parsedAmount.value && amount.value.length > 0) {
-		errors.push(`${amount.value} is not a valid amount`)
-	} else if (
-		parsedAmount.value > userBalance.value.available ||
-		parsedAmount.value > maxWithdrawAmount.value
-	) {
-		const maxAmount = Math.min(userBalance.value.available, maxWithdrawAmount.value)
-		errors.push(`The amount must be no more than ${data.$formatMoney(maxAmount)}`)
-	} else if (parsedAmount.value <= fees.value || parsedAmount.value < minWithdrawAmount.value) {
-		const minAmount = Math.max(fees.value + 0.01, minWithdrawAmount.value)
-		errors.push(`The amount must be at least ${data.$formatMoney(minAmount)}`)
-	}
-
-	return errors
-})
-
-const agreedTransfer = ref(false)
-const agreedFees = ref(false)
-const agreedTerms = ref(false)
-
-const flags = useFeatureFlags()
-
-const blockedByTax = computed(() => {
-	if (flags.value.testTaxForm) return true
-	const status = userBalance.value?.form_completion_status ?? 'unknown'
-	const thresholdMet = (userBalance.value?.withdrawn_ytd ?? 0) >= 600
-	return thresholdMet && status !== 'complete'
-})
-
-const willTriggerTaxForm = computed(() => {
-	if (flags.value.testTaxForm) return true
-	const status = userBalance.value?.form_completion_status ?? 'unknown'
-	const currentWithdrawn = userBalance.value?.withdrawn_ytd ?? 0
-	const wouldExceedThreshold = currentWithdrawn + parsedAmount.value >= 600
-	return wouldExceedThreshold && status !== 'complete' && !blockedByTax.value
-})
-
-watch(country, async () => {
-	await refreshPayoutMethods()
-	if (payoutMethods.value && payoutMethods.value[0]) {
-		selectedMethodId.value = payoutMethods.value[0].id
-	}
-})
-
-watch(selectedMethod, () => {
-	if (selectedMethod.value.interval?.fixed) {
-		amount.value = selectedMethod.value.interval.fixed.values[0]
-	}
-	if (maxWithdrawAmount.value === minWithdrawAmount.value) {
-		amount.value = maxWithdrawAmount.value
-	}
-	agreedTransfer.value = false
-	agreedFees.value = false
-	agreedTerms.value = false
-})
-
-const taxFormModalRef = ref(null)
-const taxFormCancelled = ref(false)
-
-async function performWithdrawal() {
-	startLoading()
-	try {
-		const auth = await useAuth()
-
-		await useBaseFetch(`payout`, {
-			method: 'POST',
-			body: {
-				amount: parsedAmount.value,
-				method: selectedMethod.value.type,
-				method_id: selectedMethod.value.id,
-			},
-			apiVersion: 3,
-		})
-		await useAuth(auth.value.token)
-		await navigateTo('/dashboard/revenue')
-		addNotification({
-			title: 'Withdrawal complete',
-			text:
-				selectedMethod.value.type === 'tremendous'
-					? 'An email has been sent to your account with further instructions on how to redeem your payout!'
-					: `Payment has been sent to your ${formatWallet(selectedMethod.value.type)} account!`,
-			type: 'success',
-		})
-	} catch (err) {
-		addNotification({
-			title: 'An error occurred',
-			text: err.data ? err.data.description : err,
-			type: 'error',
-		})
-	}
-	stopLoading()
-}
-
-async function withdraw() {
-	if (willTriggerTaxForm.value) {
-		taxFormCancelled.value = false
-		if (taxFormModalRef.value && taxFormModalRef.value.startTaxForm) {
-			await taxFormModalRef.value.startTaxForm(new MouseEvent('click'))
-		}
-		return
-	}
-
-	await performWithdrawal()
-}
-
-async function onTaxFormSuccess() {
-	// Skip balance check if testTaxForm flag is enabled
-	if (flags.value.testTaxForm) {
-		await performWithdrawal()
-		return
-	}
-
-	// Refresh user balance to get updated form completion status
-	const updatedBalance = await useBaseFetch(`payout/balance`, { apiVersion: 3 })
-	userBalance.value = updatedBalance
-
-	if (updatedBalance?.form_completion_status === 'complete') {
-		await performWithdrawal()
-	} else {
-		addNotification({
-			title: 'Tax form incomplete',
-			text: 'You must complete a tax form for this withdrawal.',
-			type: 'error',
-		})
-	}
-}
-
-function onTaxFormCancelled() {
-	taxFormCancelled.value = true
-	addNotification({
-		title: 'Withdrawal canceled',
-		text: 'You must complete a tax form for this withdrawal.',
-		type: 'error',
-	})
-}
-</script>
-
-<style lang="scss" scoped>
-.withdraw-options-scroll {
-	max-height: 460px;
-	overflow-y: auto;
-
-	&::-webkit-scrollbar {
-		width: var(--gap-md);
-		border: 3px solid var(--color-bg);
-	}
-
-	&::-webkit-scrollbar-track {
-		background: var(--color-bg);
-		border: 3px solid var(--color-bg);
-	}
-
-	&::-webkit-scrollbar-thumb {
-		background-color: var(--color-raised-bg);
-		border-radius: var(--radius-lg);
-		border: 3px solid var(--color-bg);
-	}
-}
-
-.withdraw-options {
-	display: grid;
-	grid-template-columns: repeat(1, 1fr);
-	gap: var(--gap-lg);
-	padding-right: 0.5rem;
-
-	@media screen and (min-width: 300px) {
-		grid-template-columns: repeat(2, 1fr);
-	}
-
-	@media screen and (min-width: 600px) {
-		grid-template-columns: repeat(3, 1fr);
-	}
-}
-
-.withdraw-option {
-	width: 100%;
-	border-radius: var(--radius-md);
-	padding: 0;
-	overflow: hidden;
-	border: 1px solid var(--color-divider);
-	background-color: var(--color-button-bg);
-	color: var(--color-text);
-
-	&.selected {
-		color: var(--color-contrast);
-
-		.label svg {
-			color: var(--color-brand);
-		}
-	}
-
-	.preview {
-		display: flex;
-		justify-content: center;
-		aspect-ratio: 30 / 19;
-		position: relative;
-
-		.preview-badges {
-			// These will float over the image in the bottom right corner
-			position: absolute;
-			bottom: 0;
-			right: 0;
-			padding: var(--gap-sm) var(--gap-xs);
-
-			.badge {
-				background-color: var(--color-button-bg);
-				border-radius: var(--radius-xs);
-				padding: var(--gap-xs) var(--gap-sm);
-				font-size: var(--font-size-xs);
-			}
-		}
-
-		&.show-bg {
-			background-color: var(--color-bg);
-		}
-
-		img {
-			-webkit-user-drag: none;
-			-khtml-user-drag: none;
-			-moz-user-drag: none;
-			-o-user-drag: none;
-			user-drag: none;
-			user-select: none;
-			width: 100%;
-			height: auto;
-			object-fit: cover;
-		}
-
-		.placeholder {
-			display: flex;
-			align-items: center;
-			gap: var(--gap-xs);
-
-			svg {
-				width: 2rem;
-				height: auto;
-			}
-
-			span {
-				font-weight: var(--font-weight-bold);
-				font-size: 2rem;
-				font-style: italic;
-			}
-
-			.enlarge {
-				width: auto;
-				height: 1.5rem;
-			}
-		}
-	}
-
-	.label {
-		display: flex;
-		align-items: center;
-		padding: var(--gap-md) var(--gap-lg);
-
-		svg {
-			min-height: 1rem;
-			min-width: 1rem;
-			margin-right: 0.5rem;
-		}
-
-		span {
-			text-overflow: ellipsis;
-			overflow: hidden;
-			white-space: nowrap;
-		}
-	}
-}
-
-.invalid {
-	color: var(--color-red);
-}
-
-.confirm-text {
-	margin: var(--spacing-card-md) 0;
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-card-sm);
-}
-
-.iconified-input {
-	margin-bottom: var(--spacing-card-md);
-}
-
-.country-multiselect,
-.iconified-input {
-	max-width: 16rem;
-}
-
-.rewards-checkbox {
-	a {
-		margin-left: 0.5ch;
-	}
-}
-</style>
diff --git a/apps/frontend/src/pages/legal.vue b/apps/frontend/src/pages/legal.vue
index 2308e2ab..14023de1 100644
--- a/apps/frontend/src/pages/legal.vue
+++ b/apps/frontend/src/pages/legal.vue
@@ -1,39 +1,21 @@
 <template>
 	<div class="normal-page">
 		<div class="normal-page__sidebar">
-			<aside class="universal-card">
-				<h1>Legal</h1>
-				<NavStack>
-					<NavStackItem link="/legal/terms" label="Terms of Use">
-						<HeartHandshakeIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem link="/legal/rules" label="Content Rules">
-						<ScaleIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem link="/legal/copyright" label="Copyright Policy">
-						<CopyrightIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem link="/legal/security" label="Security Notice">
-						<ShieldIcon aria-hidden="true" />
-					</NavStackItem>
-
-					<h3>Privacy</h3>
-					<NavStackItem link="/legal/privacy" label="Privacy Policy">
-						<LockIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem link="/legal/ccpa" label="California Privacy Notice">
-						<InfoIcon aria-hidden="true" />
-					</NavStackItem>
-
-					<h3>Rewards Program</h3>
-					<NavStackItem link="/legal/cmp" label="Rewards Program Terms">
-						<CurrencyIcon aria-hidden="true" />
-					</NavStackItem>
-					<NavStackItem link="/legal/cmp-info" label="Rewards Program Info">
-						<InfoIcon aria-hidden="true" />
-					</NavStackItem>
-				</NavStack>
-			</aside>
+			<NavStack
+				:items="[
+					{ type: 'heading', label: 'Platform' },
+					{ link: '/legal/terms', label: 'Terms of Use', icon: HeartHandshakeIcon },
+					{ link: '/legal/rules', label: 'Content Rules', icon: ScaleIcon },
+					{ link: '/legal/copyright', label: 'Copyright Policy', icon: CopyrightIcon },
+					{ link: '/legal/security', label: 'Security Notice', icon: ShieldIcon },
+					{ type: 'heading', label: 'Privacy' },
+					{ link: '/legal/privacy', label: 'Privacy Policy', icon: LockIcon },
+					{ link: '/legal/ccpa', label: 'California Privacy Notice', icon: InfoIcon },
+					{ type: 'heading', label: 'Rewards Program' },
+					{ link: '/legal/cmp', label: 'Rewards Program Terms', icon: CurrencyIcon },
+					{ link: '/legal/cmp-info', label: 'Rewards Program Info', icon: InfoIcon },
+				]"
+			/>
 		</div>
 		<div class="normal-page__content">
 			<NuxtPage class="universal-card" :route="route" />
@@ -53,7 +35,6 @@ import {
 } from '@modrinth/assets'
 
 import NavStack from '~/components/ui/NavStack.vue'
-import NavStackItem from '~/components/ui/NavStackItem.vue'
 
 const route = useNativeRoute()
 </script>
diff --git a/apps/frontend/src/pages/organization/[id].vue b/apps/frontend/src/pages/organization/[id].vue
index f90e009d..53726f18 100644
--- a/apps/frontend/src/pages/organization/[id].vue
+++ b/apps/frontend/src/pages/organization/[id].vue
@@ -7,22 +7,13 @@
 		<ModalCreation ref="modal_creation" :organization-id="organization.id" />
 		<template v-if="routeHasSettings">
 			<div class="normal-page__sidebar">
-				<div class="universal-card">
-					<Breadcrumbs
-						current-title="Settings"
-						:link-stack="[
-							{ href: `/dashboard/organizations`, label: 'Organizations' },
-							{
-								href: `/organization/${organization.slug}`,
-								label: organization.name,
-								allowTrimming: true,
-							},
-						]"
-					/>
-					<div class="page-header__settings">
+				<div
+					class="bg-surface mb-4 flex flex-col rounded-xl border border-solid border-surface-4 p-4"
+				>
+					<div class="flex items-center gap-4">
 						<Avatar size="sm" :src="organization.icon_url" />
-						<div class="title-section">
-							<h2 class="settings-title">
+						<div class="flex flex-col justify-center gap-1">
+							<h2 class="m-0 text-base">
 								<nuxt-link :to="`/organization/${organization.slug}/settings`">
 									{{ organization.name }}
 								</nuxt-link>
@@ -33,33 +24,32 @@
 							</span>
 						</div>
 					</div>
-
-					<h2>Organization settings</h2>
-
-					<NavStack>
-						<NavStackItem :link="`/organization/${organization.slug}/settings`" label="Overview">
-							<SettingsIcon />
-						</NavStackItem>
-						<NavStackItem
-							:link="`/organization/${organization.slug}/settings/members`"
-							label="Members"
-						>
-							<UsersIcon />
-						</NavStackItem>
-						<NavStackItem
-							:link="`/organization/${organization.slug}/settings/projects`"
-							label="Projects"
-						>
-							<BoxIcon />
-						</NavStackItem>
-						<NavStackItem
-							:link="`/organization/${organization.slug}/settings/analytics`"
-							label="Analytics"
-						>
-							<ChartIcon />
-						</NavStackItem>
-					</NavStack>
 				</div>
+
+				<NavStack
+					:items="[
+						{
+							link: `/organization/${organization.slug}/settings`,
+							label: 'Overview',
+							icon: SettingsIcon,
+						},
+						{
+							link: `/organization/${organization.slug}/settings/members`,
+							label: 'Members',
+							icon: UsersIcon,
+						},
+						{
+							link: `/organization/${organization.slug}/settings/projects`,
+							label: 'Projects',
+							icon: BoxIcon,
+						},
+						{
+							link: `/organization/${organization.slug}/settings/analytics`,
+							label: 'Analytics',
+							icon: ChartIcon,
+						},
+					]"
+				/>
 			</div>
 			<div class="normal-page__content">
 				<NuxtPage />
@@ -271,14 +261,7 @@ import {
 	UsersIcon,
 	XIcon,
 } from '@modrinth/assets'
-import {
-	Avatar,
-	Breadcrumbs,
-	ButtonStyled,
-	commonMessages,
-	ContentPageHeader,
-	OverflowMenu,
-} from '@modrinth/ui'
+import { Avatar, ButtonStyled, commonMessages, ContentPageHeader, OverflowMenu } from '@modrinth/ui'
 import type { Organization, ProjectStatus, ProjectType, ProjectV3 } from '@modrinth/utils'
 import { formatNumber } from '@modrinth/utils'
 
@@ -286,7 +269,6 @@ import UpToDate from '~/assets/images/illustrations/up_to_date.svg?component'
 import AdPlaceholder from '~/components/ui/AdPlaceholder.vue'
 import ModalCreation from '~/components/ui/create/ProjectCreateModal.vue'
 import NavStack from '~/components/ui/NavStack.vue'
-import NavStackItem from '~/components/ui/NavStackItem.vue'
 import NavTabs from '~/components/ui/NavTabs.vue'
 import ProjectCard from '~/components/ui/ProjectCard.vue'
 import { acceptTeamInvite, removeTeamMember } from '~/helpers/teams.js'
@@ -306,7 +288,7 @@ const user = await useUser()
 const cosmetics = useCosmetics()
 const route = useNativeRoute()
 const router = useRouter()
-const tags = useTags()
+const tags = useGeneratedState()
 const config = useRuntimeConfig()
 
 const orgId = useRouteId()
diff --git a/apps/frontend/src/pages/report.vue b/apps/frontend/src/pages/report.vue
index ebadbc63..39d8ba43 100644
--- a/apps/frontend/src/pages/report.vue
+++ b/apps/frontend/src/pages/report.vue
@@ -298,7 +298,7 @@ import { useImageUpload } from '~/composables/image-upload.ts'
 
 const { addNotification } = injectNotificationManager()
 
-const tags = useTags()
+const tags = useGeneratedState()
 const route = useNativeRoute()
 const router = useRouter()
 
diff --git a/apps/frontend/src/pages/search/[searchProjectType].vue b/apps/frontend/src/pages/search/[searchProjectType].vue
index e28ec20e..c3b1925f 100644
--- a/apps/frontend/src/pages/search/[searchProjectType].vue
+++ b/apps/frontend/src/pages/search/[searchProjectType].vue
@@ -353,7 +353,7 @@ const route = useNativeRoute()
 const router = useNativeRouter()
 
 const cosmetics = useCosmetics()
-const tags = useTags()
+const tags = useGeneratedState()
 const flags = useFeatureFlags()
 const auth = await useAuth()
 
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/properties.vue b/apps/frontend/src/pages/servers/manage/[id]/options/properties.vue
index 6ec11dc0..ef033223 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/properties.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/properties.vue
@@ -77,13 +77,13 @@
 							v-if="overrides[index] && overrides[index].type === 'dropdown'"
 							class="mt-2 flex w-full sm:w-[320px] sm:justify-end"
 						>
-							<TeleportDropdownMenu
+							<Combobox
 								:id="`server-property-${index}`"
 								v-model="liveProperties[index]"
 								:name="formatPropertyName(index)"
-								:options="overrides[index].options || []"
+								:options="(overrides[index].options || []).map((v) => ({ value: v, label: v }))"
 								:aria-labelledby="`property-label-${index}`"
-								placeholder="Select..."
+								:display-value="String(liveProperties[index] ?? 'Select...')"
 							/>
 						</div>
 						<div v-else-if="typeof property === 'boolean'" class="flex justify-end">
@@ -159,7 +159,7 @@
 
 <script setup lang="ts">
 import { EyeIcon, IssuesIcon, SearchIcon } from '@modrinth/assets'
-import { ButtonStyled, injectNotificationManager, TeleportDropdownMenu } from '@modrinth/ui'
+import { ButtonStyled, Combobox, injectNotificationManager } from '@modrinth/ui'
 import Fuse from 'fuse.js'
 import { computed, inject, ref, watch } from 'vue'
 
@@ -171,7 +171,7 @@ const props = defineProps<{
 	server: ModrinthServer
 }>()
 
-const tags = useTags()
+const tags = useGeneratedState()
 
 const isUpdating = ref(false)
 
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue b/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue
index f1fbcc27..de335035 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue
@@ -77,12 +77,12 @@
 							/>
 							<label for="show-all-versions" class="text-sm">Show all Java versions</label>
 						</div>
-						<TeleportDropdownMenu
+						<Combobox
 							:id="'java-version-field'"
 							v-model="jdkVersion"
 							name="java-version"
-							:options="displayedJavaVersions"
-							placeholder="Java Version"
+							:options="displayedJavaVersions.map((v) => ({ value: v, label: v }))"
+							:display-value="jdkVersion ?? 'Java Version'"
 						/>
 					</div>
 					<div class="flex flex-col gap-4">
@@ -90,12 +90,12 @@
 							<span class="text-lg font-bold text-contrast">Runtime</span>
 							<span> The Java runtime your server will use. </span>
 						</div>
-						<TeleportDropdownMenu
+						<Combobox
 							:id="'runtime-field'"
 							v-model="jdkBuild"
 							name="runtime"
-							:options="['Corretto', 'Temurin', 'GraalVM']"
-							placeholder="Runtime"
+							:options="['Corretto', 'Temurin', 'GraalVM'].map((v) => ({ value: v, label: v }))"
+							:display-value="jdkBuild ?? 'Runtime'"
 						/>
 					</div>
 				</div>
@@ -113,7 +113,7 @@
 
 <script setup lang="ts">
 import { IssuesIcon, UpdatedIcon } from '@modrinth/assets'
-import { ButtonStyled, injectNotificationManager, TeleportDropdownMenu } from '@modrinth/ui'
+import { ButtonStyled, Combobox, injectNotificationManager } from '@modrinth/ui'
 
 import SaveBanner from '~/components/ui/servers/SaveBanner.vue'
 import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
diff --git a/apps/frontend/src/pages/settings.vue b/apps/frontend/src/pages/settings.vue
index 78d5f69a..d6df408b 100644
--- a/apps/frontend/src/pages/settings.vue
+++ b/apps/frontend/src/pages/settings.vue
@@ -5,75 +5,79 @@
 		</div>
 		<div class="normal-page">
 			<div class="normal-page__sidebar">
-				<aside class="universal-card">
-					<NavStack>
-						<h3>Display</h3>
-						<NavStackItem
-							link="/settings"
-							:label="formatMessage(commonSettingsMessages.appearance)"
-						>
-							<PaintbrushIcon />
-						</NavStackItem>
-						<NavStackItem
-							v-if="isStaging"
-							:badge="`${formatMessage(commonMessages.beta)}`"
-							link="/settings/language"
-							:label="formatMessage(commonSettingsMessages.language)"
-						>
-							<LanguagesIcon />
-						</NavStackItem>
-						<template v-if="auth.user">
-							<h3>Account</h3>
-							<NavStackItem
-								link="/settings/profile"
-								:label="formatMessage(commonSettingsMessages.profile)"
-							>
-								<UserIcon />
-							</NavStackItem>
-							<NavStackItem
-								link="/settings/account"
-								:label="formatMessage(commonSettingsMessages.account)"
-							>
-								<ShieldIcon />
-							</NavStackItem>
-							<NavStackItem
-								link="/settings/authorizations"
-								:label="formatMessage(commonSettingsMessages.authorizedApps)"
-							>
-								<GridIcon />
-							</NavStackItem>
-							<NavStackItem
-								link="/settings/sessions"
-								:label="formatMessage(commonSettingsMessages.sessions)"
-							>
-								<MonitorSmartphoneIcon />
-							</NavStackItem>
-							<NavStackItem
-								link="/settings/billing"
-								:label="formatMessage(commonSettingsMessages.billing)"
-							>
-								<CardIcon />
-							</NavStackItem>
-						</template>
-						<template v-if="auth.user">
-							<h3>Developer</h3>
-							<NavStackItem
-								link="/settings/pats"
-								:label="formatMessage(commonSettingsMessages.pats)"
-							>
-								<KeyIcon />
-							</NavStackItem>
-							<NavStackItem
-								link="/settings/applications"
-								:label="formatMessage(commonSettingsMessages.applications)"
-							>
-								<ServerIcon />
-							</NavStackItem>
-						</template>
-					</NavStack>
-				</aside>
+				<NavStack
+					:items="
+						[
+							{ type: 'heading', label: 'Display' },
+							{
+								link: '/settings',
+								label: formatMessage(commonSettingsMessages.appearance),
+								icon: PaintbrushIcon,
+							},
+							isStaging
+								? {
+										link: '/settings/language',
+										label: formatMessage(commonSettingsMessages.language),
+										icon: LanguagesIcon,
+										badge: `${formatMessage(commonMessages.beta)}`,
+									}
+								: null,
+							auth.user ? { type: 'heading', label: 'Account' } : null,
+							auth.user
+								? {
+										link: '/settings/profile',
+										label: formatMessage(commonSettingsMessages.profile),
+										icon: UserIcon,
+									}
+								: null,
+							auth.user
+								? {
+										link: '/settings/account',
+										label: formatMessage(commonSettingsMessages.account),
+										icon: ShieldIcon,
+									}
+								: null,
+							auth.user
+								? {
+										link: '/settings/authorizations',
+										label: formatMessage(commonSettingsMessages.authorizedApps),
+										icon: GridIcon,
+									}
+								: null,
+							auth.user
+								? {
+										link: '/settings/sessions',
+										label: formatMessage(commonSettingsMessages.sessions),
+										icon: MonitorSmartphoneIcon,
+									}
+								: null,
+							auth.user
+								? {
+										link: '/settings/billing',
+										label: formatMessage(commonSettingsMessages.billing),
+										icon: CardIcon,
+									}
+								: null,
+							auth.user ? { type: 'heading', label: 'Developer' } : null,
+							auth.user
+								? {
+										link: '/settings/pats',
+										label: formatMessage(commonSettingsMessages.pats),
+										icon: KeyIcon,
+									}
+								: null,
+							auth.user
+								? {
+										link: '/settings/applications',
+										label: formatMessage(commonSettingsMessages.applications),
+										icon: ServerIcon,
+									}
+								: null,
+						].filter(Boolean)
+					"
+				/>
 			</div>
-			<div class="normal-page__content">
+			<div class="normal-page__content mt-3 lg:mt-0">
 				<NuxtPage :route="route" />
 			</div>
 		</div>
@@ -94,7 +98,6 @@ import {
 import { commonMessages, commonSettingsMessages } from '@modrinth/ui'
 
 import NavStack from '~/components/ui/NavStack.vue'
-import NavStackItem from '~/components/ui/NavStackItem.vue'
 
 const { formatMessage } = useVIntl()
 
diff --git a/apps/frontend/src/pages/settings/index.vue b/apps/frontend/src/pages/settings/index.vue
index 5038c411..698c3a68 100644
--- a/apps/frontend/src/pages/settings/index.vue
+++ b/apps/frontend/src/pages/settings/index.vue
@@ -345,7 +345,7 @@ const toggleFeatures = defineMessages({
 
 const cosmetics = useCosmetics()
 const flags = useFeatureFlags()
-const tags = useTags()
+const tags = useGeneratedState()
 
 const theme = useTheme()
 
diff --git a/apps/frontend/src/pages/user/[id].vue b/apps/frontend/src/pages/user/[id].vue
index a9491367..e6d876a8 100644
--- a/apps/frontend/src/pages/user/[id].vue
+++ b/apps/frontend/src/pages/user/[id].vue
@@ -5,12 +5,7 @@
 		<NewModal ref="editRoleModal" header="Edit role">
 			<div class="flex w-80 flex-col gap-4">
 				<div class="flex flex-col gap-2">
-					<TeleportDropdownMenu
-						v-model="selectedRole"
-						:options="roleOptions"
-						name="edit-role"
-						placeholder="Select a role"
-					/>
+					<Combobox v-model="selectedRole" :options="roleOptions" placeholder="Select a role" />
 				</div>
 				<div class="flex justify-end gap-2">
 					<ButtonStyled>
@@ -460,13 +455,13 @@ import {
 import {
 	Avatar,
 	ButtonStyled,
+	Combobox,
 	commonMessages,
 	ContentPageHeader,
 	injectNotificationManager,
 	NewModal,
 	OverflowMenu,
 	TagItem,
-	TeleportDropdownMenu,
 	useRelativeTime,
 } from '@modrinth/ui'
 import { isAdmin, UserBadge } from '@modrinth/utils'
@@ -492,7 +487,7 @@ const data = useNuxtApp()
 const route = useNativeRoute()
 const auth = await useAuth()
 const cosmetics = useCosmetics()
-const tags = useTags()
+const tags = useGeneratedState()
 const config = useRuntimeConfig()
 
 const vintl = useVIntl()
@@ -841,7 +836,11 @@ const navLinks = computed(() => [
 const selectedRole = ref(user.value.role)
 const isSavingRole = ref(false)
 
-const roleOptions = ['developer', 'moderator', 'admin']
+const roleOptions = [
+	{ value: 'developer', label: 'Developer' },
+	{ value: 'moderator', label: 'Moderator' },
+	{ value: 'admin', label: 'Admin' },
+]
 
 const editRoleModal = useTemplateRef('editRoleModal')
 
diff --git a/apps/frontend/src/plugins/shorthands.js b/apps/frontend/src/plugins/shorthands.js
index e5ac4650..015fd5e6 100644
--- a/apps/frontend/src/plugins/shorthands.js
+++ b/apps/frontend/src/plugins/shorthands.js
@@ -1,7 +1,7 @@
 import { getProjectTypeForUrlShorthand } from '~/helpers/projects.js'
 
 export default defineNuxtPlugin((nuxtApp) => {
-	const tagStore = useTags()
+	const tagStore = useGeneratedState()
 
 	nuxtApp.provide('formatNumber', formatNumber)
 	nuxtApp.provide('capitalizeString', capitalizeString)
diff --git a/apps/frontend/src/providers/creator-withdraw.ts b/apps/frontend/src/providers/creator-withdraw.ts
new file mode 100644
index 00000000..9d861c07
--- /dev/null
+++ b/apps/frontend/src/providers/creator-withdraw.ts
@@ -0,0 +1,917 @@
+import {
+	BadgeDollarSignIcon,
+	GiftIcon,
+	HandHelpingIcon,
+	LandmarkIcon,
+	PayPalColorIcon,
+	VenmoColorIcon,
+} from '@modrinth/assets'
+import { createContext, paymentMethodMessages, useDebugLogger } from '@modrinth/ui'
+import type { MessageDescriptor } from '@vintl/vintl'
+import { type Component, computed, type ComputedRef, type Ref, ref } from 'vue'
+
+import { getRailConfig } from '@/utils/muralpay-rails'
+
+// Tax form is required when withdrawn_ytd >= $600
+// Therefore, the maximum withdrawal without a tax form is $599.99
+export const TAX_THRESHOLD_REQUIREMENT = 600
+export const TAX_THRESHOLD_ACTUAL = 599.99
+
+export type WithdrawStage =
+	| 'tax-form'
+	| 'method-selection'
+	| 'tremendous-details'
+	| 'muralpay-kyc'
+	| 'muralpay-details'
+	| 'paypal-details'
+	| 'completion'
+
+export type PaymentProvider = 'tremendous' | 'muralpay' | 'paypal' | 'venmo'
+
+/**
+ * only used for the method selection stage logic - not actually for API requests
+ **/
+export type PaymentMethod = 'gift_card' | 'paypal' | 'venmo' | 'bank' | 'crypto'
+
+export interface PayoutMethod {
+	id: string
+	type: string
+	name: string
+	category?: string
+	image_url: string | null
+	image_logo_url: string | null
+	fee: {
+		percentage: number
+		min: number
+		max: number | null
+	}
+	interval: {
+		standard: {
+			min: number
+			max: number
+		}
+		fixed?: {
+			values: number[]
+		}
+	}
+	config?: {
+		fiat?: string | null
+		blockchain?: string[]
+	}
+}
+
+export interface PaymentOption {
+	value: string
+	label: string | MessageDescriptor
+	icon: Component
+	methodId: string | undefined
+	fee: string
+	type: string
+}
+
+export interface Country {
+	id: string
+	name: string
+}
+
+export interface WithdrawalResult {
+	created: Date
+	amount: number
+	fee: number
+	netAmount: number
+	methodType: string
+	recipientDisplay: string
+}
+
+export interface KycData {
+	type: 'individual' | 'business'
+	email: string
+	firstName?: string
+	lastName?: string
+	dateOfBirth?: string
+	name?: string
+	physicalAddress: {
+		address1: string
+		address2?: string
+		city: string
+		state: string
+		country: string
+		zip: string
+	}
+}
+
+export interface AccountDetails {
+	bankName?: string
+	walletAddress?: string
+	documentNumber?: string
+	[key: string]: any // for dynamic rail fields
+}
+
+export interface GiftCardDetails {
+	[key: string]: any
+}
+
+export interface SelectionData {
+	country: Country | null
+	provider: PaymentProvider | null
+	method: string | null
+	methodId: string | null
+}
+
+export interface TaxData {
+	skipped: boolean
+}
+
+export interface CalculationData {
+	amount: number
+	fee: number | null
+	exchangeRate: number | null
+}
+
+export interface TremendousProviderData {
+	type: 'tremendous'
+	deliveryEmail: string
+	giftCardDetails: GiftCardDetails | null
+	currency?: string
+}
+
+export interface MuralPayProviderData {
+	type: 'muralpay'
+	kycData: KycData
+	accountDetails: AccountDetails
+}
+
+export interface PayPalVenmoProviderData {
+	type: 'paypal' | 'venmo'
+}
+
+export interface NoProviderData {
+	type: null
+}
+
+export type ProviderData =
+	| TremendousProviderData
+	| MuralPayProviderData
+	| PayPalVenmoProviderData
+	| NoProviderData
+
+export interface WithdrawData {
+	selection: SelectionData
+	tax: TaxData
+	calculation: CalculationData
+	providerData: ProviderData
+	result: WithdrawalResult | null
+	agreedTerms: boolean
+	stageValidation: {
+		paypalDetails?: boolean
+	}
+}
+
+export interface SavedWithdrawState {
+	timestamp: number
+	stage: WithdrawStage
+	data: WithdrawData
+}
+
+export interface WithdrawContextValue {
+	currentStage: Ref<WithdrawStage | undefined>
+	stages: ComputedRef<WithdrawStage[]>
+
+	canProceed: ComputedRef<boolean>
+	nextStep: ComputedRef<WithdrawStage | undefined>
+	previousStep: ComputedRef<WithdrawStage | undefined>
+	currentStepIndex: ComputedRef<number>
+
+	withdrawData: Ref<WithdrawData>
+	balance: Ref<any>
+	maxWithdrawAmount: ComputedRef<number>
+	availableMethods: Ref<PayoutMethod[]>
+	paymentOptions: ComputedRef<PaymentOption[]>
+	preloadedCountry: Ref<string | undefined>
+	paymentMethodsCache: Ref<Record<string, PayoutMethod[]>>
+
+	setStage: (stage: WithdrawStage | undefined, skipValidation?: boolean) => Promise<void>
+	validateCurrentStage: () => boolean
+	resetData: () => void
+	calculateFees: () => Promise<{ fee: number | null; exchange_rate: number | null }>
+	submitWithdrawal: () => Promise<void>
+	saveStateToStorage: () => void
+	restoreStateFromStorage: () => SavedWithdrawState | null
+	clearSavedState: () => void
+}
+
+export const [injectWithdrawContext, provideWithdrawContext] =
+	createContext<WithdrawContextValue>('CreatorWithdrawModal')
+
+export function useWithdrawContext() {
+	return injectWithdrawContext()
+}
+
+function isTremendousProvider(data: ProviderData): data is TremendousProviderData {
+	return data.type === 'tremendous'
+}
+
+function isMuralPayProvider(data: ProviderData): data is MuralPayProviderData {
+	return data.type === 'muralpay'
+}
+
+function buildRecipientInfo(kycData: KycData) {
+	return {
+		type: kycData.type,
+		...(kycData.type === 'individual'
+			? {
+					firstName: kycData.firstName,
+					lastName: kycData.lastName,
+					dateOfBirth: kycData.dateOfBirth,
+				}
+			: {
+					name: kycData.name,
+				}),
+		email: kycData.email,
+		physicalAddress: kycData.physicalAddress,
+	}
+}
+
+function getAccountOwnerName(kycData: KycData): string {
+	if (kycData.type === 'individual') {
+		return `${kycData.firstName} ${kycData.lastName}`
+	}
+	return kycData.name || ''
+}
+
+function getMethodDisplayName(method: string | null): string {
+	if (!method) return ''
+	const methodMap: Record<string, string> = {
+		paypal: 'PayPal',
+		venmo: 'Venmo',
+		merchant_card: 'Gift Card',
+		charity: 'Charity',
+		visa_card: 'Virtual Visa',
+	}
+	if (methodMap[method]) return methodMap[method]
+	if (method.startsWith('fiat_')) {
+		return 'Bank Transfer'
+	}
+	if (method.startsWith('blockchain_')) {
+		return 'Crypto'
+	}
+	return method
+}
+
+function getRecipientDisplay(data: WithdrawData): string {
+	if (isTremendousProvider(data.providerData)) {
+		return data.providerData.deliveryEmail
+	}
+	if (isMuralPayProvider(data.providerData)) {
+		const kycData = data.providerData.kycData
+		if (kycData.type === 'individual') {
+			return `${kycData.firstName} ${kycData.lastName}`
+		}
+		return kycData.name || ''
+	}
+	return ''
+}
+
+interface PayoutPayload {
+	amount: number
+	method: 'tremendous' | 'muralpay' | 'paypal' | 'venmo'
+	method_id: string
+	method_details?: {
+		delivery_email?: string
+		payout_details?: any
+		recipient_info?: any
+	}
+}
+
+function buildPayoutPayload(data: WithdrawData): PayoutPayload {
+	if (data.selection.provider === 'paypal' || data.selection.provider === 'venmo') {
+		return {
+			amount: data.calculation.amount,
+			method: data.selection.provider,
+			method_id: data.selection.methodId!,
+		}
+	} else if (data.selection.provider === 'tremendous') {
+		if (!isTremendousProvider(data.providerData)) {
+			throw new Error('Invalid provider data for Tremendous')
+		}
+		const methodDetails: any = {
+			delivery_email: data.providerData.deliveryEmail,
+		}
+		if (data.providerData.currency && data.selection.method === 'paypal') {
+			methodDetails.currency = data.providerData.currency
+		}
+		return {
+			amount: data.calculation.amount,
+			method: 'tremendous',
+			method_id: data.selection.methodId!,
+			method_details: methodDetails,
+		}
+	} else if (data.selection.provider === 'muralpay') {
+		if (!isMuralPayProvider(data.providerData)) {
+			throw new Error('Invalid provider data for MuralPay')
+		}
+		const railId = data.selection.method!
+		const rail = getRailConfig(railId)
+
+		if (!rail) throw new Error('Invalid payment method')
+
+		if (rail.type === 'crypto') {
+			return {
+				amount: data.calculation.amount,
+				method: 'muralpay',
+				method_id: data.selection.methodId!,
+				method_details: {
+					payout_details: {
+						type: 'blockchain',
+						wallet_address: data.providerData.accountDetails.walletAddress || null,
+					},
+					recipient_info: buildRecipientInfo(data.providerData.kycData),
+				},
+			}
+		} else if (rail.type === 'fiat') {
+			const fiatAndRailDetails: Record<string, any> = {
+				type: rail.railCode || '',
+				symbol: rail.currency || '',
+			}
+
+			for (const field of rail.fields) {
+				const value = data.providerData.accountDetails[field.name]
+				if (value !== undefined && value !== null && value !== '') {
+					fiatAndRailDetails[field.name] = value
+				}
+			}
+
+			if (data.providerData.accountDetails.documentNumber) {
+				fiatAndRailDetails.documentNumber = data.providerData.accountDetails.documentNumber
+			}
+
+			return {
+				amount: data.calculation.amount,
+				method: 'muralpay',
+				method_id: data.selection.methodId!,
+				method_details: {
+					payout_details: {
+						type: 'fiat',
+						bank_name: data.providerData.accountDetails.bankName || '',
+						bank_account_owner: getAccountOwnerName(data.providerData.kycData),
+						fiat_and_rail_details: fiatAndRailDetails,
+					},
+					recipient_info: buildRecipientInfo(data.providerData.kycData),
+				},
+			}
+		}
+	}
+
+	throw new Error('Invalid provider')
+}
+
+const STORAGE_KEY = 'modrinth_withdraw_state'
+const STATE_EXPIRY_MS = 15 * 60 * 1000 // 15 minutes
+
+export function createWithdrawContext(
+	balance: any,
+	preloadedPaymentData?: { country: string; methods: PayoutMethod[] },
+): WithdrawContextValue {
+	const debug = useDebugLogger('CreatorWithdraw')
+	const currentStage = ref<WithdrawStage | undefined>()
+
+	const withdrawData = ref<WithdrawData>({
+		selection: {
+			country: null,
+			provider: null,
+			method: null,
+			methodId: null,
+		},
+		tax: {
+			skipped: false,
+		},
+		calculation: {
+			amount: 0,
+			fee: null,
+			exchangeRate: null,
+		},
+		providerData: {
+			type: null,
+		},
+		result: null,
+		agreedTerms: false,
+		stageValidation: {},
+	})
+
+	const balanceRef = ref(balance)
+	const availableMethods = ref<PayoutMethod[]>(preloadedPaymentData?.methods || [])
+	const preloadedCountry = ref(preloadedPaymentData?.country)
+
+	const paymentMethodsCache = ref<Record<string, PayoutMethod[]>>(
+		preloadedPaymentData ? { [preloadedPaymentData.country]: preloadedPaymentData.methods } : {},
+	)
+
+	const stages = computed<WithdrawStage[]>(() => {
+		const dynamicStages: WithdrawStage[] = []
+
+		const usedLimit = balance?.withdrawn_ytd ?? 0
+		const available = balance?.available ?? 0
+
+		const needsTaxForm =
+			balance?.form_completion_status !== 'complete' && usedLimit + available >= 600
+
+		debug('Tax form check:', {
+			usedLimit,
+			available,
+			total: usedLimit + available,
+			status: balance?.form_completion_status,
+			needsTaxForm,
+		})
+
+		if (needsTaxForm) {
+			dynamicStages.push('tax-form')
+		}
+
+		dynamicStages.push('method-selection')
+
+		const selectedProvider = withdrawData.value.selection.provider
+		if (selectedProvider === 'tremendous') {
+			dynamicStages.push('tremendous-details')
+		} else if (selectedProvider === 'muralpay') {
+			dynamicStages.push('muralpay-kyc')
+			dynamicStages.push('muralpay-details')
+		} else if (selectedProvider === 'paypal' || selectedProvider === 'venmo') {
+			dynamicStages.push('paypal-details')
+		}
+
+		dynamicStages.push('completion')
+
+		return dynamicStages
+	})
+
+	const maxWithdrawAmount = computed(() => {
+		const availableBalance = balance?.available ?? 0
+		const formCompleted = balance?.form_completion_status === 'complete'
+
+		if (formCompleted) {
+			return availableBalance
+		}
+
+		const usedLimit = balance?.withdrawn_ytd ?? 0
+		const remainingLimit = Math.max(0, TAX_THRESHOLD_ACTUAL - usedLimit)
+		return Math.min(remainingLimit, availableBalance)
+	})
+
+	const paymentOptions = computed<PaymentOption[]>(() => {
+		const methods = availableMethods.value
+		if (!methods || methods.length === 0) {
+			debug('No payment methods available')
+			return []
+		}
+
+		debug('Available methods:', methods)
+
+		const options: PaymentOption[] = []
+
+		const tremendousMethods = methods.filter((m) => m.type === 'tremendous')
+
+		const internationalPaypalMethod = tremendousMethods.find(
+			(m) => m.type === 'tremendous' && m.category === 'paypal',
+		)
+		// TODO: remove this US check when boris removes it from backend
+		if (internationalPaypalMethod && withdrawData.value.selection.country?.id != 'US') {
+			options.push({
+				value: 'paypal',
+				label: paymentMethodMessages.paypalInternational,
+				icon: PayPalColorIcon,
+				methodId: internationalPaypalMethod.id,
+				fee: '≈ 6%, max $25',
+				type: 'tremendous',
+			})
+		}
+
+		const merchantMethods = tremendousMethods.filter(
+			(m) => m.category === 'merchant_card' || m.category === 'merchant_cards',
+		)
+		if (merchantMethods.length > 0) {
+			options.push({
+				value: 'merchant_card',
+				label: paymentMethodMessages.giftCard,
+				icon: GiftIcon,
+				methodId: undefined,
+				fee: '≈ 0%',
+				type: 'tremendous',
+			})
+		}
+
+		const charityMethods = tremendousMethods.filter((m) => m.category === 'charity')
+		if (charityMethods.length > 0) {
+			options.push({
+				value: 'charity',
+				label: paymentMethodMessages.charity,
+				icon: HandHelpingIcon,
+				methodId: undefined,
+				fee: '≈ 0%',
+				type: 'tremendous',
+			})
+		}
+
+		const muralPayMethods = methods.filter((m) => m.type === 'muralpay')
+		for (const method of muralPayMethods) {
+			const methodId = method.id
+
+			if (methodId.startsWith('fiat_')) {
+				const rail = getRailConfig(methodId)
+
+				if (!rail) {
+					debug('Warning: No rail config found for', methodId)
+					continue
+				}
+
+				options.push({
+					value: methodId,
+					label: rail.name,
+					icon: LandmarkIcon,
+					methodId: method.id,
+					fee: rail.fee,
+					type: 'fiat',
+				})
+			} else if (methodId.startsWith('blockchain_')) {
+				const rail = getRailConfig(methodId)
+
+				if (!rail) {
+					debug('Warning: No rail config found for', methodId)
+					continue
+				}
+
+				options.push({
+					value: methodId,
+					label: rail.name,
+					icon: getCurrencyIcon(rail.currency) || BadgeDollarSignIcon,
+					methodId: method.id,
+					fee: rail.fee,
+					type: 'crypto',
+				})
+			}
+		}
+
+		const directPaypal = methods.find((m) => m.type === 'paypal')
+		if (directPaypal) {
+			options.push({
+				value: directPaypal.id,
+				label: paymentMethodMessages.paypal,
+				icon: PayPalColorIcon,
+				methodId: directPaypal.id,
+				fee: `≈ 2% + $0.25, max $1`,
+				type: 'paypal',
+			})
+		}
+
+		const directVenmo = methods.find((m) => m.type === 'venmo')
+		if (directVenmo) {
+			options.push({
+				value: directVenmo.id,
+				label: paymentMethodMessages.venmo,
+				icon: VenmoColorIcon,
+				methodId: directVenmo.id,
+				fee: `≈ 2% + $0.25, max $1`,
+				type: 'venmo',
+			})
+		}
+
+		const sortOrder = ['fiat', 'paypal', 'venmo', 'crypto', 'merchant_card', 'charity']
+		options.sort((a, b) => {
+			const getOrder = (item: PaymentOption) => {
+				let order = sortOrder.indexOf(item.type)
+				if (order === -1) order = sortOrder.indexOf(item.value)
+				return order !== -1 ? order : 999
+			}
+			return getOrder(a) - getOrder(b)
+		})
+
+		debug('Payment options computed:', options)
+		return options
+	})
+
+	const currentStepIndex = computed(() =>
+		currentStage.value ? stages.value.indexOf(currentStage.value) : -1,
+	)
+
+	const nextStep = computed(() => {
+		if (!currentStage.value) return undefined
+		const currentIndex = currentStepIndex.value
+		if (currentIndex === -1 || currentIndex >= stages.value.length - 1) return undefined
+		return stages.value[currentIndex + 1]
+	})
+
+	const previousStep = computed(() => {
+		if (!currentStage.value) return undefined
+		const currentIndex = currentStepIndex.value
+		if (currentIndex <= 0) return undefined
+		return stages.value[currentIndex - 1]
+	})
+
+	const canProceed = computed(() => {
+		return validateCurrentStage()
+	})
+
+	function validateCurrentStage(): boolean {
+		switch (currentStage.value) {
+			case 'tax-form': {
+				if (!balanceRef.value) return true
+				const ytd = balanceRef.value.withdrawn_ytd ?? 0
+				const remainingLimit = Math.max(0, TAX_THRESHOLD_ACTUAL - ytd)
+				const form_completion_status = balanceRef.value.form_completion_status
+				if (ytd < 600) return true
+				if (withdrawData.value.tax.skipped && remainingLimit > 0) return true
+				return form_completion_status === 'complete'
+			}
+			case 'method-selection':
+				return !!(
+					withdrawData.value.selection.country &&
+					withdrawData.value.selection.provider &&
+					withdrawData.value.selection.method &&
+					(withdrawData.value.selection.method === 'merchant_card' ||
+						withdrawData.value.selection.method === 'charity' ||
+						withdrawData.value.selection.methodId)
+				)
+			case 'tremendous-details': {
+				const method = withdrawData.value.selection.method
+				const amount = withdrawData.value.calculation.amount
+
+				const selectedMethod = availableMethods.value.find(
+					(m) => m.id === withdrawData.value.selection.methodId,
+				)
+
+				if (selectedMethod?.interval) {
+					if (selectedMethod.interval.standard) {
+						const { min, max } = selectedMethod.interval.standard
+						if (amount < min || amount > max) return false
+					}
+					if (selectedMethod.interval.fixed) {
+						if (!selectedMethod.interval.fixed.values.includes(amount)) return false
+					}
+				}
+
+				if (method === 'merchant_card' || method === 'charity') {
+					if (!isTremendousProvider(withdrawData.value.providerData)) return false
+					return !!(
+						withdrawData.value.selection.methodId &&
+						amount > 0 &&
+						withdrawData.value.providerData.deliveryEmail &&
+						withdrawData.value.agreedTerms
+					)
+				}
+				if (!isTremendousProvider(withdrawData.value.providerData)) return false
+				return !!(
+					amount > 0 &&
+					withdrawData.value.providerData.deliveryEmail &&
+					withdrawData.value.agreedTerms
+				)
+			}
+			case 'muralpay-kyc': {
+				if (!isMuralPayProvider(withdrawData.value.providerData)) return false
+
+				const kycData = withdrawData.value.providerData.kycData
+				if (!kycData) return false
+
+				const hasValidAddress = !!(
+					kycData.physicalAddress?.address1 &&
+					kycData.physicalAddress?.city &&
+					kycData.physicalAddress?.state &&
+					kycData.physicalAddress?.country &&
+					kycData.physicalAddress?.zip
+				)
+
+				if (kycData.type === 'individual') {
+					return !!(
+						kycData.firstName &&
+						kycData.lastName &&
+						kycData.email &&
+						kycData.dateOfBirth &&
+						hasValidAddress
+					)
+				} else if (kycData.type === 'business') {
+					return !!(kycData.name && kycData.email && hasValidAddress)
+				}
+
+				return false
+			}
+			case 'muralpay-details': {
+				if (!isMuralPayProvider(withdrawData.value.providerData)) return false
+
+				const railId = withdrawData.value.selection.method
+				const rail = getRailConfig(railId as string)
+				if (!rail) return false
+
+				if (!withdrawData.value.calculation.amount || withdrawData.value.calculation.amount <= 0)
+					return false
+
+				const amount = withdrawData.value.calculation.amount
+				const selectedMethod = availableMethods.value.find(
+					(m) => m.id === withdrawData.value.selection.methodId,
+				)
+				if (selectedMethod?.interval?.standard) {
+					const { min, max } = selectedMethod.interval.standard
+					if (amount < min || amount > max) return false
+				}
+
+				const accountDetails = withdrawData.value.providerData.accountDetails
+				if (!accountDetails) return false
+
+				if (rail.requiresBankName && !accountDetails.bankName) return false
+
+				const requiredFields = rail.fields.filter((f) => f.required)
+				const allRequiredPresent = requiredFields.every((f) => {
+					const value = accountDetails[f.name]
+					return value !== undefined && value !== null && value !== ''
+				})
+
+				return allRequiredPresent && withdrawData.value.agreedTerms
+			}
+			case 'paypal-details': {
+				const amount = withdrawData.value.calculation.amount
+				if (!amount || amount <= 0) return false
+
+				const selectedMethod = availableMethods.value.find(
+					(m) => m.id === withdrawData.value.selection.methodId,
+				)
+				if (selectedMethod?.interval?.standard) {
+					const { min, max } = selectedMethod.interval.standard
+					if (amount < min || amount > max) return false
+				}
+
+				return !!withdrawData.value.stageValidation?.paypalDetails
+			}
+			case 'completion':
+				return true
+			default:
+				return false
+		}
+	}
+
+	async function setStage(stage: WithdrawStage | undefined, skipValidation = false) {
+		if (!skipValidation && !canProceed.value) {
+			return
+		}
+
+		const detailsStages: WithdrawStage[] = [
+			'tremendous-details',
+			'muralpay-details',
+			'paypal-details',
+		]
+		const isLeavingDetails = currentStage.value && detailsStages.includes(currentStage.value)
+		const isGoingToMethodSelection = stage === 'method-selection'
+
+		if (isLeavingDetails && isGoingToMethodSelection) {
+			withdrawData.value.calculation.amount = 0
+			withdrawData.value.calculation.fee = null
+			withdrawData.value.calculation.exchangeRate = null
+			withdrawData.value.agreedTerms = false
+			withdrawData.value.stageValidation = {}
+		}
+
+		currentStage.value = stage
+	}
+
+	function resetData() {
+		withdrawData.value = {
+			selection: {
+				country: null,
+				provider: null,
+				method: null,
+				methodId: null,
+			},
+			tax: {
+				skipped: false,
+			},
+			calculation: {
+				amount: 0,
+				fee: null,
+				exchangeRate: null,
+			},
+			providerData: {
+				type: null,
+			},
+			result: null,
+			agreedTerms: false,
+			stageValidation: {},
+		}
+		currentStage.value = undefined
+		availableMethods.value = []
+		clearSavedState()
+	}
+
+	async function calculateFees(): Promise<{ fee: number | null; exchange_rate: number | null }> {
+		const payload = buildPayoutPayload(withdrawData.value)
+
+		const response = (await useBaseFetch('payout/fees', {
+			apiVersion: 3,
+			method: 'POST',
+			body: payload,
+		})) as { fee: number | string | null; exchange_rate: number | string | null }
+
+		const parsedFee = response.fee ? Number.parseFloat(String(response.fee)) : 0
+		const parsedExchangeRate = response.exchange_rate
+			? Number.parseFloat(String(response.exchange_rate))
+			: null
+
+		withdrawData.value.calculation.fee = parsedFee
+		withdrawData.value.calculation.exchangeRate = parsedExchangeRate
+
+		return {
+			fee: parsedFee,
+			exchange_rate: parsedExchangeRate,
+		}
+	}
+
+	async function submitWithdrawal(): Promise<void> {
+		const payload = buildPayoutPayload(withdrawData.value)
+
+		debug('Withdrawal payload:', payload)
+
+		await useBaseFetch('payout', {
+			apiVersion: 3,
+			method: 'POST',
+			body: payload,
+		})
+
+		withdrawData.value.result = {
+			created: new Date(),
+			amount: withdrawData.value.calculation.amount,
+			fee: withdrawData.value.calculation.fee || 0,
+			netAmount: withdrawData.value.calculation.amount - (withdrawData.value.calculation.fee || 0),
+			methodType: getMethodDisplayName(withdrawData.value.selection.method),
+			recipientDisplay: getRecipientDisplay(withdrawData.value),
+		}
+
+		debug('Withdrawal submitted successfully', withdrawData.value.result)
+	}
+
+	function saveStateToStorage(): void {
+		const state: SavedWithdrawState = {
+			timestamp: Date.now(),
+			stage: currentStage.value || 'method-selection',
+			data: withdrawData.value,
+		}
+		try {
+			if (typeof localStorage !== 'undefined') {
+				localStorage.setItem(STORAGE_KEY, JSON.stringify(state))
+			}
+		} catch (e) {
+			console.warn('Failed to save withdraw state:', e)
+		}
+	}
+
+	function restoreStateFromStorage(): SavedWithdrawState | null {
+		try {
+			if (typeof localStorage === 'undefined') return null
+
+			const saved = localStorage.getItem(STORAGE_KEY)
+			if (!saved) return null
+
+			const state: SavedWithdrawState = JSON.parse(saved)
+			const age = Date.now() - state.timestamp
+
+			if (age > STATE_EXPIRY_MS) {
+				clearSavedState()
+				return null
+			}
+
+			return state
+		} catch (e) {
+			console.warn('Failed to restore withdraw state:', e)
+			clearSavedState()
+			return null
+		}
+	}
+
+	function clearSavedState(): void {
+		try {
+			if (typeof localStorage !== 'undefined') {
+				localStorage.removeItem(STORAGE_KEY)
+			}
+		} catch (e) {
+			console.warn('Failed to clear withdraw state:', e)
+		}
+	}
+
+	return {
+		currentStage,
+		stages,
+		canProceed,
+		nextStep,
+		previousStep,
+		currentStepIndex,
+		withdrawData,
+		balance: balanceRef,
+		maxWithdrawAmount,
+		availableMethods,
+		paymentOptions,
+		preloadedCountry,
+		paymentMethodsCache,
+		setStage,
+		validateCurrentStage,
+		resetData,
+		calculateFees,
+		submitWithdrawal,
+		saveStateToStorage,
+		restoreStateFromStorage,
+		clearSavedState,
+	}
+}
diff --git a/apps/frontend/src/utils/finance-icons.ts b/apps/frontend/src/utils/finance-icons.ts
new file mode 100644
index 00000000..3fcf014d
--- /dev/null
+++ b/apps/frontend/src/utils/finance-icons.ts
@@ -0,0 +1,34 @@
+import { PolygonIcon, USDCColorIcon } from '@modrinth/assets'
+import type { Component } from 'vue'
+
+export function getCurrencyIcon(currency: string): Component | null {
+	const lower = currency.toLocaleLowerCase()
+
+	if (lower.includes('usdc')) return USDCColorIcon
+
+	return null
+}
+
+export function getCurrencyColor(currency: string): string {
+	const lower = currency.toLowerCase()
+
+	if (lower.includes('usdc')) return 'text-blue'
+
+	return 'text-contrast'
+}
+
+export function getBlockchainIcon(blockchain: string): Component | null {
+	const lower = blockchain.toLowerCase()
+
+	if (lower.includes('polygon')) return PolygonIcon
+
+	return null
+}
+
+export function getBlockchainColor(blockchain: string): string {
+	const lower = blockchain.toLowerCase()
+
+	if (lower.includes('polygon')) return 'text-purple'
+
+	return 'text-contrast'
+}
diff --git a/apps/frontend/src/utils/muralpay-rails.ts b/apps/frontend/src/utils/muralpay-rails.ts
new file mode 100644
index 00000000..d04ebf9c
--- /dev/null
+++ b/apps/frontend/src/utils/muralpay-rails.ts
@@ -0,0 +1,998 @@
+import { defineMessage, type MessageDescriptor } from '@vintl/vintl'
+
+export type FieldType = 'text' | 'select' | 'email' | 'tel' | 'date'
+
+export interface FieldConfig {
+	name: string
+	type: FieldType
+	label: MessageDescriptor
+	required: boolean
+	placeholder?: MessageDescriptor
+	helpText?: MessageDescriptor
+	options?: Array<{ value: string; label: MessageDescriptor }>
+	pattern?: string
+	validate?: (value: string) => string | null
+	autocomplete?: string
+}
+
+export interface RailConfig {
+	id: string
+	name: MessageDescriptor
+	currency: string
+	fee: string
+	type: 'fiat' | 'crypto'
+	railCode?: string
+	blockchain?: string
+	fields: FieldConfig[]
+	warningMessage?: MessageDescriptor
+	requiresBankName?: boolean
+}
+
+const DOCUMENT_TYPE_OPTIONS = [
+	{
+		value: 'NATIONAL_ID',
+		label: defineMessage({
+			id: 'muralpay.document-type.national-id',
+			defaultMessage: 'National ID',
+		}),
+	},
+	{
+		value: 'PASSPORT',
+		label: defineMessage({ id: 'muralpay.document-type.passport', defaultMessage: 'Passport' }),
+	},
+	{
+		value: 'RESIDENT_ID',
+		label: defineMessage({
+			id: 'muralpay.document-type.resident-id',
+			defaultMessage: 'Resident ID',
+		}),
+	},
+	{
+		value: 'RUC',
+		label: defineMessage({ id: 'muralpay.document-type.ruc', defaultMessage: 'RUC' }),
+	},
+	{
+		value: 'TAX_ID',
+		label: defineMessage({ id: 'muralpay.document-type.tax-id', defaultMessage: 'Tax ID' }),
+	},
+]
+
+const ACCOUNT_TYPE_OPTIONS = [
+	{
+		value: 'CHECKING',
+		label: defineMessage({ id: 'muralpay.account-type.checking', defaultMessage: 'Checking' }),
+	},
+	{
+		value: 'SAVINGS',
+		label: defineMessage({ id: 'muralpay.account-type.savings', defaultMessage: 'Savings' }),
+	},
+]
+
+export const MURALPAY_RAILS: Record<string, RailConfig> = {
+	fiat_usd: {
+		id: 'fiat_usd',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-usd.name',
+			defaultMessage: 'Bank Transfer (USD)',
+		}),
+		currency: 'USD',
+		type: 'fiat',
+		fee: '≈ 1.50% + $0.50',
+		railCode: 'usd',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'accountType',
+				type: 'select',
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				required: true,
+				options: ACCOUNT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+			{
+				name: 'bankAccountNumber',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.bank-account-number',
+					defaultMessage: 'Account Number',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.enter-account-number',
+					defaultMessage: 'Enter account number',
+				}),
+				autocomplete: 'off',
+			},
+			{
+				name: 'bankRoutingNumber',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.routing-number',
+					defaultMessage: 'Routing Number',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.enter-routing-number',
+					defaultMessage: 'Enter 9-digit routing number',
+				}),
+				pattern: '^[0-9]{9}$',
+				validate: (val) => (/^\d{9}$/.test(val) ? null : 'Must be exactly 9 digits'),
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	fiat_eur: {
+		id: 'fiat_eur',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-eur.name',
+			defaultMessage: 'Bank Transfer (EUR)',
+		}),
+		currency: 'EUR',
+		type: 'fiat',
+		fee: '≈ 1.60% + €1.00',
+		railCode: 'eur',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'iban',
+				type: 'text',
+				label: defineMessage({ id: 'muralpay.field.iban', defaultMessage: 'IBAN' }),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.enter-iban',
+					defaultMessage: 'Enter IBAN',
+				}),
+				helpText: defineMessage({
+					id: 'muralpay.help.iban',
+					defaultMessage: 'International Bank Account Number',
+				}),
+				autocomplete: 'iban',
+			},
+			{
+				name: 'swiftBic',
+				type: 'text',
+				label: defineMessage({ id: 'muralpay.field.swift-bic', defaultMessage: 'SWIFT/BIC' }),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.enter-swift-bic',
+					defaultMessage: 'Enter SWIFT/BIC code',
+				}),
+				helpText: defineMessage({
+					id: 'muralpay.help.swift-bic',
+					defaultMessage: 'Bank Identifier Code',
+				}),
+				autocomplete: 'swift',
+			},
+			{
+				name: 'country',
+				type: 'select',
+				label: defineMessage({ id: 'muralpay.field.country', defaultMessage: 'Country' }),
+				required: true,
+				autocomplete: 'off',
+				options: [
+					{
+						value: 'AT',
+						label: defineMessage({ id: 'muralpay.country.at', defaultMessage: 'Austria' }),
+					},
+					{
+						value: 'BE',
+						label: defineMessage({ id: 'muralpay.country.be', defaultMessage: 'Belgium' }),
+					},
+					{
+						value: 'CY',
+						label: defineMessage({ id: 'muralpay.country.cy', defaultMessage: 'Cyprus' }),
+					},
+					{
+						value: 'EE',
+						label: defineMessage({ id: 'muralpay.country.ee', defaultMessage: 'Estonia' }),
+					},
+					{
+						value: 'FI',
+						label: defineMessage({ id: 'muralpay.country.fi', defaultMessage: 'Finland' }),
+					},
+					{
+						value: 'FR',
+						label: defineMessage({ id: 'muralpay.country.fr', defaultMessage: 'France' }),
+					},
+					{
+						value: 'DE',
+						label: defineMessage({ id: 'muralpay.country.de', defaultMessage: 'Germany' }),
+					},
+					{
+						value: 'GR',
+						label: defineMessage({ id: 'muralpay.country.gr', defaultMessage: 'Greece' }),
+					},
+					{
+						value: 'IE',
+						label: defineMessage({ id: 'muralpay.country.ie', defaultMessage: 'Ireland' }),
+					},
+					{
+						value: 'IT',
+						label: defineMessage({ id: 'muralpay.country.it', defaultMessage: 'Italy' }),
+					},
+					{
+						value: 'LV',
+						label: defineMessage({ id: 'muralpay.country.lv', defaultMessage: 'Latvia' }),
+					},
+					{
+						value: 'LT',
+						label: defineMessage({ id: 'muralpay.country.lt', defaultMessage: 'Lithuania' }),
+					},
+					{
+						value: 'LU',
+						label: defineMessage({ id: 'muralpay.country.lu', defaultMessage: 'Luxembourg' }),
+					},
+					{
+						value: 'MT',
+						label: defineMessage({ id: 'muralpay.country.mt', defaultMessage: 'Malta' }),
+					},
+					{
+						value: 'NL',
+						label: defineMessage({ id: 'muralpay.country.nl', defaultMessage: 'Netherlands' }),
+					},
+					{
+						value: 'PT',
+						label: defineMessage({ id: 'muralpay.country.pt', defaultMessage: 'Portugal' }),
+					},
+					{
+						value: 'SK',
+						label: defineMessage({ id: 'muralpay.country.sk', defaultMessage: 'Slovakia' }),
+					},
+					{
+						value: 'ES',
+						label: defineMessage({ id: 'muralpay.country.es', defaultMessage: 'Spain' }),
+					},
+				],
+			},
+		],
+	},
+
+	fiat_mxn: {
+		id: 'fiat_mxn',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-mxn.name',
+			defaultMessage: 'Bank Transfer (MXN)',
+		}),
+		currency: 'MXN',
+		type: 'fiat',
+		fee: '≈ 1.90% + $0.50',
+		railCode: 'mxn',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'bankAccountNumber',
+				type: 'text',
+				label: defineMessage({ id: 'muralpay.field.clabe', defaultMessage: 'CLABE' }),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.enter-clabe',
+					defaultMessage: 'Enter 18-digit CLABE',
+				}),
+				helpText: defineMessage({
+					id: 'muralpay.help.clabe',
+					defaultMessage: 'Clave Bancaria Estandarizada (Mexican bank account number)',
+				}),
+				pattern: '^[0-9]{18}$',
+				validate: (val) => (/^\d{18}$/.test(val) ? null : 'CLABE must be exactly 18 digits'),
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	fiat_brl: {
+		id: 'fiat_brl',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-brl.name',
+			defaultMessage: 'PIX Transfer (BRL)',
+		}),
+		currency: 'BRL',
+		type: 'fiat',
+		fee: '≈ 2.30% + $0.25',
+		railCode: 'brl',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'pixAccountType',
+				type: 'select',
+				label: defineMessage({ id: 'muralpay.field.pix-key-type', defaultMessage: 'PIX Key Type' }),
+				required: true,
+				autocomplete: 'off',
+				options: [
+					{
+						value: 'PHONE',
+						label: defineMessage({ id: 'muralpay.pix-type.phone', defaultMessage: 'Phone Number' }),
+					},
+					{
+						value: 'EMAIL',
+						label: defineMessage({ id: 'muralpay.pix-type.email', defaultMessage: 'Email' }),
+					},
+					{
+						value: 'DOCUMENT',
+						label: defineMessage({ id: 'muralpay.pix-type.document', defaultMessage: 'CPF/CNPJ' }),
+					},
+					{
+						value: 'BANK_ACCOUNT',
+						label: defineMessage({
+							id: 'muralpay.pix-type.bank-account',
+							defaultMessage: 'Bank Account',
+						}),
+					},
+				],
+			},
+			{
+				name: 'pixEmail',
+				type: 'email',
+				label: defineMessage({ id: 'muralpay.field.pix-email', defaultMessage: 'PIX Email' }),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.enter-pix-email',
+					defaultMessage: 'Enter PIX email',
+				}),
+				autocomplete: 'email',
+			},
+			{
+				name: 'pixPhone',
+				type: 'tel',
+				label: defineMessage({ id: 'muralpay.field.pix-phone', defaultMessage: 'PIX Phone' }),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.pix-phone',
+					defaultMessage: '+55...',
+				}),
+				autocomplete: 'tel',
+			},
+			{
+				name: 'branchCode',
+				type: 'text',
+				label: defineMessage({ id: 'muralpay.field.branch-code', defaultMessage: 'Branch Code' }),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.enter-branch-code',
+					defaultMessage: 'Enter branch code',
+				}),
+				autocomplete: 'off',
+			},
+			{
+				name: 'documentNumber',
+				type: 'text',
+				label: defineMessage({ id: 'muralpay.field.cpf-cnpj', defaultMessage: 'CPF/CNPJ' }),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.enter-cpf-cnpj',
+					defaultMessage: 'Enter CPF or CNPJ',
+				}),
+				helpText: defineMessage({
+					id: 'muralpay.help.cpf-cnpj',
+					defaultMessage: 'Brazilian tax identification number',
+				}),
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	fiat_cop: {
+		id: 'fiat_cop',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-cop.name',
+			defaultMessage: 'Bank Transfer (COP)',
+		}),
+		currency: 'COP',
+		type: 'fiat',
+		fee: '≈ 1.95% + $0.35',
+		railCode: 'cop',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'phoneNumber',
+				type: 'tel',
+				label: defineMessage({ id: 'muralpay.field.phone-number', defaultMessage: 'Phone Number' }),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.phone-cop',
+					defaultMessage: '+57...',
+				}),
+				autocomplete: 'tel',
+			},
+			{
+				name: 'accountType',
+				type: 'select',
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				required: true,
+				options: ACCOUNT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+			{
+				name: 'bankAccountNumber',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.bank-account-number',
+					defaultMessage: 'Account Number',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.enter-account-number',
+					defaultMessage: 'Enter account number',
+				}),
+				autocomplete: 'off',
+			},
+			{
+				name: 'documentType',
+				type: 'select',
+				label: defineMessage({
+					id: 'muralpay.field.document-type',
+					defaultMessage: 'Document Type',
+				}),
+				required: true,
+				options: DOCUMENT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	fiat_ars: {
+		id: 'fiat_ars',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-ars.name',
+			defaultMessage: 'Bank Transfer (ARS)',
+		}),
+		currency: 'ARS',
+		type: 'fiat',
+		fee: '≈ 1.50% + $0.00',
+		railCode: 'ars',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'bankAccountNumber',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.account-number-cbu-cvu',
+					defaultMessage: 'Account Number (CBU/CVU)',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.cbu-cvu',
+					defaultMessage: 'Enter CBU or CVU',
+				}),
+				helpText: defineMessage({
+					id: 'muralpay.help.cbu-cvu',
+					defaultMessage: 'Clave Bancaria Uniforme or Clave Virtual Uniforme',
+				}),
+				autocomplete: 'off',
+			},
+			{
+				name: 'documentNumber',
+				type: 'text',
+				label: defineMessage({ id: 'muralpay.field.cuit-cuil', defaultMessage: 'CUIT/CUIL' }),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.cuit-cuil',
+					defaultMessage: 'Enter CUIT or CUIL',
+				}),
+				helpText: defineMessage({
+					id: 'muralpay.help.cuit-cuil',
+					defaultMessage: 'Argentine tax ID',
+				}),
+				autocomplete: 'off',
+			},
+			{
+				name: 'bankAccountNumberType',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.account-number-type',
+					defaultMessage: 'Account Number Type',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.cbu-cvu-type',
+					defaultMessage: 'CBU or CVU',
+				}),
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	fiat_clp: {
+		id: 'fiat_clp',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-clp.name',
+			defaultMessage: 'Bank Transfer (CLP)',
+		}),
+		currency: 'CLP',
+		type: 'fiat',
+		fee: '≈ 1.95% + $1.20',
+		railCode: 'clp',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'accountType',
+				type: 'select',
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				required: true,
+				options: ACCOUNT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+			{
+				name: 'bankAccountNumber',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.account-number',
+					defaultMessage: 'Account Number',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.account-number',
+					defaultMessage: 'Enter account number',
+				}),
+				autocomplete: 'off',
+			},
+			{
+				name: 'documentType',
+				type: 'select',
+				label: defineMessage({
+					id: 'muralpay.field.document-type',
+					defaultMessage: 'Document Type',
+				}),
+				required: true,
+				options: DOCUMENT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	fiat_crc: {
+		id: 'fiat_crc',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-crc.name',
+			defaultMessage: 'Bank Transfer (CRC)',
+		}),
+		currency: 'CRC',
+		type: 'fiat',
+		fee: '≈ 2.05% + $0.80',
+		railCode: 'crc',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'iban',
+				type: 'text',
+				label: defineMessage({ id: 'muralpay.field.iban', defaultMessage: 'IBAN' }),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.iban-crc',
+					defaultMessage: 'Enter Costa Rican IBAN',
+				}),
+				autocomplete: 'iban',
+			},
+			{
+				name: 'documentType',
+				type: 'select',
+				label: defineMessage({
+					id: 'muralpay.field.document-type',
+					defaultMessage: 'Document Type',
+				}),
+				required: true,
+				options: DOCUMENT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	fiat_pen: {
+		id: 'fiat_pen',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-pen.name',
+			defaultMessage: 'Bank Transfer (PEN)',
+		}),
+		currency: 'PEN',
+		type: 'fiat',
+		fee: '≈ 2.15% + $1.00',
+		railCode: 'pen',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'documentType',
+				type: 'select',
+				label: defineMessage({
+					id: 'muralpay.field.document-type',
+					defaultMessage: 'Document Type',
+				}),
+				required: true,
+				options: DOCUMENT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+			{
+				name: 'bankAccountNumber',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.account-number-cci',
+					defaultMessage: 'Account Number (CCI)',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.cci',
+					defaultMessage: 'Enter 20-digit CCI',
+				}),
+				helpText: defineMessage({
+					id: 'muralpay.help.cci',
+					defaultMessage: 'Código de Cuenta Interbancaria',
+				}),
+				autocomplete: 'off',
+			},
+			{
+				name: 'accountType',
+				type: 'select',
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				required: true,
+				options: ACCOUNT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	// fiat_bob: {
+	// 	id: 'fiat_bob',
+	// 	name: defineMessage({
+	// 		id: 'muralpay.rail.fiat-bob.name',
+	// 		defaultMessage: 'Bank Transfer (BOB)',
+	// 	}),
+	// 	currency: 'BOB',
+	// 	type: 'fiat',
+	// 	fee: 'TBD',
+	// 	railCode: 'bob',
+	// 	requiresBankName: true,
+	// 	fields: [
+	// 		{
+	// 			name: 'bankAccountNumber',
+	// 			type: 'text',
+	// 			label: defineMessage({
+	// 				id: 'muralpay.field.account-number',
+	// 				defaultMessage: 'Account Number',
+	// 			}),
+	// 			required: true,
+	// 			placeholder: defineMessage({
+	// 				id: 'muralpay.placeholder.account-number',
+	// 				defaultMessage: 'Enter account number',
+	// 			}),
+	// 			autocomplete: 'off',
+	// 		},
+	// 		{
+	// 			name: 'documentType',
+	// 			type: 'select',
+	// 			label: defineMessage({
+	// 				id: 'muralpay.field.document-type',
+	// 				defaultMessage: 'Document Type',
+	// 			}),
+	// 			required: true,
+	// 			options: DOCUMENT_TYPE_OPTIONS,
+	// 			autocomplete: 'off',
+	// 		},
+	// 	],
+	// },
+
+	fiat_zar: {
+		id: 'fiat_zar',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-zar.name',
+			defaultMessage: 'Bank Transfer (ZAR)',
+		}),
+		currency: 'ZAR',
+		type: 'fiat',
+		fee: '≈ 2.40% + $1.50',
+		railCode: 'zar',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'accountType',
+				type: 'select',
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				required: true,
+				options: ACCOUNT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+			{
+				name: 'bankAccountNumber',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.account-number',
+					defaultMessage: 'Account Number',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.account-number',
+					defaultMessage: 'Enter account number',
+				}),
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	'fiat_usd-peru': {
+		id: 'fiat_usd-peru',
+		name: defineMessage({
+			id: 'muralpay.rail.fiat-usd-peru.name',
+			defaultMessage: 'Bank Transfer (USD - Peru)',
+		}),
+		currency: 'USD',
+		type: 'fiat',
+		fee: '≈ 1.50% + $5.00',
+		railCode: 'usd-peru',
+		requiresBankName: true,
+		fields: [
+			{
+				name: 'accountType',
+				type: 'select',
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				required: true,
+				options: ACCOUNT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+			{
+				name: 'bankAccountNumber',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.account-number',
+					defaultMessage: 'Account Number',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.account-number',
+					defaultMessage: 'Enter account number',
+				}),
+				autocomplete: 'off',
+			},
+			{
+				name: 'documentType',
+				type: 'select',
+				label: defineMessage({
+					id: 'muralpay.field.document-type',
+					defaultMessage: 'Document Type',
+				}),
+				required: true,
+				options: DOCUMENT_TYPE_OPTIONS,
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	// 'fiat_usd-china': {
+	// 	id: 'fiat_usd-china',
+	// 	name: defineMessage({
+	// 		id: 'muralpay.rail.fiat-usd-china.name',
+	// 		defaultMessage: 'Bank Transfer (USD - China)',
+	// 	}),
+	// 	currency: 'USD',
+	// 	type: 'fiat',
+	// 	fee: 'TBD',
+	// 	railCode: 'usd-china',
+	// 	requiresBankName: false,
+	// 	fields: [
+	// 		{
+	// 			name: 'bankName',
+	// 			type: 'text',
+	// 			label: defineMessage({ id: 'muralpay.field.bank-name', defaultMessage: 'Bank Name' }),
+	// 			required: true,
+	// 			placeholder: defineMessage({
+	// 				id: 'muralpay.placeholder.bank-name',
+	// 				defaultMessage: 'Enter bank name',
+	// 			}),
+	// 			autocomplete: 'off',
+	// 		},
+	// 		{
+	// 			name: 'accountType',
+	// 			type: 'select',
+	// 			label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+	// 			required: true,
+	// 			options: ACCOUNT_TYPE_OPTIONS,
+	// 			autocomplete: 'off',
+	// 		},
+	// 		{
+	// 			name: 'bankAccountNumber',
+	// 			type: 'text',
+	// 			label: defineMessage({
+	// 				id: 'muralpay.field.account-number',
+	// 				defaultMessage: 'Account Number',
+	// 			}),
+	// 			required: true,
+	// 			placeholder: defineMessage({
+	// 				id: 'muralpay.placeholder.account-number',
+	// 				defaultMessage: 'Enter account number',
+	// 			}),
+	// 			autocomplete: 'off',
+	// 		},
+	// 		{
+	// 			name: 'documentType',
+	// 			type: 'select',
+	// 			label: defineMessage({
+	// 				id: 'muralpay.field.document-type',
+	// 				defaultMessage: 'Document Type',
+	// 			}),
+	// 			required: true,
+	// 			options: DOCUMENT_TYPE_OPTIONS,
+	// 			autocomplete: 'off',
+	// 		},
+	// 		{
+	// 			name: 'phoneNumber',
+	// 			type: 'tel',
+	// 			label: defineMessage({ id: 'muralpay.field.phone-number', defaultMessage: 'Phone Number' }),
+	// 			required: true,
+	// 			placeholder: defineMessage({
+	// 				id: 'muralpay.placeholder.phone-china',
+	// 				defaultMessage: '+86...',
+	// 			}),
+	// 			autocomplete: 'tel',
+	// 		},
+	// 		{
+	// 			name: 'address',
+	// 			type: 'text',
+	// 			label: defineMessage({ id: 'muralpay.field.address', defaultMessage: 'Address' }),
+	// 			required: true,
+	// 			placeholder: defineMessage({
+	// 				id: 'muralpay.placeholder.address',
+	// 				defaultMessage: 'Enter address',
+	// 			}),
+	// 			autocomplete: 'street-address',
+	// 		},
+	// 		{
+	// 			name: 'swiftBic',
+	// 			type: 'text',
+	// 			label: defineMessage({ id: 'muralpay.field.swift-bic', defaultMessage: 'SWIFT/BIC' }),
+	// 			required: true,
+	// 			placeholder: defineMessage({
+	// 				id: 'muralpay.placeholder.swift-bic',
+	// 				defaultMessage: 'Enter SWIFT/BIC code',
+	// 			}),
+	// 			autocomplete: 'swift',
+	// 		},
+	// 	],
+	// },
+
+	blockchain_usdc_polygon: {
+		id: 'blockchain_usdc_polygon',
+		name: defineMessage({
+			id: 'muralpay.rail.usdc-polygon.name',
+			defaultMessage: 'Crypto (USDC)',
+		}),
+		currency: 'USDC',
+		type: 'crypto',
+		fee: '≈ 1%',
+		blockchain: 'POLYGON',
+		warningMessage: defineMessage({
+			id: 'muralpay.warning.wallet-address',
+			defaultMessage:
+				'Double-check your wallet address. Funds sent to an incorrect address cannot be recovered.',
+		}),
+		fields: [
+			{
+				name: 'walletAddress',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.wallet-address',
+					defaultMessage: 'Wallet Address',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.wallet-address-eth',
+					defaultMessage: '0x...',
+				}),
+				pattern: '^0x[a-fA-F0-9]{40}$',
+				validate: (val) =>
+					/^0x[a-fA-F0-9]{40}$/.test(val) ? null : 'Must be a valid Ethereum address (0x...)',
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	blockchain_usdc_base: {
+		id: 'blockchain_usdc_base',
+		name: defineMessage({ id: 'muralpay.rail.usdc-base.name', defaultMessage: 'USDC (Base)' }),
+		currency: 'USDC',
+		type: 'crypto',
+		fee: '≈ 1%',
+		blockchain: 'BASE',
+		warningMessage: defineMessage({
+			id: 'muralpay.warning.wallet-address',
+			defaultMessage:
+				'Double-check your wallet address. Funds sent to an incorrect address cannot be recovered.',
+		}),
+		fields: [
+			{
+				name: 'walletAddress',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.wallet-address',
+					defaultMessage: 'Wallet Address',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.wallet-address-eth',
+					defaultMessage: '0x...',
+				}),
+				pattern: '^0x[a-fA-F0-9]{40}$',
+				validate: (val) =>
+					/^0x[a-fA-F0-9]{40}$/.test(val) ? null : 'Must be a valid Ethereum address (0x...)',
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	blockchain_usdc_ethereum: {
+		id: 'blockchain_usdc_ethereum',
+		name: defineMessage({
+			id: 'muralpay.rail.usdc-ethereum.name',
+			defaultMessage: 'USDC (Ethereum)',
+		}),
+		currency: 'USDC',
+		type: 'crypto',
+		fee: '≈ 1%',
+		blockchain: 'ETHEREUM',
+		warningMessage: defineMessage({
+			id: 'muralpay.warning.wallet-address',
+			defaultMessage:
+				'Double-check your wallet address. Funds sent to an incorrect address cannot be recovered.',
+		}),
+		fields: [
+			{
+				name: 'walletAddress',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.wallet-address',
+					defaultMessage: 'Wallet Address',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.wallet-address-eth',
+					defaultMessage: '0x...',
+				}),
+				pattern: '^0x[a-fA-F0-9]{40}$',
+				validate: (val) =>
+					/^0x[a-fA-F0-9]{40}$/.test(val) ? null : 'Must be a valid Ethereum address (0x...)',
+				autocomplete: 'off',
+			},
+		],
+	},
+
+	blockchain_usdc_celo: {
+		id: 'blockchain_usdc_celo',
+		name: defineMessage({ id: 'muralpay.rail.usdc-celo.name', defaultMessage: 'USDC (Celo)' }),
+		currency: 'USDC',
+		type: 'crypto',
+		fee: '≈ 1%',
+		blockchain: 'CELO',
+		warningMessage: defineMessage({
+			id: 'muralpay.warning.wallet-address',
+			defaultMessage:
+				'Double-check your wallet address. Funds sent to an incorrect address cannot be recovered.',
+		}),
+		fields: [
+			{
+				name: 'walletAddress',
+				type: 'text',
+				label: defineMessage({
+					id: 'muralpay.field.wallet-address',
+					defaultMessage: 'Wallet Address',
+				}),
+				required: true,
+				placeholder: defineMessage({
+					id: 'muralpay.placeholder.wallet-address-eth',
+					defaultMessage: '0x...',
+				}),
+				pattern: '^0x[a-fA-F0-9]{40}$',
+				validate: (val) =>
+					/^0x[a-fA-F0-9]{40}$/.test(val) ? null : 'Must be a valid Ethereum address (0x...)',
+				autocomplete: 'off',
+			},
+		],
+	},
+}
+
+export function getAvailableRails(): string[] {
+	return Object.keys(MURALPAY_RAILS)
+}
+
+export function getRailsByType(type: 'fiat' | 'crypto'): RailConfig[] {
+	return Object.values(MURALPAY_RAILS).filter((rail) => rail.type === type)
+}
+
+export function getRailConfig(railId: string): RailConfig | undefined {
+	return MURALPAY_RAILS[railId]
+}
diff --git a/apps/labrinth/.sqlx/query-8f68ea8481d86687ef4ebd6311f8ec5437be07fab8c34a964f7864304681bb94.json b/apps/labrinth/.sqlx/query-8f68ea8481d86687ef4ebd6311f8ec5437be07fab8c34a964f7864304681bb94.json
deleted file mode 100644
index 7b2b82e2..00000000
--- a/apps/labrinth/.sqlx/query-8f68ea8481d86687ef4ebd6311f8ec5437be07fab8c34a964f7864304681bb94.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT created, amount\n        FROM payouts_values\n        WHERE user_id = $1\n        AND NOW() >= date_available",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "created",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 1,
-        "name": "amount",
-        "type_info": "Numeric"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "8f68ea8481d86687ef4ebd6311f8ec5437be07fab8c34a964f7864304681bb94"
-}
diff --git a/packages/assets/external/sso/discord.svg b/packages/assets/external/color/discord.svg
similarity index 100%
rename from packages/assets/external/sso/discord.svg
rename to packages/assets/external/color/discord.svg
diff --git a/packages/assets/external/sso/github.svg b/packages/assets/external/color/github.svg
similarity index 100%
rename from packages/assets/external/sso/github.svg
rename to packages/assets/external/color/github.svg
diff --git a/packages/assets/external/sso/gitlab.svg b/packages/assets/external/color/gitlab.svg
similarity index 100%
rename from packages/assets/external/sso/gitlab.svg
rename to packages/assets/external/color/gitlab.svg
diff --git a/packages/assets/external/sso/google.svg b/packages/assets/external/color/google.svg
similarity index 100%
rename from packages/assets/external/sso/google.svg
rename to packages/assets/external/color/google.svg
diff --git a/packages/assets/external/sso/microsoft.svg b/packages/assets/external/color/microsoft.svg
similarity index 100%
rename from packages/assets/external/sso/microsoft.svg
rename to packages/assets/external/color/microsoft.svg
diff --git a/packages/assets/external/color/paypal.svg b/packages/assets/external/color/paypal.svg
new file mode 100644
index 00000000..b14436a5
--- /dev/null
+++ b/packages/assets/external/color/paypal.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="7.056000232696533 3 37.35095977783203 45">
+	<g xmlns="http://www.w3.org/2000/svg" clip-path="url(#a)">
+		<path fill="#002991"
+			d="M38.914 13.35c0 5.574-5.144 12.15-12.927 12.15H18.49l-.368 2.322L16.373 39H7.056l5.605-36h15.095c5.083 0 9.082 2.833 10.555 6.77a9.687 9.687 0 0 1 .603 3.58z">
+		</path>
+		<path fill="#60CDFF"
+			d="M44.284 23.7A12.894 12.894 0 0 1 31.53 34.5h-5.206L24.157 48H14.89l1.483-9 1.75-11.178.367-2.322h7.497c7.773 0 12.927-6.576 12.927-12.15 3.825 1.974 6.055 5.963 5.37 10.35z">
+		</path>
+		<path fill="#008CFF"
+			d="M38.914 13.35C37.31 12.511 35.365 12 33.248 12h-12.64L18.49 25.5h7.497c7.773 0 12.927-6.576 12.927-12.15z">
+		</path>
+	</g>
+</svg>
diff --git a/packages/assets/external/sso/steam.svg b/packages/assets/external/color/steam.svg
similarity index 100%
rename from packages/assets/external/sso/steam.svg
rename to packages/assets/external/color/steam.svg
diff --git a/packages/assets/external/color/usdc.svg b/packages/assets/external/color/usdc.svg
new file mode 100644
index 00000000..b7badd04
--- /dev/null
+++ b/packages/assets/external/color/usdc.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="86977684-12db-4850-8f30-233a7c267d11" viewBox="0 0 2000 2000">
+	<path d="M1000 2000c554.17 0 1000-445.83 1000-1000S1554.17 0 1000 0 0 445.83 0 1000s445.83 1000 1000 1000z"
+		fill="#2775ca" />
+	<path
+		d="M1275 1158.33c0-145.83-87.5-195.83-262.5-216.66-125-16.67-150-50-150-108.34s41.67-95.83 125-95.83c75 0 116.67 25 137.5 87.5 4.17 12.5 16.67 20.83 29.17 20.83h66.66c16.67 0 29.17-12.5 29.17-29.16v-4.17c-16.67-91.67-91.67-162.5-187.5-170.83v-100c0-16.67-12.5-29.17-33.33-33.34h-62.5c-16.67 0-29.17 12.5-33.34 33.34v95.83c-125 16.67-204.16 100-204.16 204.17 0 137.5 83.33 191.66 258.33 212.5 116.67 20.83 154.17 45.83 154.17 112.5s-58.34 112.5-137.5 112.5c-108.34 0-145.84-45.84-158.34-108.34-4.16-16.66-16.66-25-29.16-25h-70.84c-16.66 0-29.16 12.5-29.16 29.17v4.17c16.66 104.16 83.33 179.16 220.83 200v100c0 16.66 12.5 29.16 33.33 33.33h62.5c16.67 0 29.17-12.5 33.34-33.33v-100c125-20.84 208.33-108.34 208.33-220.84z"
+		fill="#fff" />
+	<path
+		d="M787.5 1595.83c-325-116.66-491.67-479.16-370.83-800 62.5-175 200-308.33 370.83-370.83 16.67-8.33 25-20.83 25-41.67V325c0-16.67-8.33-29.17-25-33.33-4.17 0-12.5 0-16.67 4.16-395.83 125-612.5 545.84-487.5 941.67 75 233.33 254.17 412.5 487.5 487.5 16.67 8.33 33.34 0 37.5-16.67 4.17-4.16 4.17-8.33 4.17-16.66v-58.34c0-12.5-12.5-29.16-25-37.5zM1229.17 295.83c-16.67-8.33-33.34 0-37.5 16.67-4.17 4.17-4.17 8.33-4.17 16.67v58.33c0 16.67 12.5 33.33 25 41.67 325 116.66 491.67 479.16 370.83 800-62.5 175-200 308.33-370.83 370.83-16.67 8.33-25 20.83-25 41.67V1700c0 16.67 8.33 29.17 25 33.33 4.17 0 12.5 0 16.67-4.16 395.83-125 612.5-545.84 487.5-941.67-75-237.5-258.34-416.67-487.5-491.67z"
+		fill="#fff" />
+</svg>
diff --git a/packages/assets/external/color/venmo.svg b/packages/assets/external/color/venmo.svg
new file mode 100644
index 00000000..c0fd82ae
--- /dev/null
+++ b/packages/assets/external/color/venmo.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+	<g transform="matrix(.124031 0 0 .124031 -.000001 56.062016)">
+		<rect y="-452" rx="61" height="516" width="516" fill="#3396cd" />
+		<path
+			d="M385.16-347c11.1 18.3 16.08 37.17 16.08 61 0 76-64.87 174.7-117.52 244H163.5l-48.2-288.35 105.3-10 25.6 205.17C270-174 299.43-235 299.43-276.56c0-22.77-3.9-38.25-10-51z"
+			fill="#fff" />
+	</g>
+</svg>
diff --git a/packages/assets/external/paypal.svg b/packages/assets/external/paypal.svg
index ab48a018..2f2e24b8 100644
--- a/packages/assets/external/paypal.svg
+++ b/packages/assets/external/paypal.svg
@@ -1 +1,5 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>PayPal</title><path fill="currentColor" d="M7.016 19.198h-4.2a.562.562 0 0 1-.555-.65L5.093.584A.692.692 0 0 1 5.776 0h7.222c3.417 0 5.904 2.488 5.846 5.5-.006.25-.027.5-.066.747A6.794 6.794 0 0 1 12.071 12H8.743a.69.69 0 0 0-.682.583l-.325 2.056-.013.083-.692 4.39-.015.087zM19.79 6.142c-.01.087-.01.175-.023.261a7.76 7.76 0 0 1-7.695 6.598H9.007l-.283 1.795-.013.083-.692 4.39-.134.843-.014.088H6.86l-.497 3.15a.562.562 0 0 0 .555.65h3.612c.34 0 .63-.249.683-.585l.952-6.031a.692.692 0 0 1 .683-.584h2.126a6.793 6.793 0 0 0 6.707-5.752c.306-1.95-.466-3.744-1.89-4.906z"/></svg>
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+	<title>PayPal</title>
+	<path fill="currentColor"
+		d="M15.607 4.653H8.941L6.645 19.251H1.82L4.862 0h7.995c3.754 0 6.375 2.294 6.473 5.513-.648-.478-2.105-.86-3.722-.86m6.57 5.546c0 3.41-3.01 6.853-6.958 6.853h-2.493L11.595 24H6.74l1.845-11.538h3.592c4.208 0 7.346-3.634 7.153-6.949a5.24 5.24 0 0 1 2.848 4.686M9.653 5.546h6.408c.907 0 1.942.222 2.363.541-.195 2.741-2.655 5.483-6.441 5.483H8.714Z" />
+</svg>
diff --git a/packages/assets/external/polygon.svg b/packages/assets/external/polygon.svg
new file mode 100644
index 00000000..51099c50
--- /dev/null
+++ b/packages/assets/external/polygon.svg
@@ -0,0 +1,5 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+	<title>Polygon</title>
+	<path fill="currentColor"
+		d="m17.82 16.342 5.692-3.287A.98.98 0 0 0 24 12.21V5.635a.98.98 0 0 0-.488-.846l-5.693-3.286a.98.98 0 0 0-.977 0L11.15 4.789a.98.98 0 0 0-.489.846v11.747L6.67 19.686l-3.992-2.304v-4.61l3.992-2.304 2.633 1.52V8.896L7.158 7.658a.98.98 0 0 0-.977 0L.488 10.945a.98.98 0 0 0-.488.846v6.573a.98.98 0 0 0 .488.847l5.693 3.286a.981.981 0 0 0 .977 0l5.692-3.286a.98.98 0 0 0 .489-.846V6.618l.072-.041 3.92-2.263 3.99 2.305v4.609l-3.99 2.304-2.63-1.517v3.092l2.14 1.236a.981.981 0 0 0 .978 0v-.001Z" />
+</svg>
diff --git a/packages/assets/external/tumblr.svg b/packages/assets/external/tumblr.svg
index bc76382b..22b21531 100644
--- a/packages/assets/external/tumblr.svg
+++ b/packages/assets/external/tumblr.svg
@@ -1 +1,5 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Tumblr</title><path fill="currentColor" d="M14.563 24c-5.093 0-7.031-3.756-7.031-6.411V9.747H5.116V6.648c3.63-1.313 4.512-4.596 4.71-6.469C9.84.051 9.941 0 9.999 0h3.517v6.114h4.801v3.633h-4.82v7.47c.016 1.001.375 2.371 2.207 2.371h.09c.631-.02 1.486-.205 1.936-.419l1.156 3.425c-.436.636-2.4 1.374-4.156 1.404h-.178l.011.002z"/></svg>
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+	<title>Tumblr</title>
+	<path fill="currentColor"
+		d="M14.563 24c-5.093 0-7.031-3.756-7.031-6.411V9.747H5.116V6.648c3.63-1.313 4.512-4.596 4.71-6.469C9.84.051 9.941 0 9.999 0h3.517v6.114h4.801v3.633h-4.82v7.47c.016 1.001.375 2.371 2.207 2.371h.09c.631-.02 1.486-.205 1.936-.419l1.156 3.425c-.436.636-2.4 1.374-4.156 1.404h-.178l.011.002z" />
+</svg>
diff --git a/packages/assets/external/venmo.svg b/packages/assets/external/venmo.svg
new file mode 100644
index 00000000..61e9548c
--- /dev/null
+++ b/packages/assets/external/venmo.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<path
+		d="M56.4346 0C60.6127 0.000251497 63.9998 3.38727 64 7.56543V56.4346C63.9997 60.6127 60.6127 63.9997 56.4346 64H7.56543C3.38727 63.9998 0.0002515 60.6127 0 56.4346V7.56543C0.000249178 3.38727 3.38727 0.000249181 7.56543 0H56.4346ZM35.8984 15.4346C36.655 17.0159 37.1386 18.9358 37.1387 21.7598C37.1387 26.9145 33.4881 34.481 30.5361 39.2959L27.3613 13.8486L14.3008 15.0889L20.2793 50.8525H35.1904C41.7206 42.2572 49.7666 30.0151 49.7666 20.5889C49.7665 17.6334 49.1482 15.2931 47.7715 13.0234L35.8984 15.4346Z"
+		fill="currentColor" />
+</svg>
diff --git a/packages/assets/external/visa.svg b/packages/assets/external/visa.svg
new file mode 100644
index 00000000..cf05f6b1
--- /dev/null
+++ b/packages/assets/external/visa.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<path
+		d="M24.2987 22.0321L15.92 42.0214H10.4533L6.33067 26.0667C6.08 25.0854 5.864 24.7254 5.10133 24.3121C3.85867 23.6374 1.80533 23.0054 0 22.6107L0.122667 22.0321H8.92267C9.49773 22.0315 10.0541 22.2365 10.4912 22.6101C10.9284 22.9837 11.2176 23.5013 11.3067 24.0694L13.4853 35.6374L18.8667 22.0321H24.2987ZM45.72 35.4961C45.7413 30.2187 38.424 29.9281 38.4747 27.5707C38.4907 26.8534 39.1733 26.0907 40.6667 25.8961C42.4168 25.7299 44.1793 26.0394 45.768 26.7921L46.6747 22.5521C45.1279 21.9706 43.4898 21.6699 41.8373 21.6641C36.7253 21.6641 33.128 24.3841 33.096 28.2747C33.064 31.1521 35.664 32.7547 37.624 33.7147C39.64 34.6934 40.3173 35.3227 40.3067 36.1974C40.2933 37.5414 38.7013 38.1307 37.2133 38.1547C34.6133 38.1947 33.1067 37.4534 31.9013 36.8934L30.9653 41.2721C32.1733 41.8267 34.4027 42.3121 36.7147 42.3334C42.1467 42.3334 45.7013 39.6507 45.72 35.4961ZM59.216 42.0214H64L59.8267 22.0321H55.4107C54.9388 22.0277 54.4766 22.1652 54.0838 22.4267C53.6911 22.6882 53.3859 23.0617 53.208 23.4987L45.4507 42.0214H50.88L51.96 39.0347H58.5947L59.216 42.0214ZM53.448 34.9387L56.168 27.4321L57.736 34.9387H53.448ZM31.688 22.0321L27.4133 42.0214H22.24L26.52 22.0321H31.688Z"
+		fill="currentColor" />
+</svg>
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index b919290f..80d07ffd 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -6,8 +6,13 @@ import _AlignLeftIcon from './icons/align-left.svg?component'
 import _ArchiveIcon from './icons/archive.svg?component'
 import _ArrowBigRightDashIcon from './icons/arrow-big-right-dash.svg?component'
 import _ArrowBigUpDashIcon from './icons/arrow-big-up-dash.svg?component'
+import _ArrowDownIcon from './icons/arrow-down.svg?component'
+import _ArrowLeftRightIcon from './icons/arrow-left-right.svg?component'
+import _ArrowUpIcon from './icons/arrow-up.svg?component'
+import _ArrowUpRightIcon from './icons/arrow-up-right.svg?component'
 import _AsteriskIcon from './icons/asterisk.svg?component'
 import _BadgeCheckIcon from './icons/badge-check.svg?component'
+import _BadgeDollarSignIcon from './icons/badge-dollar-sign.svg?component'
 import _BanIcon from './icons/ban.svg?component'
 import _BellIcon from './icons/bell.svg?component'
 import _BellRingIcon from './icons/bell-ring.svg?component'
@@ -72,12 +77,14 @@ import _FolderSearchIcon from './icons/folder-search.svg?component'
 import _GameIcon from './icons/game.svg?component'
 import _GapIcon from './icons/gap.svg?component'
 import _GaugeIcon from './icons/gauge.svg?component'
+import _GiftIcon from './icons/gift.svg?component'
 import _GitGraphIcon from './icons/git-graph.svg?component'
 import _GlassesIcon from './icons/glasses.svg?component'
 import _GlobeIcon from './icons/globe.svg?component'
 import _GridIcon from './icons/grid.svg?component'
 import _HamburgerIcon from './icons/hamburger.svg?component'
 import _HammerIcon from './icons/hammer.svg?component'
+import _HandHelpingIcon from './icons/hand-helping.svg?component'
 import _HashIcon from './icons/hash.svg?component'
 import _Heading1Icon from './icons/heading-1.svg?component'
 import _Heading2Icon from './icons/heading-2.svg?component'
@@ -94,6 +101,7 @@ import _IssuesIcon from './icons/issues.svg?component'
 import _ItalicIcon from './icons/italic.svg?component'
 import _KeyIcon from './icons/key.svg?component'
 import _KeyboardIcon from './icons/keyboard.svg?component'
+import _LandmarkIcon from './icons/landmark.svg?component'
 import _LanguagesIcon from './icons/languages.svg?component'
 import _LeftArrowIcon from './icons/left-arrow.svg?component'
 import _LibraryIcon from './icons/library.svg?component'
@@ -104,6 +112,7 @@ import _ListBulletedIcon from './icons/list-bulleted.svg?component'
 import _ListEndIcon from './icons/list-end.svg?component'
 import _ListOrderedIcon from './icons/list-ordered.svg?component'
 import _LoaderIcon from './icons/loader.svg?component'
+import _LoaderCircleIcon from './icons/loader-circle.svg?component'
 import _LockIcon from './icons/lock.svg?component'
 import _LockOpenIcon from './icons/lock-open.svg?component'
 import _LogInIcon from './icons/log-in.svg?component'
@@ -210,8 +219,13 @@ export const AlignLeftIcon = _AlignLeftIcon
 export const ArchiveIcon = _ArchiveIcon
 export const ArrowBigRightDashIcon = _ArrowBigRightDashIcon
 export const ArrowBigUpDashIcon = _ArrowBigUpDashIcon
+export const ArrowDownIcon = _ArrowDownIcon
+export const ArrowLeftRightIcon = _ArrowLeftRightIcon
+export const ArrowUpRightIcon = _ArrowUpRightIcon
+export const ArrowUpIcon = _ArrowUpIcon
 export const AsteriskIcon = _AsteriskIcon
 export const BadgeCheckIcon = _BadgeCheckIcon
+export const BadgeDollarSignIcon = _BadgeDollarSignIcon
 export const BanIcon = _BanIcon
 export const BellRingIcon = _BellRingIcon
 export const BellIcon = _BellIcon
@@ -276,12 +290,14 @@ export const FolderSearchIcon = _FolderSearchIcon
 export const GameIcon = _GameIcon
 export const GapIcon = _GapIcon
 export const GaugeIcon = _GaugeIcon
+export const GiftIcon = _GiftIcon
 export const GitGraphIcon = _GitGraphIcon
 export const GlassesIcon = _GlassesIcon
 export const GlobeIcon = _GlobeIcon
 export const GridIcon = _GridIcon
 export const HamburgerIcon = _HamburgerIcon
 export const HammerIcon = _HammerIcon
+export const HandHelpingIcon = _HandHelpingIcon
 export const HashIcon = _HashIcon
 export const Heading1Icon = _Heading1Icon
 export const Heading2Icon = _Heading2Icon
@@ -298,6 +314,7 @@ export const IssuesIcon = _IssuesIcon
 export const ItalicIcon = _ItalicIcon
 export const KeyIcon = _KeyIcon
 export const KeyboardIcon = _KeyboardIcon
+export const LandmarkIcon = _LandmarkIcon
 export const LanguagesIcon = _LanguagesIcon
 export const LeftArrowIcon = _LeftArrowIcon
 export const LibraryIcon = _LibraryIcon
@@ -307,6 +324,7 @@ export const ListBulletedIcon = _ListBulletedIcon
 export const ListEndIcon = _ListEndIcon
 export const ListOrderedIcon = _ListOrderedIcon
 export const ListIcon = _ListIcon
+export const LoaderCircleIcon = _LoaderCircleIcon
 export const LoaderIcon = _LoaderIcon
 export const LockOpenIcon = _LockOpenIcon
 export const LockIcon = _LockIcon
diff --git a/packages/assets/icons/arrow-down.svg b/packages/assets/icons/arrow-down.svg
new file mode 100644
index 00000000..13f8c28a
--- /dev/null
+++ b/packages/assets/icons/arrow-down.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+	stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-down-icon lucide-arrow-down">
+	<path d="M12 5v14" />
+	<path d="m19 12-7 7-7-7" />
+</svg>
diff --git a/packages/assets/icons/arrow-left-right.svg b/packages/assets/icons/arrow-left-right.svg
new file mode 100644
index 00000000..d98fbc98
--- /dev/null
+++ b/packages/assets/icons/arrow-left-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-left-right-icon lucide-arrow-left-right"><path d="M8 3 4 7l4 4"/><path d="M4 7h16"/><path d="m16 21 4-4-4-4"/><path d="M20 17H4"/></svg>
\ No newline at end of file
diff --git a/packages/assets/icons/arrow-up-right.svg b/packages/assets/icons/arrow-up-right.svg
new file mode 100644
index 00000000..e0d56094
--- /dev/null
+++ b/packages/assets/icons/arrow-up-right.svg
@@ -0,0 +1,15 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	width="24"
+	height="24"
+	viewBox="0 0 24 24"
+	fill="none"
+	stroke="currentColor"
+	stroke-width="2"
+	stroke-linecap="round"
+	stroke-linejoin="round"
+	class="lucide lucide-arrow-up-right-icon lucide-arrow-up-right"
+>
+	<path d="M7 7h10v10" />
+	<path d="M7 17 17 7" />
+</svg>
diff --git a/packages/assets/icons/arrow-up.svg b/packages/assets/icons/arrow-up.svg
new file mode 100644
index 00000000..8e249fed
--- /dev/null
+++ b/packages/assets/icons/arrow-up.svg
@@ -0,0 +1,15 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	width="24"
+	height="24"
+	viewBox="0 0 24 24"
+	fill="none"
+	stroke="currentColor"
+	stroke-width="2"
+	stroke-linecap="round"
+	stroke-linejoin="round"
+	class="lucide lucide-arrow-up-icon lucide-arrow-up"
+>
+	<path d="m5 12 7-7 7 7" />
+	<path d="M12 19V5" />
+</svg>
diff --git a/packages/assets/icons/badge-dollar-sign.svg b/packages/assets/icons/badge-dollar-sign.svg
new file mode 100644
index 00000000..9d32e0d8
--- /dev/null
+++ b/packages/assets/icons/badge-dollar-sign.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+	stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-badge-dollar-sign-icon lucide-badge-dollar-sign">
+	<path
+		d="M3.85 8.62a4 4 0 0 1 4.78-4.77 4 4 0 0 1 6.74 0 4 4 0 0 1 4.78 4.78 4 4 0 0 1 0 6.74 4 4 0 0 1-4.77 4.78 4 4 0 0 1-6.75 0 4 4 0 0 1-4.78-4.77 4 4 0 0 1 0-6.76Z" />
+	<path d="M16 8h-6a2 2 0 1 0 0 4h4a2 2 0 1 1 0 4H8" />
+	<path d="M12 18V6" />
+</svg>
diff --git a/packages/assets/icons/gift.svg b/packages/assets/icons/gift.svg
new file mode 100644
index 00000000..0914d8a9
--- /dev/null
+++ b/packages/assets/icons/gift.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-gift-icon lucide-gift"><rect x="3" y="8" width="18" height="4" rx="1"/><path d="M12 8v13"/><path d="M19 12v7a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-7"/><path d="M7.5 8a2.5 2.5 0 0 1 0-5A4.8 8 0 0 1 12 8a4.8 8 0 0 1 4.5-5 2.5 2.5 0 0 1 0 5"/></svg>
\ No newline at end of file
diff --git a/packages/assets/icons/hand-helping.svg b/packages/assets/icons/hand-helping.svg
new file mode 100644
index 00000000..c0c519a2
--- /dev/null
+++ b/packages/assets/icons/hand-helping.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+	stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-hand-helping-icon lucide-hand-helping">
+	<path d="M11 12h2a2 2 0 1 0 0-4h-3c-.6 0-1.1.2-1.4.6L3 14" />
+	<path d="m7 18 1.6-1.4c.3-.4.8-.6 1.4-.6h4c1.1 0 2.1-.4 2.8-1.2l4.6-4.4a2 2 0 0 0-2.75-2.91l-4.2 3.9" />
+	<path d="m2 13 6 6" />
+</svg>
diff --git a/packages/assets/icons/landmark.svg b/packages/assets/icons/landmark.svg
new file mode 100644
index 00000000..b73b234c
--- /dev/null
+++ b/packages/assets/icons/landmark.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+	stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-landmark-icon lucide-landmark">
+	<path d="M10 18v-7" />
+	<path d="M11.12 2.198a2 2 0 0 1 1.76.006l7.866 3.847c.476.233.31.949-.22.949H3.474c-.53 0-.695-.716-.22-.949z" />
+	<path d="M14 18v-7" />
+	<path d="M18 18v-7" />
+	<path d="M3 22h18" />
+	<path d="M6 18v-7" />
+</svg>
diff --git a/packages/assets/icons/loader-circle.svg b/packages/assets/icons/loader-circle.svg
new file mode 100644
index 00000000..3540a069
--- /dev/null
+++ b/packages/assets/icons/loader-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-loader-circle-icon lucide-loader-circle"><path d="M21 12a9 9 0 1 1-6.219-8.56"/></svg>
\ No newline at end of file
diff --git a/packages/assets/index.ts b/packages/assets/index.ts
index a6280039..7803c884 100644
--- a/packages/assets/index.ts
+++ b/packages/assets/index.ts
@@ -27,6 +27,15 @@ import _WavingRinthbot from './branding/rinthbot/waving.webp'
 import _AppleIcon from './external/apple.svg?component'
 import _BlueskyIcon from './external/bluesky.svg?component'
 import _BuyMeACoffeeIcon from './external/bmac.svg?component'
+import _DiscordColorIcon from './external/color/discord.svg?component'
+import _GitHubColorIcon from './external/color/github.svg?component'
+import _GitLabColorIcon from './external/color/gitlab.svg?component'
+import _GoogleColorIcon from './external/color/google.svg?component'
+import _MicrosoftColorIcon from './external/color/microsoft.svg?component'
+import _PayPalColorIcon from './external/color/paypal.svg?component'
+import _SteamColorIcon from './external/color/steam.svg?component'
+import _USDCColorIcon from './external/color/usdc.svg?component'
+import _VenmoColorIcon from './external/color/venmo.svg?component'
 import _CurseForgeIcon from './external/curseforge.svg?component'
 import _DiscordIcon from './external/discord.svg?component'
 import _FacebookIcon from './external/facebook.svg?component'
@@ -37,20 +46,17 @@ import _MastodonIcon from './external/mastodon.svg?component'
 import _OpenCollectiveIcon from './external/opencollective.svg?component'
 import _PatreonIcon from './external/patreon.svg?component'
 import _PayPalIcon from './external/paypal.svg?component'
+import _PolygonIcon from './external/polygon.svg?component'
 import _RedditIcon from './external/reddit.svg?component'
 import _ReelsIcon from './external/reels.svg?component'
 import _SnapchatIcon from './external/snapchat.svg?component'
-import _SSODiscordIcon from './external/sso/discord.svg?component'
-import _SSOGitHubIcon from './external/sso/github.svg?component'
-import _SSOGitLabIcon from './external/sso/gitlab.svg?component'
-import _SSOGoogleIcon from './external/sso/google.svg?component'
-import _SSOMicrosoftIcon from './external/sso/microsoft.svg?component'
-import _SSOSteamIcon from './external/sso/steam.svg?component'
 import _ThreadsIcon from './external/threads.svg?component'
 import _TikTokIcon from './external/tiktok.svg?component'
 import _TumblrIcon from './external/tumblr.svg?component'
 import _TwitchIcon from './external/twitch.svg?component'
 import _TwitterIcon from './external/twitter.svg?component'
+import _VenmoIcon from './external/venmo.svg?component'
+import _VisaIcon from './external/visa.svg?component'
 import _WindowsIcon from './external/windows.svg?component'
 import _YouTubeIcon from './external/youtube.svg?component'
 import _YouTubeGaming from './external/youtubegaming.svg?component'
@@ -70,12 +76,14 @@ export const SleepingRinthbot = _SleepingRinthbot
 export const SobbingRinthbot = _SobbingRinthbot
 export const ThinkingRinthbot = _ThinkingRinthbot
 export const WavingRinthbot = _WavingRinthbot
-export const SSODiscordIcon = _SSODiscordIcon
-export const SSOGitHubIcon = _SSOGitHubIcon
-export const SSOGitLabIcon = _SSOGitLabIcon
-export const SSOGoogleIcon = _SSOGoogleIcon
-export const SSOMicrosoftIcon = _SSOMicrosoftIcon
-export const SSOSteamIcon = _SSOSteamIcon
+export const PayPalColorIcon = _PayPalColorIcon
+export const VenmoColorIcon = _VenmoColorIcon
+export const DiscordColorIcon = _DiscordColorIcon
+export const GitHubColorIcon = _GitHubColorIcon
+export const GitLabColorIcon = _GitLabColorIcon
+export const GoogleColorIcon = _GoogleColorIcon
+export const MicrosoftColorIcon = _MicrosoftColorIcon
+export const SteamColorIcon = _SteamColorIcon
 export const AppleIcon = _AppleIcon
 export const BlueskyIcon = _BlueskyIcon
 export const BuyMeACoffeeIcon = _BuyMeACoffeeIcon
@@ -101,6 +109,10 @@ export const WindowsIcon = _WindowsIcon
 export const YouTubeIcon = _YouTubeIcon
 export const YouTubeGaming = _YouTubeGaming
 export const YouTubeShortsIcon = _YouTubeShortsIcon
+export const VenmoIcon = _VenmoIcon
+export const PolygonIcon = _PolygonIcon
+export const USDCColorIcon = _USDCColorIcon
+export const VisaIcon = _VisaIcon
 
 export * from './generated-icons'
 export { default as ClassicPlayerModel } from './models/classic-player.gltf?url'
diff --git a/packages/ui/src/components/base/Admonition.vue b/packages/ui/src/components/base/Admonition.vue
index 8571b64b..125c15cd 100644
--- a/packages/ui/src/components/base/Admonition.vue
+++ b/packages/ui/src/components/base/Admonition.vue
@@ -1,23 +1,24 @@
 <template>
 	<div
 		:class="[
-			'flex rounded-2xl border-2 border-solid p-4 gap-4 font-semibold text-contrast',
+			'flex flex-col rounded-2xl border-[1px] border-solid p-4 gap-3 text-contrast',
 			typeClasses[type],
 		]"
 	>
-		<component
-			:is="icons[type]"
-			:class="['hidden h-8 w-8 flex-none sm:block', iconClasses[type]]"
-		/>
-		<div class="flex flex-col gap-2">
-			<div class="font-semibold flex justify-between gap-4">
-				<slot name="header">{{ header }}</slot>
+		<div :class="['flex gap-2 items-start', (header || $slots.header) && 'flex-col']">
+			<div class="flex gap-2 items-start" :class="header || $slots.header ? 'w-full' : 'contents'">
+				<slot name="icon" :icon-class="['h-6 w-6 flex-none', iconClasses[type]]">
+					<component :is="icons[type]" :class="['h-6 w-6 flex-none', iconClasses[type]]" />
+				</slot>
+				<div v-if="header || $slots.header" class="font-semibold text-base">
+					<slot name="header">{{ header }}</slot>
+				</div>
 			</div>
-			<div class="font-normal text-sm sm:text-base">
+			<div class="font-normal text-base" :class="!(header || $slots.header) && 'flex-1'">
 				<slot>{{ body }}</slot>
 			</div>
 		</div>
-		<div class="ml-auto w-fit">
+		<div v-if="showActionsUnderneath || $slots.actions">
 			<slot name="actions" />
 		</div>
 	</div>
@@ -26,20 +27,20 @@
 <script setup lang="ts">
 import { InfoIcon, IssuesIcon, XCircleIcon } from '@modrinth/assets'
 
-defineProps({
-	type: {
-		type: String as () => 'info' | 'warning' | 'critical',
-		default: 'info',
+withDefaults(
+	defineProps<{
+		type?: 'info' | 'warning' | 'critical'
+		header?: string
+		body?: string
+		showActionsUnderneath?: boolean
+	}>(),
+	{
+		type: 'info',
+		header: '',
+		body: '',
+		showActionsUnderneath: false,
 	},
-	header: {
-		type: String,
-		default: '',
-	},
-	body: {
-		type: String,
-		default: '',
-	},
-})
+)
 
 const typeClasses = {
 	info: 'border-brand-blue bg-bg-blue',
diff --git a/packages/ui/src/components/base/BulletDivider.vue b/packages/ui/src/components/base/BulletDivider.vue
new file mode 100644
index 00000000..ad8a19c3
--- /dev/null
+++ b/packages/ui/src/components/base/BulletDivider.vue
@@ -0,0 +1,5 @@
+<template>
+	<div
+		class="min-w-1.5 min-h-1.5 max-h-1.5 max-w-1.5 mx-0.5 rounded-full bg-surface-5 inline-block my-auto align-middle"
+	></div>
+</template>
diff --git a/packages/ui/src/components/base/ButtonStyled.vue b/packages/ui/src/components/base/ButtonStyled.vue
index 3311519b..7782a927 100644
--- a/packages/ui/src/components/base/ButtonStyled.vue
+++ b/packages/ui/src/components/base/ButtonStyled.vue
@@ -6,7 +6,7 @@ const props = withDefaults(
 		color?: 'standard' | 'brand' | 'red' | 'orange' | 'green' | 'blue' | 'purple' | 'medal-promo'
 		size?: 'standard' | 'large' | 'small'
 		circular?: boolean
-		type?: 'standard' | 'outlined' | 'transparent' | 'highlight' | 'highlight-colored-text'
+		type?: 'standard' | 'outlined' | 'transparent' | 'highlight' | 'highlight-colored-text' | 'chip'
 		colorFill?: 'auto' | 'background' | 'text' | 'none'
 		hoverColorFill?: 'auto' | 'background' | 'text' | 'none'
 		highlightedStyle?: 'main-nav-primary' | 'main-nav-secondary'
@@ -172,12 +172,16 @@ const colorVariables = computed(() => {
 					: 'var(--color-button-bg)',
 			text: 'var(--color-contrast)',
 			icon:
-				props.highlightedStyle === 'main-nav-primary'
-					? 'var(--color-brand)'
-					: 'var(--color-contrast)',
+				props.type === 'chip'
+					? 'var(--color-contrast)'
+					: props.highlightedStyle === 'main-nav-primary'
+						? 'var(--color-brand)'
+						: 'var(--color-contrast)',
 		}
 		const hoverColors = JSON.parse(JSON.stringify(colors))
-		return `--_bg: ${colors.bg}; --_text: ${colors.text}; --_icon: ${colors.icon}; --_hover-bg: ${hoverColors.bg}; --_hover-text: ${hoverColors.text}; --_hover-icon: ${hoverColors.icon};`
+		const boxShadow =
+			props.type === 'chip' && colorVar.value ? `0 0 0 2px ${colorVar.value}` : 'none'
+		return `--_bg: ${colors.bg}; --_text: ${colors.text}; --_icon: ${colors.icon}; --_hover-bg: ${hoverColors.bg}; --_hover-text: ${hoverColors.text}; --_hover-icon: ${hoverColors.icon}; --_box-shadow: ${boxShadow};`
 	}
 
 	let colors = {
@@ -197,6 +201,14 @@ const colorVariables = computed(() => {
 			hoverColors,
 			props.hoverColorFill === 'auto' ? 'text' : props.hoverColorFill,
 		)
+	} else if (props.type === 'chip') {
+		// Chip type uses highlight-colored-text styling when colored
+		if (colorVar.value && highlightedColorVar.value) {
+			colors.bg = highlightedColorVar.value
+			colors.text = colorVar.value
+			hoverColors.bg = highlightedColorVar.value
+			hoverColors.text = colorVar.value
+		}
 	} else {
 		colors = setColorFill(colors, props.colorFill === 'auto' ? 'background' : props.colorFill)
 		hoverColors = setColorFill(
@@ -205,7 +217,8 @@ const colorVariables = computed(() => {
 		)
 	}
 
-	return `--_bg: ${colors.bg}; --_text: ${colors.text}; --_hover-bg: ${hoverColors.bg}; --_hover-text: ${hoverColors.text};`
+	const boxShadow = props.type === 'chip' && colorVar.value ? `0 0 0 2px ${colorVar.value}` : 'none'
+	return `--_bg: ${colors.bg}; --_text: ${colors.text}; --_hover-bg: ${hoverColors.bg}; --_hover-text: ${hoverColors.text}; --_box-shadow: ${boxShadow};`
 })
 
 const fontSize = computed(() => {
@@ -219,7 +232,7 @@ const fontSize = computed(() => {
 <template>
 	<div
 		class="btn-wrapper"
-		:class="[{ outline: type === 'outlined' }, fontSize]"
+		:class="[{ outline: type === 'outlined', chip: type === 'chip' }, fontSize]"
 		:style="`${colorVariables}--_height:${height};--_width:${width};--_radius: ${radius};--_padding-x:${paddingX};--_padding-y:${paddingY};--_gap:${gap};--_font-weight:${fontWeight};--_icon-size:${iconSize};`"
 	>
 		<slot />
@@ -242,10 +255,12 @@ const fontSize = computed(() => {
 	> *:first-child
 	> :is(button, a, .button-like):first-child {
 	@apply flex cursor-pointer flex-row items-center justify-center border-solid border-2 border-transparent bg-[--_bg] text-[--_text] h-[--_height] min-w-[--_width] rounded-[--_radius] px-[--_padding-x] py-[--_padding-y] gap-[--_gap] font-[--_font-weight] whitespace-nowrap;
+	box-shadow: var(--_box-shadow, inset 0 0 0 transparent);
 	transition:
 		scale 0.125s ease-in-out,
 		background-color 0.25s ease-in-out,
-		color 0.25s ease-in-out;
+		color 0.25s ease-in-out,
+		filter 0.25s ease-in-out;
 
 	svg:first-child {
 		color: var(--_icon, var(--_text));
@@ -267,7 +282,7 @@ const fontSize = computed(() => {
 	}
 
 	&:not([disabled]):not([disabled='true']):not(.disabled) {
-		@apply active:scale-95 hover:brightness-[--hover-brightness] focus-visible:brightness-[--hover-brightness] hover:bg-[--_hover-bg] hover:text-[--_hover-text] focus-visible:bg-[--_hover-bg] focus-visible:text-[--_hover-text];
+		@apply hover:brightness-[--hover-brightness] focus-visible:brightness-[--hover-brightness] hover:bg-[--_hover-bg] hover:text-[--_hover-text] focus-visible:bg-[--_hover-bg] focus-visible:text-[--_hover-text];
 
 		&:hover svg:first-child,
 		&:focus-visible svg:first-child {
@@ -276,6 +291,20 @@ const fontSize = computed(() => {
 	}
 }
 
+.btn-wrapper:not(.chip) :deep(:is(button, a, .button-like):first-child),
+.btn-wrapper:not(.chip) :slotted(:is(button, a, .button-like):first-child),
+.btn-wrapper:not(.chip) :slotted(*) > :is(button, a, .button-like):first-child,
+.btn-wrapper:not(.chip) :slotted(*) > *:first-child > :is(button, a, .button-like):first-child,
+.btn-wrapper:not(.chip)
+	:slotted(*)
+	> *:first-child
+	> *:first-child
+	> :is(button, a, .button-like):first-child {
+	&:not([disabled]):not([disabled='true']):not(.disabled) {
+		@apply active:scale-95;
+	}
+}
+
 .btn-wrapper.outline :deep(:is(button, a, .button-like):first-child),
 .btn-wrapper.outline :slotted(:is(button, a, .button-like):first-child),
 .btn-wrapper.outline :slotted(*) > :is(button, a, .button-like):first-child,
diff --git a/packages/ui/src/components/base/Combobox.vue b/packages/ui/src/components/base/Combobox.vue
new file mode 100644
index 00000000..9d6bf359
--- /dev/null
+++ b/packages/ui/src/components/base/Combobox.vue
@@ -0,0 +1,539 @@
+<template>
+	<div ref="containerRef" class="relative inline-block w-full">
+		<span
+			ref="triggerRef"
+			role="button"
+			tabindex="0"
+			class="max-h-[36px] relative cursor-pointer flex min-h-5 w-full items-center justify-between overflow-hidden rounded-xl bg-button-bg px-4 py-2.5 text-left transition-all duration-200 text-button-text hover:bg-button-bgHover active:bg-button-bgActive"
+			:class="[
+				triggerClasses,
+				{
+					'z-[9999]': isOpen,
+					'rounded-b-none': shouldRoundBottomCorners,
+					'rounded-t-none': shouldRoundTopCorners,
+					'cursor-not-allowed opacity-50': disabled,
+				},
+			]"
+			:aria-expanded="isOpen"
+			:aria-haspopup="listbox ? 'listbox' : 'menu'"
+			:aria-disabled="disabled || undefined"
+			@click="handleTriggerClick"
+			@keydown="handleTriggerKeydown"
+		>
+			<div class="flex items-center gap-2">
+				<slot name="prefix"></slot>
+				<span class="text-primary font-semibold leading-tight">
+					<slot name="selected">{{ triggerText }}</slot>
+				</span>
+			</div>
+			<div class="flex items-center gap-1">
+				<slot name="suffix"></slot>
+				<ChevronLeftIcon
+					v-if="showChevron"
+					class="size-5 shrink-0 transition-transform duration-300"
+					:class="isOpen ? (openDirection === 'down' ? 'rotate-90' : '-rotate-90') : '-rotate-90'"
+				/>
+			</div>
+		</span>
+
+		<Teleport to="#teleports">
+			<div
+				v-if="isOpen"
+				ref="dropdownRef"
+				class="fixed z-[9999] flex flex-col overflow-hidden rounded-[14px] bg-surface-4 !border-solid border-0 shadow-2xl"
+				:class="[
+					shouldRoundBottomCorners
+						? 'rounded-t-none !border-t-[1px] !border-t-surface-5'
+						: 'rounded-b-none !border-b-[1px] !border-b-surface-5',
+				]"
+				:style="dropdownStyle"
+				:role="listbox ? 'listbox' : 'menu'"
+				@mousedown.stop
+				@keydown="handleDropdownKeydown"
+			>
+				<div v-if="searchable" class="p-4">
+					<div class="iconified-input w-full border-surface-5 border-[1px] border-solid rounded-xl">
+						<SearchIcon aria-hidden="true" />
+						<input
+							ref="searchInputRef"
+							v-model="searchQuery"
+							type="text"
+							:placeholder="searchPlaceholder"
+							class=""
+							@keydown.stop="handleSearchKeydown"
+						/>
+					</div>
+				</div>
+
+				<div v-if="searchable && filteredOptions.length > 0" class="h-px bg-surface-5"></div>
+
+				<div
+					v-if="filteredOptions.length > 0"
+					ref="optionsContainerRef"
+					class="flex flex-col gap-2 overflow-y-auto p-3"
+					:style="{ maxHeight: `${maxHeight}px` }"
+				>
+					<template v-for="(item, index) in filteredOptions" :key="item.key">
+						<div v-if="item.type === 'divider'" class="h-px bg-surface-5"></div>
+						<component
+							:is="item.type === 'link' ? 'a' : 'span'"
+							v-else
+							:ref="(el: HTMLElement) => setOptionRef(el as HTMLElement, index)"
+							:href="item.type === 'link' && !item.disabled ? item.href : undefined"
+							:target="item.type === 'link' && !item.disabled ? item.target : undefined"
+							:role="listbox ? 'option' : 'menuitem'"
+							:aria-selected="listbox && item.value === modelValue"
+							:aria-disabled="item.disabled || undefined"
+							:data-focused="focusedIndex === index"
+							class="flex items-center gap-2.5 cursor-pointer rounded-xl p-3 text-left transition-colors duration-150 text-contrast hover:bg-surface-5 focus:bg-surface-5"
+							:class="getOptionClasses(item, index)"
+							tabindex="-1"
+							@click="handleOptionClick(item, index)"
+							@mouseenter="!item.disabled && (focusedIndex = index)"
+						>
+							<slot :name="`option-${item.value}`" :item="item">
+								<div class="flex items-center gap-2">
+									<component :is="item.icon" v-if="item.icon" class="h-5 w-5" />
+									<span
+										class="font-semibold leading-tight"
+										:class="item.value === modelValue ? 'text-contrast' : 'text-primary'"
+									>
+										{{ item.label }}
+									</span>
+								</div>
+							</slot>
+						</component>
+					</template>
+				</div>
+
+				<div v-else-if="searchQuery" class="p-4 mb-2 text-center text-sm text-secondary">
+					No results found
+				</div>
+			</div>
+		</Teleport>
+	</div>
+</template>
+
+<script setup lang="ts" generic="T">
+import { ChevronLeftIcon, SearchIcon } from '@modrinth/assets'
+import { onClickOutside } from '@vueuse/core'
+import {
+	type Component,
+	computed,
+	nextTick,
+	onMounted,
+	onUnmounted,
+	ref,
+	useSlots,
+	watch,
+} from 'vue'
+
+export interface DropdownOption<T> {
+	value: T
+	label: string
+	icon?: Component
+	disabled?: boolean
+	class?: string
+	type?: 'button' | 'link' | 'divider'
+	href?: string
+	target?: string
+	action?: () => void
+}
+
+const DROPDOWN_VIEWPORT_MARGIN = 8
+const DEFAULT_MAX_HEIGHT = 300
+
+function isDropdownOption<T>(
+	opt: DropdownOption<T> | { type: 'divider' },
+): opt is DropdownOption<T> {
+	return 'value' in opt
+}
+
+function isDivider<T>(opt: DropdownOption<T> | { type: 'divider' }): opt is { type: 'divider' } {
+	return opt.type === 'divider'
+}
+
+const props = withDefaults(
+	defineProps<{
+		modelValue?: T
+		options: (DropdownOption<T> | { type: 'divider' })[]
+		placeholder?: string
+		disabled?: boolean
+		searchable?: boolean
+		searchPlaceholder?: string
+		listbox?: boolean
+		showChevron?: boolean
+		maxHeight?: number
+		displayValue?: string
+		extraPosition?: 'top' | 'bottom'
+		triggerClass?: string
+		forceDirection?: 'up' | 'down'
+	}>(),
+	{
+		placeholder: 'Select an option',
+		disabled: false,
+		searchable: false,
+		searchPlaceholder: 'Search...',
+		listbox: true,
+		showChevron: true,
+		maxHeight: DEFAULT_MAX_HEIGHT,
+		extraPosition: 'bottom',
+	},
+)
+
+const emit = defineEmits<{
+	'update:modelValue': [value: T]
+	select: [option: DropdownOption<T>]
+	open: []
+	close: []
+}>()
+
+const slots = useSlots()
+
+const isOpen = ref(false)
+const searchQuery = ref('')
+const focusedIndex = ref(-1)
+const containerRef = ref<HTMLElement>()
+const triggerRef = ref<HTMLElement>()
+const dropdownRef = ref<HTMLElement>()
+const searchInputRef = ref<HTMLInputElement>()
+const optionsContainerRef = ref<HTMLElement>()
+const optionRefs = ref<(HTMLElement | null)[]>([])
+
+const dropdownStyle = ref({
+	top: '0px',
+	left: '0px',
+	width: '0px',
+})
+
+const openDirection = ref<'down' | 'up'>('down')
+
+const triggerClasses = computed(() => {
+	const classes = [props.triggerClass]
+	if (isOpen.value) {
+		if (props.extraPosition === 'bottom' && slots?.extra) {
+			classes.push('!rounded-b-none')
+		} else if (props.extraPosition === 'top' && slots?.extra) {
+			classes.push('!rounded-t-none')
+		}
+	}
+	return classes
+})
+
+const selectedOption = computed<DropdownOption<T> | undefined>(() => {
+	return props.options.find(
+		(opt): opt is DropdownOption<T> => isDropdownOption(opt) && opt.value === props.modelValue,
+	)
+})
+
+const triggerText = computed(() => {
+	if (props.displayValue !== undefined) return props.displayValue
+	if (selectedOption.value) return selectedOption.value.label
+	return props.placeholder
+})
+
+const optionsWithKeys = computed(() => {
+	return props.options.map((opt, index) => ({
+		...opt,
+		key: isDivider(opt) ? `divider-${index}` : `option-${opt.value}`,
+	}))
+})
+
+const filteredOptions = computed(() => {
+	if (!searchQuery.value || !props.searchable) {
+		return optionsWithKeys.value
+	}
+
+	const query = searchQuery.value.toLowerCase()
+	return optionsWithKeys.value.filter((opt) => {
+		if (isDivider(opt)) return false
+		return opt.label.toLowerCase().includes(query)
+	})
+})
+
+const shouldRoundBottomCorners = computed(() => isOpen.value && openDirection.value === 'down')
+const shouldRoundTopCorners = computed(() => isOpen.value && openDirection.value === 'up')
+
+function getOptionClasses(item: DropdownOption<T> & { key: string }, index: number) {
+	return [
+		item.class,
+		{
+			'bg-surface-5':
+				(props.listbox && item.value === props.modelValue) ||
+				(focusedIndex.value === index && !(props.listbox && item.value === props.modelValue)),
+			'cursor-not-allowed opacity-50 pointer-events-none': item.disabled,
+		},
+	]
+}
+
+function setOptionRef(el: HTMLElement | null, index: number) {
+	optionRefs.value[index] = el
+}
+
+function setInitialFocus() {
+	focusedIndex.value = props.listbox
+		? props.options.findIndex((opt) => isDropdownOption(opt) && opt.value === props.modelValue)
+		: -1
+
+	if (focusedIndex.value >= 0 && optionRefs.value[focusedIndex.value]) {
+		optionRefs.value[focusedIndex.value]?.scrollIntoView({ block: 'center' })
+	}
+}
+
+function focusSearchInput() {
+	if (props.searchable && searchInputRef.value) {
+		searchInputRef.value.focus()
+	}
+}
+
+function determineOpenDirection(
+	triggerRect: DOMRect,
+	dropdownRect: DOMRect,
+	viewportHeight: number,
+): 'up' | 'down' {
+	if (props.forceDirection) {
+		return props.forceDirection
+	}
+
+	const hasSpaceBelow =
+		triggerRect.bottom + dropdownRect.height + DROPDOWN_VIEWPORT_MARGIN <= viewportHeight
+	const hasSpaceAbove = triggerRect.top - dropdownRect.height - DROPDOWN_VIEWPORT_MARGIN > 0
+
+	return !hasSpaceBelow && hasSpaceAbove ? 'up' : 'down'
+}
+
+function calculateVerticalPosition(
+	triggerRect: DOMRect,
+	dropdownRect: DOMRect,
+	direction: 'up' | 'down',
+): number {
+	return direction === 'up' ? triggerRect.top - dropdownRect.height : triggerRect.bottom
+}
+
+function calculateHorizontalPosition(
+	triggerRect: DOMRect,
+	dropdownRect: DOMRect,
+	viewportWidth: number,
+): number {
+	let left = triggerRect.left
+
+	if (left + dropdownRect.width > viewportWidth - DROPDOWN_VIEWPORT_MARGIN) {
+		left = Math.max(
+			DROPDOWN_VIEWPORT_MARGIN,
+			viewportWidth - dropdownRect.width - DROPDOWN_VIEWPORT_MARGIN,
+		)
+	}
+
+	return left
+}
+
+async function updateDropdownPosition() {
+	if (!triggerRef.value || !dropdownRef.value) return
+
+	await nextTick()
+
+	const triggerRect = triggerRef.value.getBoundingClientRect()
+	const dropdownRect = dropdownRef.value.getBoundingClientRect()
+	const viewportHeight = window.innerHeight
+	const viewportWidth = window.innerWidth
+
+	const direction = determineOpenDirection(triggerRect, dropdownRect, viewportHeight)
+	const top = calculateVerticalPosition(triggerRect, dropdownRect, direction)
+	const left = calculateHorizontalPosition(triggerRect, dropdownRect, viewportWidth)
+
+	dropdownStyle.value = {
+		top: `${top}px`,
+		left: `${left}px`,
+		width: `${triggerRect.width}px`,
+	}
+
+	openDirection.value = direction
+}
+
+async function openDropdown() {
+	if (props.disabled || isOpen.value) return
+
+	isOpen.value = true
+	searchQuery.value = ''
+
+	emit('open')
+
+	await nextTick()
+	await updateDropdownPosition()
+
+	setInitialFocus()
+	focusSearchInput()
+}
+
+function closeDropdown() {
+	if (!isOpen.value) return
+
+	isOpen.value = false
+	searchQuery.value = ''
+	focusedIndex.value = -1
+	emit('close')
+
+	nextTick(() => {
+		triggerRef.value?.focus()
+	})
+}
+
+function handleTriggerClick() {
+	if (isOpen.value) {
+		closeDropdown()
+	} else {
+		openDropdown()
+	}
+}
+
+function handleOptionClick(option: DropdownOption<T>, index: number) {
+	if (option.disabled || option.type === 'divider') return
+
+	focusedIndex.value = index
+
+	if (option.action) {
+		option.action()
+	}
+
+	if (props.listbox && option.value !== undefined) {
+		emit('update:modelValue', option.value)
+	}
+
+	emit('select', option)
+
+	if (option.type !== 'link') {
+		closeDropdown()
+	}
+}
+
+function findNextFocusableOption(currentIndex: number, direction: 'next' | 'previous'): number {
+	const length = filteredOptions.value.length
+	let index = currentIndex
+	let option
+
+	do {
+		index = direction === 'next' ? (index + 1) % length : (index - 1 + length) % length
+		option = filteredOptions.value[index]
+	} while (isDivider(option) || option.disabled)
+
+	return index
+}
+
+function focusOption(index: number) {
+	if (index < 0 || index >= filteredOptions.value.length) return
+
+	const option = filteredOptions.value[index]
+	if (isDivider(option) || option.disabled) return
+
+	focusedIndex.value = index
+	optionRefs.value[index]?.focus()
+	optionRefs.value[index]?.scrollIntoView({ block: 'nearest' })
+}
+
+function focusNextOption() {
+	const nextIndex = findNextFocusableOption(focusedIndex.value, 'next')
+	focusOption(nextIndex)
+}
+
+function focusPreviousOption() {
+	const prevIndex = findNextFocusableOption(focusedIndex.value, 'previous')
+	focusOption(prevIndex)
+}
+
+function handleTriggerKeydown(event: KeyboardEvent) {
+	switch (event.key) {
+		case 'Enter':
+		case ' ':
+		case 'ArrowDown':
+			event.preventDefault()
+			openDropdown()
+			break
+		case 'ArrowUp':
+			event.preventDefault()
+			openDropdown()
+			break
+	}
+}
+
+function handleDropdownKeydown(event: KeyboardEvent) {
+	switch (event.key) {
+		case 'Escape':
+			event.preventDefault()
+			closeDropdown()
+			break
+		case 'ArrowDown':
+			event.preventDefault()
+			focusNextOption()
+			break
+		case 'ArrowUp':
+			event.preventDefault()
+			focusPreviousOption()
+			break
+		case 'Enter':
+		case ' ':
+			event.preventDefault()
+			if (focusedIndex.value >= 0) {
+				const option = filteredOptions.value[focusedIndex.value]
+				if (!isDivider(option)) {
+					handleOptionClick(option, focusedIndex.value)
+				}
+			}
+			break
+		case 'Tab':
+			event.preventDefault()
+			if (event.shiftKey) {
+				focusPreviousOption()
+			} else {
+				focusNextOption()
+			}
+			break
+	}
+}
+
+function handleSearchKeydown(event: KeyboardEvent) {
+	if (event.key === 'Escape') {
+		event.preventDefault()
+		closeDropdown()
+	} else if (event.key === 'ArrowDown') {
+		event.preventDefault()
+		focusNextOption()
+	} else if (event.key === 'ArrowUp') {
+		event.preventDefault()
+		focusPreviousOption()
+	}
+}
+
+function handleWindowResize() {
+	if (isOpen.value) {
+		updateDropdownPosition()
+	}
+}
+
+onClickOutside(
+	dropdownRef,
+	() => {
+		closeDropdown()
+	},
+	{ ignore: [triggerRef] },
+)
+
+onMounted(() => {
+	window.addEventListener('resize', handleWindowResize)
+})
+
+onUnmounted(() => {
+	window.removeEventListener('resize', handleWindowResize)
+})
+
+watch(isOpen, (value) => {
+	if (value) {
+		updateDropdownPosition()
+	}
+})
+
+watch(filteredOptions, () => {
+	if (isOpen.value) {
+		updateDropdownPosition()
+	}
+})
+</script>
diff --git a/packages/ui/src/components/base/TeleportDropdownMenu.vue b/packages/ui/src/components/base/TeleportDropdownMenu.vue
deleted file mode 100644
index 5d52e2fd..00000000
--- a/packages/ui/src/components/base/TeleportDropdownMenu.vue
+++ /dev/null
@@ -1,441 +0,0 @@
-<template>
-	<div
-		ref="dropdown"
-		data-pyro-dropdown
-		tabindex="0"
-		role="combobox"
-		:aria-expanded="dropdownVisible"
-		class="relative inline-block h-9 w-full max-w-80"
-		@focus="onFocus"
-		@blur="onBlur"
-		@mousedown.prevent
-		@keydown="handleKeyDown"
-	>
-		<div
-			data-pyro-dropdown-trigger
-			class="duration-50 flex h-full w-full cursor-pointer select-none items-center justify-between gap-4 rounded-xl bg-button-bg px-4 py-2 shadow-sm transition-all ease-in-out"
-			:class="triggerClasses"
-			@click="toggleDropdown"
-		>
-			<span>{{ selectedOption }}</span>
-			<DropdownIcon
-				class="transition-transform duration-200 ease-in-out"
-				:class="{ 'rotate-180': dropdownVisible }"
-			/>
-		</div>
-
-		<Teleport to="#teleports">
-			<transition
-				enter-active-class="transition-opacity duration-200 ease-out"
-				enter-from-class="opacity-0"
-				enter-to-class="opacity-100"
-				leave-active-class="transition-opacity duration-200 ease-in"
-				leave-from-class="opacity-100"
-				leave-to-class="opacity-0"
-			>
-				<div
-					v-if="dropdownVisible"
-					ref="optionsContainer"
-					data-pyro-dropdown-options
-					class="experimental-styles-within fixed z-50 bg-button-bg shadow-lg"
-					:class="{
-						'rounded-b-xl': !isRenderingUp,
-						'rounded-t-xl': isRenderingUp,
-					}"
-					:style="positionStyle"
-					@keydown.stop="handleDropdownKeyDown"
-				>
-					<div
-						class="overflow-y-auto"
-						:style="{ height: `${virtualListHeight}px` }"
-						data-pyro-dropdown-options-virtual-scroller
-						@scroll="handleScroll"
-					>
-						<div :style="{ height: `${totalHeight}px`, position: 'relative' }">
-							<div
-								v-for="item in visibleOptions"
-								:key="item.index"
-								data-pyro-dropdown-option
-								:style="{
-									position: 'absolute',
-									top: 0,
-									transform: `translateY(${item.index * ITEM_HEIGHT}px)`,
-									width: '100%',
-									height: `${ITEM_HEIGHT}px`,
-								}"
-							>
-								<div
-									:ref="(el) => handleOptionRef(el as HTMLElement, item.index)"
-									role="option"
-									:tabindex="focusedOptionIndex === item.index ? 0 : -1"
-									class="hover:brightness-85 flex h-full cursor-pointer select-none items-center px-4 transition-colors duration-150 ease-in-out focus:border-none focus:outline-none"
-									:class="{
-										'bg-brand font-bold text-brand-inverted': selectedValue === item.option,
-										'bg-bg-raised': focusedOptionIndex === item.index,
-									}"
-									:aria-selected="selectedValue === item.option"
-									@click="selectOption(item.option, item.index)"
-									@mouseover="focusedOptionIndex = item.index"
-									@focus="focusedOptionIndex = item.index"
-								>
-									<input
-										:id="`${name}-${item.index}`"
-										v-model="radioValue"
-										type="radio"
-										:value="item.option"
-										:name="name"
-										class="hidden"
-									/>
-									<label :for="`${name}-${item.index}`" class="w-full cursor-pointer">
-										{{ displayName(item.option) }}
-									</label>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</transition>
-		</Teleport>
-	</div>
-</template>
-
-<script setup lang="ts" generic="OptionValue extends string | number | Record<string, any>">
-import { DropdownIcon } from '@modrinth/assets'
-import type { CSSProperties } from 'vue'
-import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
-
-const ITEM_HEIGHT = 44
-const BUFFER_ITEMS = 5
-
-interface Props {
-	options: OptionValue[]
-	name: string
-	defaultValue?: OptionValue | null
-	placeholder?: string | number | null
-	modelValue?: OptionValue | null
-	renderUp?: boolean
-	disabled?: boolean
-	displayName?: (option: OptionValue) => string
-}
-
-const props = withDefaults(defineProps<Props>(), {
-	defaultValue: null,
-	placeholder: null,
-	modelValue: null,
-	renderUp: false,
-	disabled: false,
-	displayName: (option: OptionValue) => String(option),
-})
-
-const emit = defineEmits<{
-	(e: 'input' | 'update:modelValue', value: OptionValue): void
-	(e: 'change', value: { option: OptionValue; index: number }): void
-}>()
-
-const dropdownVisible = ref(false)
-const selectedValue = ref<OptionValue | null>(props.modelValue || props.defaultValue)
-const focusedOptionIndex = ref<number | null>(null)
-const focusedOptionRef = ref<HTMLElement | null>(null)
-const dropdown = ref<HTMLElement | null>(null)
-const optionsContainer = ref<HTMLElement | null>(null)
-const scrollTop = ref(0)
-const isRenderingUp = ref(false)
-const virtualListHeight = ref(300)
-const lastFocusedElement = ref<HTMLElement | null>(null)
-
-const positionStyle = ref<CSSProperties>({
-	position: 'fixed',
-	top: '0px',
-	left: '0px',
-	width: '0px',
-	zIndex: 999,
-})
-
-const handleOptionRef = (el: HTMLElement | null, index: number) => {
-	if (focusedOptionIndex.value === index) {
-		focusedOptionRef.value = el
-	}
-}
-
-const onFocus = async () => {
-	if (!props.disabled) {
-		focusedOptionIndex.value = props.options.findIndex((option) => option === selectedValue.value)
-		lastFocusedElement.value = document.activeElement as HTMLElement
-		dropdownVisible.value = true
-		await updatePosition()
-		nextTick(() => {
-			dropdown.value?.focus()
-		})
-	}
-}
-
-const onBlur = (event: FocusEvent) => {
-	if (!isChildOfDropdown(event.relatedTarget as HTMLElement | null)) {
-		closeDropdown()
-	}
-}
-
-const isChildOfDropdown = (element: HTMLElement | null): boolean => {
-	let currentNode: HTMLElement | null = element
-	while (currentNode) {
-		if (currentNode === dropdown.value || currentNode === optionsContainer.value) {
-			return true
-		}
-		currentNode = currentNode.parentElement
-	}
-	return false
-}
-
-const totalHeight = computed(() => props.options.length * ITEM_HEIGHT)
-
-const visibleOptions = computed(() => {
-	const startIndex = Math.floor(scrollTop.value / ITEM_HEIGHT) - BUFFER_ITEMS
-	const visibleCount = Math.ceil(virtualListHeight.value / ITEM_HEIGHT) + 2 * BUFFER_ITEMS
-
-	return Array.from({ length: visibleCount }, (_, i) => {
-		const index = startIndex + i
-		if (index >= 0 && index < props.options.length) {
-			return {
-				index,
-				option: props.options[index],
-			}
-		}
-		return null
-	}).filter((item): item is { index: number; option: OptionValue } => item !== null)
-})
-
-const selectedOption = computed(() => {
-	if (selectedValue.value !== null && selectedValue.value !== undefined) {
-		return props.displayName(selectedValue.value as OptionValue)
-	}
-	return props.placeholder || 'Select an option'
-})
-
-const radioValue = computed<OptionValue>({
-	get() {
-		return props.modelValue ?? selectedValue.value ?? ''
-	},
-	set(newValue: OptionValue) {
-		emit('update:modelValue', newValue)
-		selectedValue.value = newValue
-	},
-})
-
-const triggerClasses = computed(() => ({
-	'cursor-not-allowed opacity-50 grayscale': props.disabled,
-	'rounded-b-none': dropdownVisible.value && !isRenderingUp.value && !props.disabled,
-	'rounded-t-none': dropdownVisible.value && isRenderingUp.value && !props.disabled,
-}))
-
-const updatePosition = async () => {
-	if (!dropdown.value) return
-
-	await nextTick()
-	const triggerRect = dropdown.value.getBoundingClientRect()
-	const viewportHeight = window.innerHeight
-	const margin = 8
-
-	const contentHeight = props.options.length * ITEM_HEIGHT
-	const preferredHeight = Math.min(contentHeight, 300)
-
-	const spaceBelow = viewportHeight - triggerRect.bottom
-	const spaceAbove = triggerRect.top
-
-	isRenderingUp.value = spaceBelow < preferredHeight && spaceAbove > spaceBelow
-
-	virtualListHeight.value = isRenderingUp.value
-		? Math.min(spaceAbove - margin, preferredHeight)
-		: Math.min(spaceBelow - margin, preferredHeight)
-
-	positionStyle.value = {
-		position: 'fixed',
-		left: `${triggerRect.left}px`,
-		width: `${triggerRect.width}px`,
-		zIndex: 999,
-		...(isRenderingUp.value
-			? { bottom: `${viewportHeight - triggerRect.top}px`, top: 'auto' }
-			: { top: `${triggerRect.bottom}px`, bottom: 'auto' }),
-	}
-}
-
-const openDropdown = async () => {
-	if (!props.disabled) {
-		closeAllDropdowns()
-		dropdownVisible.value = true
-		focusedOptionIndex.value = props.options.findIndex((option) => option === selectedValue.value)
-		lastFocusedElement.value = document.activeElement as HTMLElement
-		await updatePosition()
-
-		requestAnimationFrame(() => {
-			updatePosition()
-		})
-	}
-}
-
-const toggleDropdown = () => {
-	if (!props.disabled) {
-		if (dropdownVisible.value) {
-			closeDropdown()
-		} else {
-			openDropdown()
-		}
-	}
-}
-
-const handleResize = () => {
-	if (dropdownVisible.value) {
-		requestAnimationFrame(() => {
-			updatePosition()
-		})
-	}
-}
-
-const handleScroll = (event: Event) => {
-	const target = event.target as HTMLElement
-	scrollTop.value = target.scrollTop
-}
-
-const handleKeyDown = (event: KeyboardEvent) => {
-	if (!dropdownVisible.value) {
-		if (event.key === 'Enter' || event.key === ' ') {
-			event.preventDefault()
-			lastFocusedElement.value = document.activeElement as HTMLElement
-			toggleDropdown()
-		}
-	} else {
-		handleDropdownKeyDown(event)
-	}
-}
-
-const handleDropdownKeyDown = (event: KeyboardEvent) => {
-	event.stopPropagation()
-
-	switch (event.key) {
-		case 'ArrowDown':
-			event.preventDefault()
-			focusNextOption()
-			break
-		case 'ArrowUp':
-			event.preventDefault()
-			focusPreviousOption()
-			break
-		case 'Enter':
-			event.preventDefault()
-			if (focusedOptionIndex.value !== null) {
-				selectOption(props.options[focusedOptionIndex.value], focusedOptionIndex.value)
-			}
-			break
-		case 'Escape':
-			event.preventDefault()
-			event.stopPropagation()
-			closeDropdown()
-			break
-		case 'Tab':
-			event.preventDefault()
-			if (event.shiftKey) {
-				focusPreviousOption()
-			} else {
-				focusNextOption()
-			}
-			break
-	}
-}
-
-const closeDropdown = () => {
-	dropdownVisible.value = false
-	focusedOptionIndex.value = null
-	if (lastFocusedElement.value) {
-		lastFocusedElement.value.focus()
-		lastFocusedElement.value = null
-	}
-}
-
-const closeAllDropdowns = () => {
-	const event = new CustomEvent('close-all-dropdowns')
-	window.dispatchEvent(event)
-}
-
-const selectOption = (option: OptionValue, index: number) => {
-	radioValue.value = option
-	emit('change', { option, index })
-	closeDropdown()
-}
-
-const focusNextOption = () => {
-	if (focusedOptionIndex.value === null) {
-		focusedOptionIndex.value = 0
-	} else {
-		focusedOptionIndex.value = (focusedOptionIndex.value + 1) % props.options.length
-	}
-	scrollToFocused()
-	nextTick(() => {
-		focusedOptionRef.value?.focus()
-	})
-}
-
-const focusPreviousOption = () => {
-	if (focusedOptionIndex.value === null) {
-		focusedOptionIndex.value = props.options.length - 1
-	} else {
-		focusedOptionIndex.value =
-			(focusedOptionIndex.value - 1 + props.options.length) % props.options.length
-	}
-	scrollToFocused()
-	nextTick(() => {
-		focusedOptionRef.value?.focus()
-	})
-}
-
-const scrollToFocused = () => {
-	if (focusedOptionIndex.value === null) return
-
-	const optionsElement = optionsContainer.value?.querySelector('.overflow-y-auto')
-	if (!optionsElement) return
-
-	const targetScrollTop = focusedOptionIndex.value * ITEM_HEIGHT
-	const scrollBottom = optionsElement.clientHeight
-
-	if (targetScrollTop < optionsElement.scrollTop) {
-		optionsElement.scrollTop = targetScrollTop
-	} else if (targetScrollTop + ITEM_HEIGHT > optionsElement.scrollTop + scrollBottom) {
-		optionsElement.scrollTop = targetScrollTop - scrollBottom + ITEM_HEIGHT
-	}
-}
-
-onMounted(() => {
-	window.addEventListener('resize', handleResize)
-	window.addEventListener('scroll', handleResize, true)
-	window.addEventListener('click', (event) => {
-		if (!isChildOfDropdown(event.target as HTMLElement)) {
-			closeDropdown()
-		}
-	})
-	window.addEventListener('close-all-dropdowns', closeDropdown)
-})
-
-onUnmounted(() => {
-	window.removeEventListener('resize', handleResize)
-	window.removeEventListener('scroll', handleResize, true)
-	window.removeEventListener('click', (event) => {
-		if (!isChildOfDropdown(event.target as HTMLElement)) {
-			closeDropdown()
-		}
-	})
-	window.removeEventListener('close-all-dropdowns', closeDropdown)
-	lastFocusedElement.value = null
-})
-
-watch(
-	() => props.modelValue,
-	(newValue) => {
-		selectedValue.value = newValue
-	},
-)
-
-watch(dropdownVisible, async (newValue) => {
-	if (newValue) {
-		await updatePosition()
-		scrollTop.value = 0
-	}
-})
-</script>
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index dbff9859..c26f8ece 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -6,6 +6,7 @@ export { default as AutoBrandIcon } from './base/AutoBrandIcon.vue'
 export { default as AutoLink } from './base/AutoLink.vue'
 export { default as Avatar } from './base/Avatar.vue'
 export { default as Badge } from './base/Badge.vue'
+export { default as BulletDivider } from './base/BulletDivider.vue'
 export { default as Button } from './base/Button.vue'
 export { default as ButtonStyled } from './base/ButtonStyled.vue'
 export { default as Card } from './base/Card.vue'
@@ -13,6 +14,7 @@ export { default as Checkbox } from './base/Checkbox.vue'
 export { default as Chips } from './base/Chips.vue'
 export { default as Collapsible } from './base/Collapsible.vue'
 export { default as CollapsibleRegion } from './base/CollapsibleRegion.vue'
+export { default as Combobox } from './base/Combobox.vue'
 export { default as ContentPageHeader } from './base/ContentPageHeader.vue'
 export { default as CopyCode } from './base/CopyCode.vue'
 export { default as DoubleIcon } from './base/DoubleIcon.vue'
@@ -50,7 +52,6 @@ export { default as Slider } from './base/Slider.vue'
 export { default as SmartClickable } from './base/SmartClickable.vue'
 export { default as StatItem } from './base/StatItem.vue'
 export { default as TagItem } from './base/TagItem.vue'
-export { default as TeleportDropdownMenu } from './base/TeleportDropdownMenu.vue'
 export { default as Timeline } from './base/Timeline.vue'
 export { default as Toggle } from './base/Toggle.vue'
 export { default as UnsavedChangesPopup } from './base/UnsavedChangesPopup.vue'
diff --git a/packages/ui/src/components/modal/NewModal.vue b/packages/ui/src/components/modal/NewModal.vue
index 738df740..1ca3b2e8 100644
--- a/packages/ui/src/components/modal/NewModal.vue
+++ b/packages/ui/src/components/modal/NewModal.vue
@@ -38,9 +38,66 @@
 						</button>
 					</ButtonStyled>
 				</div>
-				<div class="overflow-y-auto p-6">
+
+				<ButtonStyled
+					v-if="props.mergeHeader && closable"
+					class="absolute top-4 right-4 z-10"
+					circular
+				>
+					<button v-tooltip="'Close'" aria-label="Close" @click="hide">
+						<XIcon aria-hidden="true" />
+					</button>
+				</ButtonStyled>
+
+				<div v-if="scrollable" class="relative">
+					<Transition
+						enter-active-class="transition-all duration-200 ease-out"
+						enter-from-class="opacity-0 max-h-0"
+						enter-to-class="opacity-100 max-h-24"
+						leave-active-class="transition-all duration-200 ease-in"
+						leave-from-class="opacity-100 max-h-24"
+						leave-to-class="opacity-0 max-h-0"
+					>
+						<div
+							v-if="showTopFade"
+							class="pointer-events-none absolute left-0 right-0 top-0 z-10 h-24 bg-gradient-to-b from-bg-raised to-transparent"
+						/>
+					</Transition>
+
+					<div
+						ref="scrollContainer"
+						:class="[
+							'overflow-y-auto p-6 !pb-1 sm:pb-6',
+							{ 'pt-12': props.mergeHeader && closable },
+						]"
+						:style="{ maxHeight: maxContentHeight }"
+						@scroll="checkScrollState"
+					>
+						<slot> You just lost the game.</slot>
+					</div>
+
+					<Transition
+						enter-active-class="transition-all duration-200 ease-out"
+						enter-from-class="opacity-0 max-h-0"
+						enter-to-class="opacity-100 max-h-24"
+						leave-active-class="transition-all duration-200 ease-in"
+						leave-from-class="opacity-100 max-h-24"
+						leave-to-class="opacity-0 max-h-0"
+					>
+						<div
+							v-if="showBottomFade"
+							class="pointer-events-none absolute bottom-0 left-0 right-0 z-10 h-24 bg-gradient-to-t from-bg-raised to-transparent"
+						/>
+					</Transition>
+				</div>
+
+				<div v-else :class="['overflow-y-auto p-6', { 'pt-12': props.mergeHeader && closable }]">
 					<slot> You just lost the game.</slot>
 				</div>
+
+				<div v-if="$slots.actions" class="p-6 pt-0">
+					<slot name="actions" />
+				</div>
 			</div>
 		</div>
 	</div>
@@ -51,6 +108,7 @@
 import { XIcon } from '@modrinth/assets'
 import { ref } from 'vue'
 
+import { useScrollIndicator } from '../../composables/scroll-indicator'
 import ButtonStyled from '../base/ButtonStyled.vue'
 
 const props = withDefaults(
@@ -65,6 +123,9 @@ const props = withDefaults(
 		hideHeader?: boolean
 		onHide?: () => void
 		onShow?: () => void
+		mergeHeader?: boolean
+		scrollable?: boolean
+		maxContentHeight?: string
 	}>(),
 	{
 		type: true,
@@ -77,12 +138,19 @@ const props = withDefaults(
 		hideHeader: false,
 		onHide: () => {},
 		onShow: () => {},
+		mergeHeader: false,
+		// TODO: migrate all modals to use scrollable and remove this prop
+		scrollable: false,
+		maxContentHeight: '70vh',
 	},
 )
 
 const open = ref(false)
 const visible = ref(false)
 
+const scrollContainer = ref<HTMLElement | null>(null)
+const { showTopFade, showBottomFade, checkScrollState } = useScrollIndicator(scrollContainer)
+
 // make modal opening not shift page when there's a vertical scrollbar
 function addBodyPadding() {
 	const scrollBarWidth = window.innerWidth - document.documentElement.clientWidth
@@ -127,6 +195,7 @@ function hide() {
 defineExpose({
 	show,
 	hide,
+	checkScrollState,
 })
 
 const mouseX = ref(-1)
diff --git a/packages/ui/src/composables/debug-logger.ts b/packages/ui/src/composables/debug-logger.ts
new file mode 100644
index 00000000..d699bc85
--- /dev/null
+++ b/packages/ui/src/composables/debug-logger.ts
@@ -0,0 +1,28 @@
+function getCallerLocation(): string {
+	try {
+		const stack = new Error().stack
+		if (!stack) return ''
+
+		const lines = stack.split('\n')
+		const callerLine = lines[3]
+		if (!callerLine) return ''
+
+		const match = callerLine.match(/(https?:\/\/.+?|file:\/\/.+?|\/.*?):(\d+):\d+/)
+		if (!match) return ''
+
+		const [, fullPath, line] = match
+		const fileName = fullPath.split('/').pop()?.split('?')[0] || fullPath
+		return `${fileName}:${line}`
+	} catch {
+		return ''
+	}
+}
+
+export function useDebugLogger(namespace: string) {
+	// eslint-disable-next-line
+	return (...args: any[]) => {
+		const location = getCallerLocation()
+		const prefix = location ? `[${namespace}] [${location}]` : `[${namespace}]`
+		console.debug(prefix, ...args)
+	}
+}
diff --git a/packages/ui/src/composables/index.ts b/packages/ui/src/composables/index.ts
index 151bee8b..8fbc99e1 100644
--- a/packages/ui/src/composables/index.ts
+++ b/packages/ui/src/composables/index.ts
@@ -1,2 +1,4 @@
+export * from './debug-logger'
 export * from './dynamic-font-size'
 export * from './how-ago'
+export * from './scroll-indicator'
diff --git a/packages/ui/src/composables/scroll-indicator.ts b/packages/ui/src/composables/scroll-indicator.ts
new file mode 100644
index 00000000..db3333ec
--- /dev/null
+++ b/packages/ui/src/composables/scroll-indicator.ts
@@ -0,0 +1,181 @@
+import { nextTick, onUnmounted, type Ref, ref, watchEffect } from 'vue'
+
+import { useDebugLogger } from './debug-logger'
+
+export interface ScrollIndicatorOptions {
+	watchContent?: boolean
+	debounceMs?: number
+	tolerance?: number
+	debug?: boolean
+}
+
+export interface ScrollIndicator {
+	showTopFade: Ref<boolean>
+	showBottomFade: Ref<boolean>
+	checkScrollState: () => void
+	forceCheck: () => void
+}
+
+export function useScrollIndicator(
+	containerRef: Ref<HTMLElement | null>,
+	options: ScrollIndicatorOptions = {},
+): ScrollIndicator {
+	const { watchContent = true, debounceMs = 10, tolerance = 1, debug = false } = options
+
+	const showTopFade = ref(false)
+	const showBottomFade = ref(false)
+
+	let resizeObserver: ResizeObserver | null = null
+	let mutationObserver: MutationObserver | null = null
+	let rafId: number | null = null
+	let debounceTimer: number | null = null
+
+	const log = useDebugLogger('ScrollIndicator')
+
+	const checkScrollStateInternal = () => {
+		const container = containerRef.value
+		if (!container) {
+			showTopFade.value = false
+			showBottomFade.value = false
+			if (debug) log('Container not found, hiding fades')
+			return
+		}
+
+		if (rafId) {
+			cancelAnimationFrame(rafId)
+		}
+
+		rafId = requestAnimationFrame(() => {
+			const { scrollTop, scrollHeight, clientHeight } = container
+			const isScrollable = scrollHeight > clientHeight + tolerance
+
+			if (debug) {
+				log('Checking scroll state', {
+					scrollTop,
+					scrollHeight,
+					clientHeight,
+					isScrollable,
+				})
+			}
+
+			if (!isScrollable) {
+				showTopFade.value = false
+				showBottomFade.value = false
+				if (debug) log('Content fits, no fades needed')
+			} else {
+				showTopFade.value = scrollTop > tolerance
+				showBottomFade.value = scrollTop < scrollHeight - clientHeight - tolerance
+
+				if (debug) {
+					log('Fades updated', {
+						showTop: showTopFade.value,
+						showBottom: showBottomFade.value,
+					})
+				}
+			}
+		})
+	}
+
+	const checkScrollState = () => {
+		if (debounceTimer) {
+			clearTimeout(debounceTimer)
+		}
+
+		debounceTimer = window.setTimeout(() => {
+			checkScrollStateInternal()
+		}, debounceMs)
+	}
+
+	const forceCheck = () => {
+		if (debounceTimer) {
+			clearTimeout(debounceTimer)
+			debounceTimer = null
+		}
+		checkScrollStateInternal()
+	}
+
+	watchEffect((onCleanup) => {
+		const container = containerRef.value
+		if (!container) {
+			if (debug) log('No container, skipping setup')
+			return
+		}
+
+		if (debug) log('Setting up observers for container', container)
+
+		nextTick(() => {
+			forceCheck()
+		})
+
+		resizeObserver = new ResizeObserver(() => {
+			if (debug) log('ResizeObserver triggered')
+			checkScrollState()
+		})
+		resizeObserver.observe(container)
+
+		if (watchContent) {
+			mutationObserver = new MutationObserver(() => {
+				if (debug) log('MutationObserver triggered')
+				checkScrollState()
+			})
+
+			mutationObserver.observe(container, {
+				childList: true,
+				subtree: true,
+				characterData: true,
+				attributes: false,
+			})
+		}
+
+		const handleScroll = () => {
+			if (debug) log('Scroll event triggered')
+			checkScrollState()
+		}
+		container.addEventListener('scroll', handleScroll, { passive: true })
+
+		const handleResize = () => {
+			if (debug) log('Window resize triggered')
+			checkScrollState()
+		}
+		window.addEventListener('resize', handleResize, { passive: true })
+
+		onCleanup(() => {
+			if (debug) log('Cleaning up observers and listeners')
+
+			if (debounceTimer) {
+				clearTimeout(debounceTimer)
+				debounceTimer = null
+			}
+
+			if (rafId) {
+				cancelAnimationFrame(rafId)
+				rafId = null
+			}
+
+			resizeObserver?.disconnect()
+			resizeObserver = null
+
+			mutationObserver?.disconnect()
+			mutationObserver = null
+
+			container.removeEventListener('scroll', handleScroll)
+			window.removeEventListener('resize', handleResize)
+		})
+	})
+
+	onUnmounted(() => {
+		if (debounceTimer) {
+			clearTimeout(debounceTimer)
+		}
+		if (rafId) {
+			cancelAnimationFrame(rafId)
+		}
+	})
+
+	return {
+		showTopFade,
+		showBottomFade,
+		checkScrollState,
+		forceCheck,
+	}
+}
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 9aebf811..5481e5f4 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -86,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "Follow"
   },
+  "button.max": {
+    "defaultMessage": "Max"
+  },
   "button.more-options": {
     "defaultMessage": "More options"
   },
@@ -158,6 +161,84 @@
   "collection.label.private": {
     "defaultMessage": "Private"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Address line"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "Address line 2 (optional)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Amount"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Bank name"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Business name"
+  },
+  "form.label.city": {
+    "defaultMessage": "City"
+  },
+  "form.label.country": {
+    "defaultMessage": "Country"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Date of birth"
+  },
+  "form.label.email": {
+    "defaultMessage": "Email"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "First name"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Last name"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Postal code/ZIP code"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "State/province"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Enter address"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "Apartment, suite, etc."
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "Enter amount"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "Enter bank name"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "Select bank name"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "Enter business name"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Enter city"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Select country"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "Enter email address"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Enter first name"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Enter last name"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Enter postal code"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Enter state/province"
+  },
   "icon-select.edit": {
     "defaultMessage": "Edit icon"
   },
@@ -197,6 +278,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "Unknown game mode"
   },
+  "label.available": {
+    "defaultMessage": "{amount} available."
+  },
   "label.changes-saved": {
     "defaultMessage": "Changes saved"
   },
@@ -245,6 +329,9 @@
   "label.rejected": {
     "defaultMessage": "Rejected"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "I agree to the <terms-link>Rewards Program Terms</terms-link>"
+  },
   "label.saved": {
     "defaultMessage": "Saved"
   },
@@ -392,6 +479,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal International"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -401,6 +491,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "Charity"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "Charities"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "Gift card"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Gift cards"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Virtual Visa"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Virtual Visas"
+  },
   "project-type.all": {
     "defaultMessage": "All"
   },
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index 4546b36d..30d04163 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -281,6 +281,131 @@ export const commonMessages = defineMessages({
 		id: 'label.visit-your-profile',
 		defaultMessage: 'Visit your profile',
 	},
+	maxButton: {
+		id: 'button.max',
+		defaultMessage: 'Max',
+	},
+})
+
+export const formFieldLabels = defineMessages({
+	email: {
+		id: 'form.label.email',
+		defaultMessage: 'Email',
+	},
+	firstName: {
+		id: 'form.label.first-name',
+		defaultMessage: 'First name',
+	},
+	lastName: {
+		id: 'form.label.last-name',
+		defaultMessage: 'Last name',
+	},
+	dateOfBirth: {
+		id: 'form.label.date-of-birth',
+		defaultMessage: 'Date of birth',
+	},
+	businessName: {
+		id: 'form.label.business-name',
+		defaultMessage: 'Business name',
+	},
+	addressLine: {
+		id: 'form.label.address-line',
+		defaultMessage: 'Address line',
+	},
+	addressLine2: {
+		id: 'form.label.address-line-2',
+		defaultMessage: 'Address line 2 (optional)',
+	},
+	city: {
+		id: 'form.label.city',
+		defaultMessage: 'City',
+	},
+	stateProvince: {
+		id: 'form.label.state-province',
+		defaultMessage: 'State/province',
+	},
+	postalCode: {
+		id: 'form.label.postal-code',
+		defaultMessage: 'Postal code/ZIP code',
+	},
+	country: {
+		id: 'form.label.country',
+		defaultMessage: 'Country',
+	},
+	bankName: {
+		id: 'form.label.bank-name',
+		defaultMessage: 'Bank name',
+	},
+	amount: {
+		id: 'form.label.amount',
+		defaultMessage: 'Amount',
+	},
+})
+
+export const formFieldPlaceholders = defineMessages({
+	emailPlaceholder: {
+		id: 'form.placeholder.email',
+		defaultMessage: 'Enter email address',
+	},
+	firstNamePlaceholder: {
+		id: 'form.placeholder.first-name',
+		defaultMessage: 'Enter first name',
+	},
+	lastNamePlaceholder: {
+		id: 'form.placeholder.last-name',
+		defaultMessage: 'Enter last name',
+	},
+	businessNamePlaceholder: {
+		id: 'form.placeholder.business-name',
+		defaultMessage: 'Enter business name',
+	},
+	addressPlaceholder: {
+		id: 'form.placeholder.address',
+		defaultMessage: 'Enter address',
+	},
+	address2Placeholder: {
+		id: 'form.placeholder.address-2',
+		defaultMessage: 'Apartment, suite, etc.',
+	},
+	cityPlaceholder: {
+		id: 'form.placeholder.city',
+		defaultMessage: 'Enter city',
+	},
+	statePlaceholder: {
+		id: 'form.placeholder.state',
+		defaultMessage: 'Enter state/province',
+	},
+	postalCodePlaceholder: {
+		id: 'form.placeholder.postal-code',
+		defaultMessage: 'Enter postal code',
+	},
+	countryPlaceholder: {
+		id: 'form.placeholder.country',
+		defaultMessage: 'Select country',
+	},
+	bankNamePlaceholder: {
+		id: 'form.placeholder.bank-name',
+		defaultMessage: 'Enter bank name',
+	},
+	bankNamePlaceholderDropdown: {
+		id: 'form.placeholder.bank-name-dropdown',
+		defaultMessage: 'Select bank name',
+	},
+	amountPlaceholder: {
+		id: 'form.placeholder.amount',
+		defaultMessage: 'Enter amount',
+	},
+})
+
+export const financialMessages = defineMessages({
+	available: {
+		id: 'label.available',
+		defaultMessage: '{amount} available.',
+	},
+	rewardsProgramTermsAgreement: {
+		id: 'label.rewards-program-terms-agreement',
+		defaultMessage: 'I agree to the <terms-link>Rewards Program Terms</terms-link>',
+	},
 })
 
 export const commonProjectTypeCategoryMessages = defineMessages({
@@ -499,6 +624,14 @@ export const paymentMethodMessages = defineMessages({
 		id: 'omorphia.component.purchase_modal.payment_method_type.paypal',
 		defaultMessage: 'PayPal',
 	},
+	paypalInternational: {
+		id: 'omorphia.component.purchase_modal.payment_method_type.paypal_international',
+		defaultMessage: 'PayPal International',
+	},
+	paypalUS: {
+		id: 'omorphia.component.purchase_modal.payment_method_type.paypal',
+		defaultMessage: 'PayPal',
+	},
 	unionpay: {
 		id: 'omorphia.component.purchase_modal.payment_method_type.unionpay',
 		defaultMessage: 'UnionPay',
@@ -511,4 +644,32 @@ export const paymentMethodMessages = defineMessages({
 		id: 'omorphia.component.purchase_modal.payment_method_type.visa',
 		defaultMessage: 'Visa',
 	},
+	venmo: {
+		id: 'payment-method.venmo',
+		defaultMessage: 'Venmo',
+	},
+	virtualVisa: {
+		id: 'payment-method.virtual-visa',
+		defaultMessage: 'Virtual Visa',
+	},
+	virtualVisaPlural: {
+		id: 'payment-method.virtual-visa-plural',
+		defaultMessage: 'Virtual Visas',
+	},
+	giftCard: {
+		id: 'payment-method.gift-card',
+		defaultMessage: 'Gift card',
+	},
+	giftCardPlural: {
+		id: 'payment-method.gift-card-plural',
+		defaultMessage: 'Gift cards',
+	},
+	charity: {
+		id: 'payment-method.charity',
+		defaultMessage: 'Charity',
+	},
+	charityPlural: {
+		id: 'payment-method.charity-plural',
+		defaultMessage: 'Charities',
+	},
 })
diff --git a/packages/utils/types.ts b/packages/utils/types.ts
index cac71dbd..b3ba0edb 100644
--- a/packages/utils/types.ts
+++ b/packages/utils/types.ts
@@ -599,6 +599,81 @@ export interface DelphiReport {
 	content?: string
 }
 
+export type PayoutId = string
+export type UserId = string
+export type PayoutStatus =
+	| 'success'
+	| 'in-transit'
+	| 'cancelled'
+	| 'cancelling'
+	| 'failed'
+	| 'unknown'
+export type PayoutMethodType = 'venmo' | 'paypal' | 'tremendous' | 'muralpay' | 'unknown'
+
+export interface Payout {
+	id: PayoutId
+	user_id: UserId
+	status: PayoutStatus
+	created: string // ISO 8601
+	amount: number
+	fee: number | null
+	method: PayoutMethodType | null
+	method_address: string | null
+	platform_id: string | null
+}
+
+export type PayoutList = Payout[]
+
+// Revenue event types for transaction history
+export interface IncomeEvent {
+	type: 'payout_available'
+	created: string // ISO 8601
+	payout_source: string
+	amount: number
+}
+
+export interface WithdrawalEvent {
+	type: 'withdrawal'
+	id: string
+	status: PayoutStatus
+	created: string // ISO 8601
+	amount: number
+	fee: number | null
+	method_type: PayoutMethodType | null
+	method_address: string | null
+}
+
+export type RevenueEvent = IncomeEvent | WithdrawalEvent
+
+export type RevenueEventList = RevenueEvent[]
+
+export interface PayoutMethodFee {
+	percentage: number
+	min: number
+	max: number | null
+}
+
+export type PayoutInterval =
+	| {
+			type: 'standard'
+			min: number
+			max: number
+	  }
+	| {
+			type: 'fixed'
+			values: number[]
+	  }
+
+export interface PayoutMethod {
+	id: string
+	type: PayoutMethodType
+	name: string
+	supported_countries: string[]
+	image_url: string | null
+	interval: PayoutInterval
+	fee: PayoutMethodFee
+}
+
 export type AffiliateLink = {
 	id: string
 	created_at: string
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f31b3f7a..78f09b46 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -275,9 +275,6 @@ importers:
       highlight.js:
         specifier: ^11.7.0
         version: 11.9.0
-      iso-3166-1:
-        specifier: ^2.1.1
-        version: 2.1.1
       js-yaml:
         specifier: ^4.1.0
         version: 4.1.0
@@ -287,6 +284,9 @@ importers:
       markdown-it:
         specifier: 14.1.0
         version: 14.1.0
+      papaparse:
+        specifier: ^5.4.1
+        version: 5.5.3
       pathe:
         specifier: ^1.1.2
         version: 1.1.2
@@ -339,6 +339,9 @@ importers:
       '@types/node':
         specifier: ^20.1.0
         version: 20.14.11
+      '@types/papaparse':
+        specifier: ^5.3.15
+        version: 5.3.16
       '@vintl/compact-number':
         specifier: ^2.0.5
         version: 2.0.7(@formatjs/intl@2.10.4(typescript@5.5.4))
@@ -2784,6 +2787,9 @@ packages:
   '@types/offscreencanvas@2019.7.3':
     resolution: {integrity: sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==}
 
+  '@types/papaparse@5.3.16':
+    resolution: {integrity: sha512-T3VuKMC2H0lgsjI9buTB3uuKj3EMD2eap1MOuEQuBQ44EnDx/IkGhU6EwiTf9zG3za4SKlmwKAImdDKdNnCsXg==}
+
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
@@ -5295,9 +5301,6 @@ packages:
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
-  iso-3166-1@2.1.1:
-    resolution: {integrity: sha512-RZxXf8cw5Y8LyHZIwIRvKw8sWTIHh2/txBT+ehO0QroesVfnz3JNFFX4i/OC/Yuv2bDIVYrHna5PMvjtpefq5w==}
-
   jackspeak@3.4.0:
     resolution: {integrity: sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==}
     engines: {node: '>=14'}
@@ -6158,6 +6161,9 @@ packages:
   pako@1.0.11:
     resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
 
+  papaparse@5.5.3:
+    resolution: {integrity: sha512-5QvjGxYVjxO59MGU2lHVYpRWBBtKHnlIAcSe1uNFCkkptUh63NFRj0FJQm7nR67puEruUci/ZkjmEFrjCAyP4A==}
+
   param-case@3.0.4:
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
 
@@ -10710,6 +10716,10 @@ snapshots:
 
   '@types/offscreencanvas@2019.7.3': {}
 
+  '@types/papaparse@5.3.16':
+    dependencies:
+      '@types/node': 20.14.11
+
   '@types/resolve@1.20.2': {}
 
   '@types/rss@0.0.32': {}
@@ -13950,8 +13960,6 @@ snapshots:
 
   isexe@2.0.0: {}
 
-  iso-3166-1@2.1.1: {}
-
   jackspeak@3.4.0:
     dependencies:
       '@isaacs/cliui': 8.0.2
@@ -15265,6 +15273,8 @@ snapshots:
 
   pako@1.0.11: {}
 
+  papaparse@5.5.3: {}
+
   param-case@3.0.4:
     dependencies:
       dot-case: 3.0.4

From 644554f1e95bfd1c7a5dd571a98fd0f6bc559bfd Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 3 Nov 2025 15:15:53 -0800
Subject: [PATCH 10/64] changelog

---
 packages/utils/changelog.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 1b01dbe1..2ed4903d 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,12 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-11-03T15:30:00-07:00`,
+		product: 'web',
+		body: `## Improvements
+- Revamped creator revenue page and withdrawal experience.`,
+	},
 	{
 		date: `2025-10-30T16:30:00-07:00`,
 		product: 'app',

From 5a41a35716bf210c4d16759f6bce597d158015b9 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 3 Nov 2025 15:45:49 -0800
Subject: [PATCH 11/64] fix affiliate link mistake

---
 apps/frontend/src/pages/dashboard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/frontend/src/pages/dashboard.vue b/apps/frontend/src/pages/dashboard.vue
index 5b398bf9..826fdabf 100644
--- a/apps/frontend/src/pages/dashboard.vue
+++ b/apps/frontend/src/pages/dashboard.vue
@@ -17,7 +17,7 @@
 					{ link: '/dashboard/organizations', label: 'Organizations', icon: OrganizationIcon },
 					{ link: '/dashboard/analytics', label: 'Analytics', icon: ChartIcon },
 					{
-						link: '/dashboard/affiliates',
+						link: '/dashboard/affiliate-links',
 						label: formatMessage(commonMessages.affiliateLinksButton),
 						icon: AffiliateIcon,
 						shown: isAffiliate,

From 2d218d79c6056c2fcdfad2d27554d5bfa6a6596b Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Mon, 3 Nov 2025 16:12:30 -0800
Subject: [PATCH 12/64] Mural fixes (#4709)

---
 apps/labrinth/src/routes/v3/payouts.rs | 48 +++++++++++++++++---------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/apps/labrinth/src/routes/v3/payouts.rs b/apps/labrinth/src/routes/v3/payouts.rs
index 36a6b7fe..75b4d0c9 100644
--- a/apps/labrinth/src/routes/v3/payouts.rs
+++ b/apps/labrinth/src/routes/v3/payouts.rs
@@ -591,7 +591,8 @@ pub async fn create_payout(
     // we first make sure that `amount - total fees` is greater than zero,
     // then we issue a payout request with `amount - platform fees`
 
-    if (body.amount - fees.total_fee()).round_dp(2) <= Decimal::ZERO {
+    let amount_minus_fee = body.amount - fees.total_fee();
+    if amount_minus_fee.round_dp(2) <= Decimal::ZERO {
         return Err(ApiError::InvalidInput(
             "You need to withdraw more to cover the fee!".to_string(),
         ));
@@ -608,7 +609,7 @@ pub async fn create_payout(
         body: &body,
         user: &user,
         payout_id,
-        raw_amount: body.amount,
+        amount_minus_fee,
         total_fee: fees.total_fee(),
         sent_to_method,
         payouts_queue: &payouts_queue,
@@ -647,7 +648,9 @@ struct PayoutContext<'a> {
     body: &'a Withdrawal,
     user: &'a DBUser,
     payout_id: DBPayoutId,
-    raw_amount: Decimal,
+    /// Set as the [`DBPayout::amount`] field.
+    amount_minus_fee: Decimal,
+    /// Set as the [`DBPayout::fee`] field.
     total_fee: Decimal,
     sent_to_method: Decimal,
     payouts_queue: &'a PayoutsQueue,
@@ -671,7 +674,7 @@ async fn tremendous_payout(
         body,
         user,
         payout_id,
-        raw_amount,
+        amount_minus_fee,
         total_fee,
         sent_to_method,
         payouts_queue,
@@ -688,7 +691,7 @@ async fn tremendous_payout(
         user_id: user.id,
         created: Utc::now(),
         status: PayoutStatus::InTransit,
-        amount: raw_amount,
+        amount: amount_minus_fee,
         fee: Some(total_fee),
         method: Some(PayoutMethodType::Tremendous),
         method_address: Some(user_email.to_string()),
@@ -775,7 +778,7 @@ async fn mural_pay_payout(
         body: _body,
         user,
         payout_id,
-        raw_amount,
+        amount_minus_fee,
         total_fee,
         sent_to_method,
         payouts_queue,
@@ -801,7 +804,7 @@ async fn mural_pay_payout(
         user_id: user.id,
         created: Utc::now(),
         status: PayoutStatus::Success,
-        amount: raw_amount,
+        amount: amount_minus_fee,
         fee: Some(total_fee),
         method: Some(PayoutMethodType::MuralPay),
         method_address: Some(user_email.to_string()),
@@ -814,7 +817,7 @@ async fn paypal_payout(
         body,
         user,
         payout_id,
-        raw_amount,
+        amount_minus_fee,
         total_fee,
         sent_to_method,
         payouts_queue,
@@ -876,7 +879,7 @@ async fn paypal_payout(
         user_id: user.id,
         created: Utc::now(),
         status: PayoutStatus::InTransit,
-        amount: raw_amount,
+        amount: amount_minus_fee,
         fee: Some(total_fee),
         method: Some(body.method.method_type()),
         method_address: Some(display_address.clone()),
@@ -1032,25 +1035,36 @@ pub async fn transaction_history(
             });
 
     let mut payouts_available = sqlx::query!(
-        "SELECT date_available, amount
+        "
+        SELECT date_available, SUM(amount) AS amount
         FROM payouts_values
         WHERE user_id = $1
-        AND NOW() >= date_available",
+        AND NOW() >= date_available
+        GROUP BY date_available
+        ",
         DBUserId::from(user.id) as DBUserId
     )
     .fetch(&**pool)
     .map(|record| {
         let record = record
             .wrap_internal_err("failed to fetch available payout record")?;
-        Ok(TransactionItem::PayoutAvailable {
-            created: record.date_available,
-            payout_source: PayoutSource::CreatorRewards,
-            amount: record.amount,
-        })
+        let amount = record.amount.unwrap_or_default();
+        if amount > Decimal::ZERO {
+            Ok(Some(TransactionItem::PayoutAvailable {
+                created: record.date_available,
+                payout_source: PayoutSource::CreatorRewards,
+                amount,
+            }))
+        } else {
+            Ok(None)
+        }
     })
     .collect::<Result<Vec<_>, ApiError>>()
     .await
-    .wrap_internal_err("failed to fetch available payouts")?;
+    .wrap_internal_err("failed to fetch available payouts")?
+    .into_iter()
+    .flatten()
+    .collect::<Vec<_>>();
 
     let mut txn_items = Vec::new();
     txn_items.extend(withdrawals);

From c38751a38a84a0d523a632c4b53cd2838735556a Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Mon, 3 Nov 2025 16:34:39 -0800
Subject: [PATCH 13/64] cargo sqlx prepare (#4710)

---
 ...efb81169989290bfadc8a9707c623f20cd15264ef81b90141f.json} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename apps/labrinth/.sqlx/{query-0a01edcb023f6fd1bdfb3a6b77ad4fd183fd439ddcbbac76471a9771d4f29b61.json => query-2a1ff72f76182befb81169989290bfadc8a9707c623f20cd15264ef81b90141f.json} (56%)

diff --git a/apps/labrinth/.sqlx/query-0a01edcb023f6fd1bdfb3a6b77ad4fd183fd439ddcbbac76471a9771d4f29b61.json b/apps/labrinth/.sqlx/query-2a1ff72f76182befb81169989290bfadc8a9707c623f20cd15264ef81b90141f.json
similarity index 56%
rename from apps/labrinth/.sqlx/query-0a01edcb023f6fd1bdfb3a6b77ad4fd183fd439ddcbbac76471a9771d4f29b61.json
rename to apps/labrinth/.sqlx/query-2a1ff72f76182befb81169989290bfadc8a9707c623f20cd15264ef81b90141f.json
index 33706d7a..c7ad2485 100644
--- a/apps/labrinth/.sqlx/query-0a01edcb023f6fd1bdfb3a6b77ad4fd183fd439ddcbbac76471a9771d4f29b61.json
+++ b/apps/labrinth/.sqlx/query-2a1ff72f76182befb81169989290bfadc8a9707c623f20cd15264ef81b90141f.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT date_available, amount\n        FROM payouts_values\n        WHERE user_id = $1\n        AND NOW() >= date_available",
+  "query": "\n        SELECT date_available, SUM(amount) AS amount\n        FROM payouts_values\n        WHERE user_id = $1\n        AND NOW() >= date_available\n        GROUP BY date_available\n        ",
   "describe": {
     "columns": [
       {
@@ -21,8 +21,8 @@
     },
     "nullable": [
       false,
-      false
+      null
     ]
   },
-  "hash": "0a01edcb023f6fd1bdfb3a6b77ad4fd183fd439ddcbbac76471a9771d4f29b61"
+  "hash": "2a1ff72f76182befb81169989290bfadc8a9707c623f20cd15264ef81b90141f"
 }

From 6e47de06bb49b0490eee0b14407e28607a8426f7 Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Tue, 4 Nov 2025 08:40:15 -0800
Subject: [PATCH 14/64] Address withdrawal QA changes (#4711)

* Add Mural to balance monitoring

* Add back Visa prepaid Tremendous cards

* cargo sqlx prepare
---
 apps/labrinth/src/queue/payouts/mod.rs   |  8 ++++++++
 apps/labrinth/src/queue/payouts/mural.rs | 11 +++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/labrinth/src/queue/payouts/mod.rs b/apps/labrinth/src/queue/payouts/mod.rs
index 02244cc9..2f8af3a5 100644
--- a/apps/labrinth/src/queue/payouts/mod.rs
+++ b/apps/labrinth/src/queue/payouts/mod.rs
@@ -838,6 +838,8 @@ async fn get_tremendous_payout_methods(
             "merchant_card",
             "bank",
             "charity",
+            "visa",
+            "visa_card",
             "paypal",
             "venmo",
         ];
@@ -1441,6 +1443,12 @@ pub async fn insert_bank_balances_and_webhook(
             tremendous_result,
         )
         .await?;
+        check_balance_with_webhook(
+            "mural",
+            "MURAL_BALANCE_ALERT_THRESHOLD",
+            mural_result,
+        )
+        .await?;
     }
 
     transaction.commit().await?;
diff --git a/apps/labrinth/src/queue/payouts/mural.rs b/apps/labrinth/src/queue/payouts/mural.rs
index ef4739ab..a91960bb 100644
--- a/apps/labrinth/src/queue/payouts/mural.rs
+++ b/apps/labrinth/src/queue/payouts/mural.rs
@@ -148,19 +148,22 @@ impl PayoutsQueue {
         Ok(())
     }
 
-    pub async fn get_mural_balance(&self) -> Result<Option<AccountBalance>> {
+    pub async fn get_mural_balance(
+        &self,
+    ) -> Result<Option<AccountBalance>, ApiError> {
         let muralpay = self.muralpay.load();
         let muralpay = muralpay
             .as_ref()
-            .wrap_err("Mural Pay client not available")?;
+            .wrap_internal_err("Mural Pay client not available")?;
 
         let account = muralpay
             .client
             .get_account(muralpay.source_account_id)
-            .await?;
+            .await
+            .wrap_internal_err("failed to get source account")?;
         let details = account
             .account_details
-            .wrap_err("source account does not have details")?;
+            .wrap_internal_err("source account does not have details")?;
         let available = details
             .balances
             .iter()

From f054f39c5df70fb140ff28321b5151ac0fbe8403 Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Tue, 4 Nov 2025 21:29:47 +0000
Subject: [PATCH 15/64] polish: withdraw flow fixes (#4713)

* fix: negative value stuff

* fix: mobile responsiveness for modal min-w

* feat: better error handling on withdraw

* fix: empty state positioning + svg sizing

* fix: title case -> sentence case

* fix: re-add virtual visa under gift cards

* fix: hide <1% segments
---
 .../ui/dashboard/CreatorWithdrawModal.vue     | 141 ++++++++++++++++--
 .../ui/dashboard/RevenueInputField.vue        |  27 ++--
 .../withdraw-stages/MuralpayDetailsStage.vue  |  12 +-
 .../TremendousDetailsStage.vue                |   6 +-
 apps/frontend/src/locales/en-US/index.json    |  78 +++++++---
 .../src/pages/dashboard/revenue/index.vue     |  57 ++++---
 .../src/providers/creator-withdraw.ts         |   9 +-
 apps/frontend/src/utils/muralpay-rails.ts     |  74 ++++-----
 packages/ui/src/components/modal/NewModal.vue |   2 +-
 9 files changed, 285 insertions(+), 121 deletions(-)

diff --git a/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue b/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue
index b9aeb740..a6aef089 100644
--- a/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue
+++ b/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue
@@ -38,7 +38,7 @@
 				</template>
 			</div>
 		</template>
-		<div class="w-full max-w-[496px] lg:min-w-[496px]">
+		<div class="mx-auto w-full max-w-[496px] sm:mx-0 sm:min-w-[496px]">
 			<TaxFormStage
 				v-if="currentStage === 'tax-form'"
 				:balance="balance"
@@ -326,6 +326,73 @@ function continueWithLimit() {
 	setStage(nextStep.value)
 }
 
+// TODO: God we need better errors from the backend (e.g error ids), this shit is insane
+function getWithdrawalError(error: any): { title: string; text: string } {
+	const description = error?.data?.description?.toLowerCase() || ''
+
+	// Tax form error
+	if (description.includes('tax form')) {
+		return {
+			title: formatMessage(messages.errorTaxFormTitle),
+			text: formatMessage(messages.errorTaxFormText),
+		}
+	}
+
+	// Invalid crypto wallet address
+	if (
+		(description.includes('wallet') && description.includes('invalid')) ||
+		description.includes('wallet_address') ||
+		(description.includes('blockchain') && description.includes('invalid'))
+	) {
+		return {
+			title: formatMessage(messages.errorInvalidWalletTitle),
+			text: formatMessage(messages.errorInvalidWalletText),
+		}
+	}
+
+	// Invalid bank details
+	if (
+		(description.includes('bank') || description.includes('account')) &&
+		(description.includes('invalid') || description.includes('failed'))
+	) {
+		return {
+			title: formatMessage(messages.errorInvalidBankTitle),
+			text: formatMessage(messages.errorInvalidBankText),
+		}
+	}
+
+	// Invalid/fraudulent address
+	if (
+		description.includes('address') &&
+		(description.includes('invalid') ||
+			description.includes('verification') ||
+			description.includes('fraudulent'))
+	) {
+		return {
+			title: formatMessage(messages.errorInvalidAddressTitle),
+			text: formatMessage(messages.errorInvalidAddressText),
+		}
+	}
+
+	// Minimum amount not met
+	if (
+		description.includes('payoutminimumnotmeterror') ||
+		description.includes('minimum') ||
+		(description.includes('amount') && description.includes('less'))
+	) {
+		return {
+			title: formatMessage(messages.errorMinimumNotMetTitle),
+			text: formatMessage(messages.errorMinimumNotMetText),
+		}
+	}
+
+	// Generic fallback
+	return {
+		title: formatMessage(messages.errorGenericTitle),
+		text: formatMessage(messages.errorGenericText),
+	}
+}
+
 async function handleWithdraw() {
 	if (isSubmitting.value) return
 
@@ -336,19 +403,12 @@ async function handleWithdraw() {
 	} catch (error) {
 		console.error('Withdrawal failed:', error)
 
-		if ((error as any)?.data?.description?.toLower?.()?.includes('Tax form')) {
-			addNotification({
-				title: 'Please complete tax form',
-				text: 'You must complete a tax form to submit your withdrawal request.',
-				type: 'error',
-			})
-		} else {
-			addNotification({
-				title: 'Unable to withdraw',
-				text: 'We were unable to submit your withdrawal request, please check your details or contact support.',
-				type: 'error',
-			})
-		}
+		const { title, text } = getWithdrawalError(error)
+		addNotification({
+			title,
+			text,
+			type: 'error',
+		})
 	} finally {
 		isSubmitting.value = false
 	}
@@ -453,5 +513,58 @@ const messages = defineMessages({
 		id: 'dashboard.withdraw.completion.transactions-button',
 		defaultMessage: 'Transactions',
 	},
+	errorTaxFormTitle: {
+		id: 'dashboard.withdraw.error.tax-form.title',
+		defaultMessage: 'Please complete tax form',
+	},
+	errorTaxFormText: {
+		id: 'dashboard.withdraw.error.tax-form.text',
+		defaultMessage: 'You must complete a tax form to submit your withdrawal request.',
+	},
+	errorInvalidWalletTitle: {
+		id: 'dashboard.withdraw.error.invalid-wallet.title',
+		defaultMessage: 'Invalid wallet address',
+	},
+	errorInvalidWalletText: {
+		id: 'dashboard.withdraw.error.invalid-wallet.text',
+		defaultMessage:
+			'The crypto wallet address you provided is invalid. Please double-check and try again.',
+	},
+	errorInvalidBankTitle: {
+		id: 'dashboard.withdraw.error.invalid-bank.title',
+		defaultMessage: 'Invalid bank details',
+	},
+	errorInvalidBankText: {
+		id: 'dashboard.withdraw.error.invalid-bank.text',
+		defaultMessage:
+			'The bank account details you provided are invalid. Please verify your information.',
+	},
+	errorInvalidAddressTitle: {
+		id: 'dashboard.withdraw.error.invalid-address.title',
+		defaultMessage: 'Address verification failed',
+	},
+	errorInvalidAddressText: {
+		id: 'dashboard.withdraw.error.invalid-address.text',
+		defaultMessage:
+			'The address you provided could not be verified. Please check your address details.',
+	},
+	errorMinimumNotMetTitle: {
+		id: 'dashboard.withdraw.error.minimum-not-met.title',
+		defaultMessage: 'Amount too low',
+	},
+	errorMinimumNotMetText: {
+		id: 'dashboard.withdraw.error.minimum-not-met.text',
+		defaultMessage:
+			"The withdrawal amount (after fees) doesn't meet the minimum requirement. Please increase your withdrawal amount.",
+	},
+	errorGenericTitle: {
+		id: 'dashboard.withdraw.error.generic.title',
+		defaultMessage: 'Unable to withdraw',
+	},
+	errorGenericText: {
+		id: 'dashboard.withdraw.error.generic.text',
+		defaultMessage:
+			'We were unable to submit your withdrawal request, please check your details or contact support.',
+	},
 })
 </script>
diff --git a/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue b/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue
index 6521bac4..ac961dc0 100644
--- a/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue
+++ b/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue
@@ -8,7 +8,8 @@
 					type="number"
 					step="0.01"
 					:min="minAmount"
-					:max="maxAmount"
+					:max="safeMaxAmount"
+					:disabled="isDisabled"
 					:placeholder="formatMessage(formFieldPlaceholders.amountPlaceholder)"
 					class="w-full rounded-[14px] bg-surface-4 py-2.5 pl-4 pr-4 text-contrast placeholder:text-secondary"
 					@input="handleInput"
@@ -26,13 +27,13 @@
 				</template>
 			</Combobox>
 			<ButtonStyled>
-				<button class="px-4 py-2" @click="setMaxAmount">
+				<button class="px-4 py-2" :disabled="isDisabled" @click="setMaxAmount">
 					{{ formatMessage(commonMessages.maxButton) }}
 				</button>
 			</ButtonStyled>
 		</div>
 		<div>
-			<span class="my-1 mt-0 text-secondary">{{ formatMoney(maxAmount) }} available.</span>
+			<span class="my-1 mt-0 text-secondary">{{ formatMoney(safeMaxAmount) }} available.</span>
 			<Transition name="fade">
 				<span v-if="isBelowMinimum" class="text-red">
 					Amount must be at least {{ formatMoney(minAmount) }}.
@@ -40,7 +41,7 @@
 			</Transition>
 			<Transition name="fade">
 				<span v-if="isAboveMaximum" class="text-red">
-					Amount cannot exceed {{ formatMoney(maxAmount) }}.
+					Amount cannot exceed {{ formatMoney(safeMaxAmount) }}.
 				</span>
 			</Transition>
 		</div>
@@ -77,6 +78,14 @@ const emit = defineEmits<{
 const { formatMessage } = useVIntl()
 const amountInput = ref<HTMLInputElement | null>(null)
 
+const safeMaxAmount = computed(() => {
+	return Math.max(0, props.maxAmount)
+})
+
+const isDisabled = computed(() => {
+	return safeMaxAmount.value < 0.01
+})
+
 const isBelowMinimum = computed(() => {
 	return (
 		props.modelValue !== undefined && props.modelValue > 0 && props.modelValue < props.minAmount
@@ -84,11 +93,11 @@ const isBelowMinimum = computed(() => {
 })
 
 const isAboveMaximum = computed(() => {
-	return props.modelValue !== undefined && props.modelValue > props.maxAmount
+	return props.modelValue !== undefined && props.modelValue > safeMaxAmount.value
 })
 
 async function setMaxAmount() {
-	const maxValue = props.maxAmount
+	const maxValue = safeMaxAmount.value
 	emit('update:modelValue', maxValue)
 
 	await nextTick()
@@ -119,11 +128,11 @@ watch(
 	() => props.modelValue,
 	async (newAmount) => {
 		if (newAmount !== undefined && newAmount !== null) {
-			if (newAmount > props.maxAmount) {
-				emit('update:modelValue', props.maxAmount)
+			if (newAmount > safeMaxAmount.value) {
+				emit('update:modelValue', safeMaxAmount.value)
 				await nextTick()
 				if (amountInput.value) {
-					amountInput.value.value = props.maxAmount.toFixed(2)
+					amountInput.value.value = safeMaxAmount.value.toFixed(2)
 				}
 			} else if (newAmount < 0) {
 				emit('update:modelValue', 0)
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue
index 9a32f8ef..dd05ac80 100644
--- a/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue
@@ -325,7 +325,7 @@ const dynamicDocumentNumberField = computed(() => {
 	return {
 		name: 'documentNumber',
 		type: 'text' as const,
-		label: labelMap[documentType] || 'Document Number',
+		label: labelMap[documentType] || 'Document number',
 		placeholder: placeholderMap[documentType] || 'Enter document number',
 		required: true,
 	}
@@ -474,23 +474,23 @@ const messages = defineMessages({
 	},
 	documentNumberNationalId: {
 		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id',
-		defaultMessage: 'National ID Number',
+		defaultMessage: 'National ID number',
 	},
 	documentNumberPassport: {
 		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-passport',
-		defaultMessage: 'Passport Number',
+		defaultMessage: 'Passport number',
 	},
 	documentNumberResidentId: {
 		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id',
-		defaultMessage: 'Resident ID Number',
+		defaultMessage: 'Resident ID number',
 	},
 	documentNumberRuc: {
 		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc',
-		defaultMessage: 'RUC Number',
+		defaultMessage: 'RUC number',
 	},
 	documentNumberTaxId: {
 		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id',
-		defaultMessage: 'Tax ID Number',
+		defaultMessage: 'Tax ID number',
 	},
 	documentNumberNationalIdPlaceholder: {
 		id: 'dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder',
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/TremendousDetailsStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/TremendousDetailsStage.vue
index f09adc8f..7d895e1d 100644
--- a/apps/frontend/src/components/ui/dashboard/withdraw-stages/TremendousDetailsStage.vue
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/TremendousDetailsStage.vue
@@ -529,7 +529,11 @@ onMounted(async () => {
 
 	rewardOptions.value = methods
 		.filter((m) => m.type === 'tremendous')
-		.filter((m) => m.category === selectedMethod)
+		.filter(
+			(m) =>
+				m.category === selectedMethod ||
+				(selectedMethod === 'merchant_card' && m.category === 'visa_card'),
+		)
 		.map((m) => ({
 			value: m.id,
 			label: m.name,
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index c3207c08..d478056d 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -702,31 +702,31 @@
     "message": "Confirm your wallet address"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
-    "message": "National ID Number"
+    "message": "National ID number"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
     "message": "Enter national ID number"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
-    "message": "Passport Number"
+    "message": "Passport number"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
     "message": "Enter passport number"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
-    "message": "Resident ID Number"
+    "message": "Resident ID number"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
     "message": "Enter resident ID number"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
-    "message": "RUC Number"
+    "message": "RUC number"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
     "message": "Enter RUC number"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
-    "message": "Tax ID Number"
+    "message": "Tax ID number"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
     "message": "Enter tax ID number"
@@ -920,6 +920,42 @@
   "dashboard.withdraw.completion.wallet": {
     "message": "Wallet"
   },
+  "dashboard.withdraw.error.generic.text": {
+    "message": "We were unable to submit your withdrawal request, please check your details or contact support."
+  },
+  "dashboard.withdraw.error.generic.title": {
+    "message": "Unable to withdraw"
+  },
+  "dashboard.withdraw.error.invalid-address.text": {
+    "message": "The address you provided could not be verified. Please check your address details."
+  },
+  "dashboard.withdraw.error.invalid-address.title": {
+    "message": "Address verification failed"
+  },
+  "dashboard.withdraw.error.invalid-bank.text": {
+    "message": "The bank account details you provided are invalid. Please verify your information."
+  },
+  "dashboard.withdraw.error.invalid-bank.title": {
+    "message": "Invalid bank details"
+  },
+  "dashboard.withdraw.error.invalid-wallet.text": {
+    "message": "The crypto wallet address you provided is invalid. Please double-check and try again."
+  },
+  "dashboard.withdraw.error.invalid-wallet.title": {
+    "message": "Invalid wallet address"
+  },
+  "dashboard.withdraw.error.minimum-not-met.text": {
+    "message": "The withdrawal amount (after fees) doesn't meet the minimum requirement. Please increase your withdrawal amount."
+  },
+  "dashboard.withdraw.error.minimum-not-met.title": {
+    "message": "Amount too low"
+  },
+  "dashboard.withdraw.error.tax-form.text": {
+    "message": "You must complete a tax form to submit your withdrawal request."
+  },
+  "dashboard.withdraw.error.tax-form.title": {
+    "message": "Please complete tax form"
+  },
   "error.collection.404.list_item.1": {
     "message": "You may have mistyped the collection's URL."
   },
@@ -1512,25 +1548,25 @@
     "message": "Tax ID"
   },
   "muralpay.field.account-number": {
-    "message": "Account Number"
+    "message": "Account number"
   },
   "muralpay.field.account-number-cbu-cvu": {
-    "message": "Account Number (CBU/CVU)"
+    "message": "Account number (CBU/CVU)"
   },
   "muralpay.field.account-number-cci": {
-    "message": "Account Number (CCI)"
+    "message": "Account number (CCI)"
   },
   "muralpay.field.account-number-type": {
-    "message": "Account Number Type"
+    "message": "Account number type"
   },
   "muralpay.field.account-type": {
-    "message": "Account Type"
+    "message": "Account type"
   },
   "muralpay.field.bank-account-number": {
-    "message": "Account Number"
+    "message": "Account number"
   },
   "muralpay.field.branch-code": {
-    "message": "Branch Code"
+    "message": "Branch code"
   },
   "muralpay.field.clabe": {
     "message": "CLABE"
@@ -1545,31 +1581,31 @@
     "message": "CUIT/CUIL"
   },
   "muralpay.field.document-type": {
-    "message": "Document Type"
+    "message": "Document type"
   },
   "muralpay.field.iban": {
     "message": "IBAN"
   },
   "muralpay.field.phone-number": {
-    "message": "Phone Number"
+    "message": "Phone number"
   },
   "muralpay.field.pix-email": {
-    "message": "PIX Email"
+    "message": "PIX email"
   },
   "muralpay.field.pix-key-type": {
-    "message": "PIX Key Type"
+    "message": "PIX key type"
   },
   "muralpay.field.pix-phone": {
-    "message": "PIX Phone"
+    "message": "PIX phone"
   },
   "muralpay.field.routing-number": {
-    "message": "Routing Number"
+    "message": "Routing number"
   },
   "muralpay.field.swift-bic": {
     "message": "SWIFT/BIC"
   },
   "muralpay.field.wallet-address": {
-    "message": "Wallet Address"
+    "message": "Wallet address"
   },
   "muralpay.help.cbu-cvu": {
     "message": "Clave Bancaria Uniforme or Clave Virtual Uniforme"
@@ -1593,7 +1629,7 @@
     "message": "Bank Identifier Code"
   },
   "muralpay.pix-type.bank-account": {
-    "message": "Bank Account"
+    "message": "Bank account"
   },
   "muralpay.pix-type.document": {
     "message": "CPF/CNPJ"
@@ -1602,7 +1638,7 @@
     "message": "Email"
   },
   "muralpay.pix-type.phone": {
-    "message": "Phone Number"
+    "message": "Phone number"
   },
   "muralpay.placeholder.account-number": {
     "message": "Enter account number"
diff --git a/apps/frontend/src/pages/dashboard/revenue/index.vue b/apps/frontend/src/pages/dashboard/revenue/index.vue
index 464ef028..8cc6bd34 100644
--- a/apps/frontend/src/pages/dashboard/revenue/index.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/index.vue
@@ -193,67 +193,66 @@
 					@cancelled="refreshPayouts"
 				/>
 			</div>
-			<div v-else class="mx-auto flex flex-col justify-center p-6 text-center">
-				<div data-svg-wrapper className="relative w-full">
+			<div v-else class="mx-auto flex flex-col justify-center gap-4 p-6 text-center">
+				<div data-svg-wrapper>
 					<svg
-						width="250"
-						height="200"
-						viewBox="0 0 250 200"
+						viewBox="0 0 154 94"
 						fill="none"
+						class="h-[94px] w-[154px]"
 						xmlns="http://www.w3.org/2000/svg"
-						class="h-auto w-full"
 					>
-						<rect width="250" height="200" fill="var(--surface-1)" />
 						<path
 							fill-rule="evenodd"
 							clip-rule="evenodd"
-							d="M207 65C210.866 65 214 68.134 214 72C214 75.866 210.866 79 207 79H167C170.866 79 174 82.134 174 86C174 89.866 170.866 93 167 93H189C192.866 93 196 96.134 196 100C196 103.866 192.866 107 189 107H178.826C173.952 107 170 110.134 170 114C170 116.577 172 118.911 176 121C179.866 121 183 124.134 183 128C183 131.866 179.866 135 176 135H93C89.134 135 86 131.866 86 128C86 124.134 89.134 121 93 121H54C50.134 121 47 117.866 47 114C47 110.134 50.134 107 54 107H94C97.866 107 101 103.866 101 100C101 96.134 97.866 93 94 93H69C65.134 93 62 89.866 62 86C62 82.134 65.134 79 69 79H109C105.134 79 102 75.866 102 72C102 68.134 105.134 65 109 65H207ZM207 93C210.866 93 214 96.134 214 100C214 103.866 210.866 107 207 107C203.134 107 200 103.866 200 100C200 96.134 203.134 93 207 93Z"
-							fill="var(--surface-2)"
+							d="M147.545 13.8413C151.11 13.8413 154 16.7333 154 20.3006C154 23.868 151.11 26.76 147.545 26.76H110.659C114.224 26.76 117.114 29.6519 117.114 33.2193C117.114 36.7867 114.224 39.6786 110.659 39.6786H130.946C134.511 39.6786 137.401 42.5706 137.401 46.138C137.401 49.7054 134.511 52.5973 130.946 52.5973H121.564C117.069 52.5973 113.425 55.4892 113.425 59.0566C113.425 61.4349 115.269 63.588 118.958 65.516C122.523 65.516 125.413 68.4079 125.413 71.9753C125.413 75.5427 122.523 78.4346 118.958 78.4346H42.4192C38.8541 78.4346 35.9641 75.5427 35.9641 71.9753C35.9641 68.4079 38.8541 65.516 42.4192 65.516H6.45509C2.89004 65.516 0 62.624 0 59.0566C0 55.4892 2.89004 52.5973 6.45509 52.5973H43.3413C46.9064 52.5973 49.7964 49.7054 49.7964 46.138C49.7964 42.5706 46.9064 39.6786 43.3413 39.6786H20.2874C16.7224 39.6786 13.8323 36.7867 13.8323 33.2193C13.8323 29.6519 16.7224 26.76 20.2874 26.76H57.1737C53.6086 26.76 50.7186 23.868 50.7186 20.3006C50.7186 16.7333 53.6086 13.8413 57.1737 13.8413H147.545ZM147.545 39.6786C151.11 39.6786 154 42.5706 154 46.138C154 49.7054 151.11 52.5973 147.545 52.5973C143.98 52.5973 141.09 49.7054 141.09 46.138C141.09 42.5706 143.98 39.6786 147.545 39.6786Z"
+							fill="var(--surface-2, #1D1F23)"
 						/>
 						<path
 							fill-rule="evenodd"
 							clip-rule="evenodd"
-							d="M153.672 63.9999L162.974 131.843L163.809 138.649C164.079 140.842 162.519 142.837 160.327 143.107L101.767 150.297C99.5739 150.566 97.5781 149.007 97.3089 146.814L88.2931 73.3867C88.1585 72.2904 88.9381 71.2925 90.0345 71.1579C90.0414 71.157 90.0483 71.1562 90.0553 71.1554L94.9136 70.6104M98.8422 70.1698L103.429 69.6552L98.8422 70.1698Z"
-							fill="var(--surface-1)"
+							d="M98.3725 12.9186L106.946 75.5171L107.717 81.7973C107.965 83.8205 106.527 85.6621 104.505 85.9107L50.499 92.5499C48.4769 92.7984 46.6365 91.3599 46.3883 89.3367L38.0786 21.585C37.9545 20.5734 38.6735 19.6526 39.6846 19.5283C39.691 19.5275 39.6974 19.5267 39.7038 19.526L44.1843 19.0228M47.8065 18.612L52.0365 18.1369Z"
+							fill="var(--surface-1, #16181C)"
 						/>
 						<path
-							d="M154.91 63.8302C154.817 63.1462 154.186 62.6678 153.502 62.7615C152.818 62.8553 152.34 63.4858 152.433 64.1697L153.672 63.9999L154.91 63.8302ZM162.974 131.843L164.214 131.69C164.214 131.685 164.213 131.679 164.212 131.673L162.974 131.843ZM163.809 138.649L165.05 138.497L163.809 138.649ZM160.327 143.107L160.479 144.347L160.327 143.107ZM101.767 150.297L101.919 151.538L101.767 150.297ZM97.3089 146.814L98.5496 146.662L97.3089 146.814ZM90.0553 71.1554L90.1946 72.3976L90.0553 71.1554ZM95.053 71.8527C95.739 71.7757 96.2328 71.1572 96.1558 70.4711C96.0789 69.7851 95.4603 69.2913 94.7743 69.3682L94.9136 70.6104L95.053 71.8527ZM98.7028 68.9276C98.0168 69.0045 97.523 69.6231 97.5999 70.3091C97.6769 70.9952 98.2954 71.4889 98.9815 71.412L98.8422 70.1698L98.7028 68.9276ZM103.569 70.8974C104.255 70.8205 104.748 70.2019 104.671 69.5159C104.594 68.8298 103.976 68.3361 103.29 68.413L103.429 69.6552L103.569 70.8974ZM153.672 63.9999L152.433 64.1697L161.735 132.012L162.974 131.843L164.212 131.673L154.91 63.8302L153.672 63.9999ZM162.974 131.843L161.733 131.995L162.569 138.801L163.809 138.649L165.05 138.497L164.214 131.69L162.974 131.843ZM163.809 138.649L162.569 138.801C162.754 140.309 161.682 141.681 160.174 141.866L160.327 143.107L160.479 144.347C163.357 143.994 165.404 141.375 165.05 138.497L163.809 138.649ZM160.327 143.107L160.174 141.866L101.614 149.056L101.767 150.297L101.919 151.538L160.479 144.347L160.327 143.107ZM101.767 150.297L101.614 149.056C100.107 149.241 98.7347 148.169 98.5496 146.662L97.3089 146.814L96.0682 146.967C96.4216 149.844 99.041 151.891 101.919 151.538L101.767 150.297ZM97.3089 146.814L98.5496 146.662L89.5338 73.2344L88.2931 73.3867L87.0524 73.539L96.0682 146.967L97.3089 146.814ZM88.2931 73.3867L89.5338 73.2344C89.4833 72.8232 89.7757 72.449 90.1868 72.3986L90.0345 71.1579L89.8821 69.9172C88.1006 70.1359 86.8337 71.7575 87.0524 73.539L88.2931 73.3867ZM90.0345 71.1579L90.1868 72.3986C90.1894 72.3982 90.192 72.3979 90.1946 72.3976L90.0553 71.1554L89.9159 69.9132C89.9046 69.9145 89.8934 69.9158 89.8821 69.9172L90.0345 71.1579ZM90.0553 71.1554L90.1946 72.3976L95.053 71.8527L94.9136 70.6104L94.7743 69.3682L89.9159 69.9132L90.0553 71.1554ZM98.8422 70.1698L98.9815 71.412L103.569 70.8974L103.429 69.6552L103.29 68.413L98.7028 68.9276L98.8422 70.1698Z"
-							fill="var(--surface-4)"
+							d="M99.6109 12.7488C99.5172 12.0648 98.8868 11.5864 98.2028 11.6802C97.5189 11.774 97.0404 12.4045 97.1341 13.0884L98.3725 12.9186L99.6109 12.7488ZM106.946 75.5171L108.187 75.3647C108.186 75.3589 108.186 75.3531 108.185 75.3473L106.946 75.5171ZM107.717 81.7973L108.957 81.6449L107.717 81.7973ZM104.505 85.9107L104.657 87.1514L104.505 85.9107ZM50.499 92.5499L50.6514 93.7905L50.499 92.5499ZM46.3883 89.3367L47.629 89.1843L46.3883 89.3367ZM38.0786 21.585L36.8379 21.7374L36.8379 21.7374L38.0786 21.585ZM39.6846 19.5283L39.8369 20.769L39.6846 19.5283ZM39.7038 19.526L39.8431 20.7682L39.7038 19.526ZM44.3236 20.265C45.0096 20.1879 45.5034 19.5693 45.4265 18.8833C45.3495 18.1972 44.731 17.7035 44.0449 17.7806L44.1843 19.0228L44.3236 20.265ZM47.6672 17.3698C46.9811 17.4468 46.4874 18.0654 46.5643 18.7515C46.6412 19.4375 47.2598 19.9312 47.9458 19.8542L47.8065 18.612L47.6672 17.3698ZM52.1758 19.3791C52.8619 19.3021 53.3557 18.6835 53.2787 17.9974C53.2018 17.3114 52.5833 16.8177 51.8972 16.8947L52.0365 18.1369L52.1758 19.3791ZM98.3725 12.9186L97.1341 13.0884L105.708 75.6869L106.946 75.5171L108.185 75.3473L99.6109 12.7488L98.3725 12.9186ZM106.946 75.5171L105.706 75.6695L106.476 81.9497L107.717 81.7973L108.957 81.6449L108.187 75.3647L106.946 75.5171ZM107.717 81.7973L106.476 81.9497C106.64 83.2883 105.689 84.5057 104.352 84.67L104.505 85.9107L104.657 87.1514C107.365 86.8185 109.29 84.3527 108.957 81.6449L107.717 81.7973ZM104.505 85.9107L104.352 84.67L50.3467 91.3092L50.499 92.5499L50.6514 93.7905L104.657 87.1514L104.505 85.9107ZM50.499 92.5499L50.3467 91.3092C49.0104 91.4734 47.7932 90.5228 47.629 89.1843L46.3883 89.3367L45.1476 89.489C45.4798 92.1969 47.9434 94.1234 50.6514 93.7905L50.499 92.5499ZM46.3883 89.3367L47.629 89.1843L39.3192 21.4326L38.0786 21.585L36.8379 21.7374L45.1476 89.489L46.3883 89.3367ZM38.0786 21.585L39.3192 21.4326C39.2791 21.1056 39.5116 20.809 39.8369 20.769L39.6846 19.5283L39.5323 18.2876C37.8355 18.4962 36.6298 20.0412 36.8379 21.7374L38.0786 21.585ZM39.6846 19.5283L39.8369 20.769C39.839 20.7687 39.841 20.7685 39.8431 20.7682L39.7038 19.526L39.5645 18.2838C39.5537 18.285 39.543 18.2863 39.5323 18.2876L39.6846 19.5283ZM39.7038 19.526L39.8431 20.7682L44.3236 20.265L44.1843 19.0228L44.0449 17.7806L39.5645 18.2838L39.7038 19.526ZM47.8065 18.612L47.9458 19.8542L52.1758 19.3791L52.0365 18.1369L51.8972 16.8947L47.6672 17.3698L47.8065 18.612Z"
+							fill="var(--surface-4, #34363C)"
 						/>
 						<path
 							fill-rule="evenodd"
 							clip-rule="evenodd"
-							d="M151.14 68.2691L159.56 129.753L160.317 135.921C160.561 137.908 159.167 139.714 157.203 139.956L104.761 146.395C102.798 146.636 101.008 145.22 100.764 143.233L92.6142 76.8567C92.4795 75.7603 93.2592 74.7625 94.3555 74.6278L100.843 73.8313"
-							fill="var(--surface-2)"
+							d="M96.0333 16.8579L103.797 73.5927L104.496 79.2845C104.721 81.1182 103.435 82.785 101.625 83.0074L53.2649 88.9492C51.4542 89.1716 49.8039 87.8655 49.5789 86.0319L42.0821 24.9356C41.9476 23.8392 42.7273 22.8412 43.8236 22.7065L49.6517 21.9905"
+							fill="var(--surface-2, #1D1F23)"
 						/>
 						<path
-							d="M110.672 51.25H156.229C156.958 51.25 157.657 51.5393 158.173 52.0547L171.616 65.4902C172.132 66.0059 172.422 66.7053 172.422 67.4346V130C172.422 131.519 171.191 132.75 169.672 132.75H110.672C109.153 132.75 107.922 131.519 107.922 130V54C107.922 52.4812 109.153 51.25 110.672 51.25Z"
-							fill="var(--surface-1)"
-							stroke="var(--surface-4)"
+							d="M59.0267 1.25H100.596C101.325 1.25 102.025 1.53995 102.54 2.05566L114.756 14.2715C115.272 14.7872 115.561 15.4867 115.561 16.2158V73.5117C115.561 75.0305 114.33 76.2617 112.811 76.2617H59.0267C57.508 76.2617 56.2767 75.0305 56.2767 73.5117V4C56.2767 2.48122 57.508 1.25 59.0267 1.25Z"
+							fill="var(--surface-1, #16181C)"
+							stroke="var(--surface-4, #34363C)"
 							stroke-width="2.5"
 						/>
 						<path
-							d="M156.672 52.4028V64C156.672 65.6569 158.015 67 159.672 67H167.605"
-							stroke="var(--surface-4)"
+							d="M101.135 2.21729V12.9187C101.135 14.4476 102.373 15.687 103.901 15.687H111.217"
+							stroke="var(--surface-4, #34363C)"
 							stroke-width="2.5"
 							stroke-linecap="round"
 							stroke-linejoin="round"
 						/>
 						<path
-							d="M118 118H144M118 67H144H118ZM118 79H161H118ZM118 92H161H118ZM118 105H161H118Z"
-							stroke="var(--surface-3)"
+							d="M65.473 62.7479H89.4491M65.473 15.687H89.4491H65.473ZM65.473 26.7602H105.126H65.473ZM65.473 38.7561H105.126H65.473ZM65.473 50.752H105.126H65.473Z"
+							stroke="var(--surface-3, #27292E)"
 							stroke-width="2.5"
 							stroke-linecap="round"
 							stroke-linejoin="round"
 						/>
 					</svg>
 				</div>
-				<span class="text-lg text-contrast md:text-xl">{{
-					formatMessage(messages.noTransactions)
-				}}</span>
-				<span class="max-w-[256px] text-lg leading-none text-secondary">{{
-					formatMessage(messages.noTransactionsDesc)
-				}}</span>
+				<div class="flex flex-col gap-1">
+					<span class="text-lg text-contrast md:text-xl">{{
+						formatMessage(messages.noTransactions)
+					}}</span>
+					<span class="max-w-[256px] text-lg leading-6 text-secondary">{{
+						formatMessage(messages.noTransactionsDesc)
+					}}</span>
+				</div>
 			</div>
 		</div>
 	</div>
@@ -556,7 +555,7 @@ const segments = computed<RevenueBarSegment[]>(() => {
 		return { key: s.key, class: s.class, pct, amount: s.amount }
 	})
 
-	const filtered = normalized.filter((s) => s.pct > 0)
+	const filtered = normalized.filter((s) => s.pct >= 1)
 	if (!filtered.length) return [] as RevenueBarSegment[]
 
 	const sumExceptLast = filtered.slice(0, -1).reduce((sum, s) => sum + s.pct, 0)
diff --git a/apps/frontend/src/providers/creator-withdraw.ts b/apps/frontend/src/providers/creator-withdraw.ts
index 9d861c07..3ea3a6ae 100644
--- a/apps/frontend/src/providers/creator-withdraw.ts
+++ b/apps/frontend/src/providers/creator-withdraw.ts
@@ -449,12 +449,12 @@ export function createWithdrawContext(
 		const formCompleted = balance?.form_completion_status === 'complete'
 
 		if (formCompleted) {
-			return availableBalance
+			return Math.max(0, availableBalance)
 		}
 
 		const usedLimit = balance?.withdrawn_ytd ?? 0
 		const remainingLimit = Math.max(0, TAX_THRESHOLD_ACTUAL - usedLimit)
-		return Math.min(remainingLimit, availableBalance)
+		return Math.max(0, Math.min(remainingLimit, availableBalance))
 	})
 
 	const paymentOptions = computed<PaymentOption[]>(() => {
@@ -486,7 +486,10 @@ export function createWithdrawContext(
 		}
 
 		const merchantMethods = tremendousMethods.filter(
-			(m) => m.category === 'merchant_card' || m.category === 'merchant_cards',
+			(m) =>
+				m.category === 'merchant_card' ||
+				m.category === 'merchant_cards' ||
+				m.category === 'visa_card',
 		)
 		if (merchantMethods.length > 0) {
 			options.push({
diff --git a/apps/frontend/src/utils/muralpay-rails.ts b/apps/frontend/src/utils/muralpay-rails.ts
index d04ebf9c..e7d3edc7 100644
--- a/apps/frontend/src/utils/muralpay-rails.ts
+++ b/apps/frontend/src/utils/muralpay-rails.ts
@@ -84,7 +84,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'accountType',
 				type: 'select',
-				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account type' }),
 				required: true,
 				options: ACCOUNT_TYPE_OPTIONS,
 				autocomplete: 'off',
@@ -94,7 +94,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.bank-account-number',
-					defaultMessage: 'Account Number',
+					defaultMessage: 'Account number',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -108,7 +108,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.routing-number',
-					defaultMessage: 'Routing Number',
+					defaultMessage: 'Routing number',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -295,13 +295,13 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'pixAccountType',
 				type: 'select',
-				label: defineMessage({ id: 'muralpay.field.pix-key-type', defaultMessage: 'PIX Key Type' }),
+				label: defineMessage({ id: 'muralpay.field.pix-key-type', defaultMessage: 'PIX key type' }),
 				required: true,
 				autocomplete: 'off',
 				options: [
 					{
 						value: 'PHONE',
-						label: defineMessage({ id: 'muralpay.pix-type.phone', defaultMessage: 'Phone Number' }),
+						label: defineMessage({ id: 'muralpay.pix-type.phone', defaultMessage: 'Phone number' }),
 					},
 					{
 						value: 'EMAIL',
@@ -315,7 +315,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 						value: 'BANK_ACCOUNT',
 						label: defineMessage({
 							id: 'muralpay.pix-type.bank-account',
-							defaultMessage: 'Bank Account',
+							defaultMessage: 'Bank account',
 						}),
 					},
 				],
@@ -323,7 +323,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'pixEmail',
 				type: 'email',
-				label: defineMessage({ id: 'muralpay.field.pix-email', defaultMessage: 'PIX Email' }),
+				label: defineMessage({ id: 'muralpay.field.pix-email', defaultMessage: 'PIX email' }),
 				required: true,
 				placeholder: defineMessage({
 					id: 'muralpay.placeholder.enter-pix-email',
@@ -334,7 +334,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'pixPhone',
 				type: 'tel',
-				label: defineMessage({ id: 'muralpay.field.pix-phone', defaultMessage: 'PIX Phone' }),
+				label: defineMessage({ id: 'muralpay.field.pix-phone', defaultMessage: 'PIX phone' }),
 				required: true,
 				placeholder: defineMessage({
 					id: 'muralpay.placeholder.pix-phone',
@@ -345,7 +345,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'branchCode',
 				type: 'text',
-				label: defineMessage({ id: 'muralpay.field.branch-code', defaultMessage: 'Branch Code' }),
+				label: defineMessage({ id: 'muralpay.field.branch-code', defaultMessage: 'Branch code' }),
 				required: true,
 				placeholder: defineMessage({
 					id: 'muralpay.placeholder.enter-branch-code',
@@ -386,7 +386,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'phoneNumber',
 				type: 'tel',
-				label: defineMessage({ id: 'muralpay.field.phone-number', defaultMessage: 'Phone Number' }),
+				label: defineMessage({ id: 'muralpay.field.phone-number', defaultMessage: 'Phone number' }),
 				required: true,
 				placeholder: defineMessage({
 					id: 'muralpay.placeholder.phone-cop',
@@ -397,7 +397,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'accountType',
 				type: 'select',
-				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account type' }),
 				required: true,
 				options: ACCOUNT_TYPE_OPTIONS,
 				autocomplete: 'off',
@@ -407,7 +407,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.bank-account-number',
-					defaultMessage: 'Account Number',
+					defaultMessage: 'Account number',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -421,7 +421,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'select',
 				label: defineMessage({
 					id: 'muralpay.field.document-type',
-					defaultMessage: 'Document Type',
+					defaultMessage: 'Document type',
 				}),
 				required: true,
 				options: DOCUMENT_TYPE_OPTIONS,
@@ -447,7 +447,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.account-number-cbu-cvu',
-					defaultMessage: 'Account Number (CBU/CVU)',
+					defaultMessage: 'Account number (CBU/CVU)',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -480,7 +480,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.account-number-type',
-					defaultMessage: 'Account Number Type',
+					defaultMessage: 'Account number type',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -507,7 +507,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'accountType',
 				type: 'select',
-				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account type' }),
 				required: true,
 				options: ACCOUNT_TYPE_OPTIONS,
 				autocomplete: 'off',
@@ -517,7 +517,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.account-number',
-					defaultMessage: 'Account Number',
+					defaultMessage: 'Account number',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -531,7 +531,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'select',
 				label: defineMessage({
 					id: 'muralpay.field.document-type',
-					defaultMessage: 'Document Type',
+					defaultMessage: 'Document type',
 				}),
 				required: true,
 				options: DOCUMENT_TYPE_OPTIONS,
@@ -568,7 +568,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'select',
 				label: defineMessage({
 					id: 'muralpay.field.document-type',
-					defaultMessage: 'Document Type',
+					defaultMessage: 'Document type',
 				}),
 				required: true,
 				options: DOCUMENT_TYPE_OPTIONS,
@@ -594,7 +594,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'select',
 				label: defineMessage({
 					id: 'muralpay.field.document-type',
-					defaultMessage: 'Document Type',
+					defaultMessage: 'Document type',
 				}),
 				required: true,
 				options: DOCUMENT_TYPE_OPTIONS,
@@ -605,7 +605,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.account-number-cci',
-					defaultMessage: 'Account Number (CCI)',
+					defaultMessage: 'Account number (CCI)',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -621,7 +621,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'accountType',
 				type: 'select',
-				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account type' }),
 				required: true,
 				options: ACCOUNT_TYPE_OPTIONS,
 				autocomplete: 'off',
@@ -646,7 +646,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 	// 			type: 'text',
 	// 			label: defineMessage({
 	// 				id: 'muralpay.field.account-number',
-	// 				defaultMessage: 'Account Number',
+	// 				defaultMessage: 'Account number',
 	// 			}),
 	// 			required: true,
 	// 			placeholder: defineMessage({
@@ -660,7 +660,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 	// 			type: 'select',
 	// 			label: defineMessage({
 	// 				id: 'muralpay.field.document-type',
-	// 				defaultMessage: 'Document Type',
+	// 				defaultMessage: 'Document type',
 	// 			}),
 	// 			required: true,
 	// 			options: DOCUMENT_TYPE_OPTIONS,
@@ -684,7 +684,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'accountType',
 				type: 'select',
-				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account type' }),
 				required: true,
 				options: ACCOUNT_TYPE_OPTIONS,
 				autocomplete: 'off',
@@ -694,7 +694,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.account-number',
-					defaultMessage: 'Account Number',
+					defaultMessage: 'Account number',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -721,7 +721,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 			{
 				name: 'accountType',
 				type: 'select',
-				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+				label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account type' }),
 				required: true,
 				options: ACCOUNT_TYPE_OPTIONS,
 				autocomplete: 'off',
@@ -731,7 +731,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.account-number',
-					defaultMessage: 'Account Number',
+					defaultMessage: 'Account number',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -745,7 +745,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'select',
 				label: defineMessage({
 					id: 'muralpay.field.document-type',
-					defaultMessage: 'Document Type',
+					defaultMessage: 'Document type',
 				}),
 				required: true,
 				options: DOCUMENT_TYPE_OPTIONS,
@@ -780,7 +780,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 	// 		{
 	// 			name: 'accountType',
 	// 			type: 'select',
-	// 			label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account Type' }),
+	// 			label: defineMessage({ id: 'muralpay.field.account-type', defaultMessage: 'Account type' }),
 	// 			required: true,
 	// 			options: ACCOUNT_TYPE_OPTIONS,
 	// 			autocomplete: 'off',
@@ -790,7 +790,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 	// 			type: 'text',
 	// 			label: defineMessage({
 	// 				id: 'muralpay.field.account-number',
-	// 				defaultMessage: 'Account Number',
+	// 				defaultMessage: 'Account number',
 	// 			}),
 	// 			required: true,
 	// 			placeholder: defineMessage({
@@ -804,7 +804,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 	// 			type: 'select',
 	// 			label: defineMessage({
 	// 				id: 'muralpay.field.document-type',
-	// 				defaultMessage: 'Document Type',
+	// 				defaultMessage: 'Document type',
 	// 			}),
 	// 			required: true,
 	// 			options: DOCUMENT_TYPE_OPTIONS,
@@ -813,7 +813,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 	// 		{
 	// 			name: 'phoneNumber',
 	// 			type: 'tel',
-	// 			label: defineMessage({ id: 'muralpay.field.phone-number', defaultMessage: 'Phone Number' }),
+	// 			label: defineMessage({ id: 'muralpay.field.phone-number', defaultMessage: 'Phone number' }),
 	// 			required: true,
 	// 			placeholder: defineMessage({
 	// 				id: 'muralpay.placeholder.phone-china',
@@ -867,7 +867,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.wallet-address',
-					defaultMessage: 'Wallet Address',
+					defaultMessage: 'Wallet address',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -900,7 +900,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.wallet-address',
-					defaultMessage: 'Wallet Address',
+					defaultMessage: 'Wallet address',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -936,7 +936,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.wallet-address',
-					defaultMessage: 'Wallet Address',
+					defaultMessage: 'Wallet address',
 				}),
 				required: true,
 				placeholder: defineMessage({
@@ -969,7 +969,7 @@ export const MURALPAY_RAILS: Record<string, RailConfig> = {
 				type: 'text',
 				label: defineMessage({
 					id: 'muralpay.field.wallet-address',
-					defaultMessage: 'Wallet Address',
+					defaultMessage: 'Wallet address',
 				}),
 				required: true,
 				placeholder: defineMessage({
diff --git a/packages/ui/src/components/modal/NewModal.vue b/packages/ui/src/components/modal/NewModal.vue
index 1ca3b2e8..03ec90ca 100644
--- a/packages/ui/src/components/modal/NewModal.vue
+++ b/packages/ui/src/components/modal/NewModal.vue
@@ -314,7 +314,7 @@ function handleKeyDown(event: KeyboardEvent) {
 			transition: none !important;
 		}
 
-		@media screen and (max-width: 650px) {
+		@media screen and (max-width: 640px) {
 			width: calc(100% - 2 * var(--gap-lg));
 		}
 	}

From 4592786de836c306932cbfb41c7a1d7a75392684 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:12:11 -0800
Subject: [PATCH 16/64] Update withdraw blog post now that it's live. (#4715)

---
 apps/frontend/src/public/news/feed/articles.json          | 2 +-
 apps/frontend/src/public/news/feed/rss.xml                | 8 ++++----
 packages/blog/articles/creator-withdrawals-overhaul.md    | 4 ++--
 .../blog/compiled/creator_withdrawals_overhaul.content.ts | 2 +-
 packages/blog/compiled/creator_withdrawals_overhaul.ts    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/frontend/src/public/news/feed/articles.json b/apps/frontend/src/public/news/feed/articles.json
index b296c93b..65d4960a 100644
--- a/apps/frontend/src/public/news/feed/articles.json
+++ b/apps/frontend/src/public/news/feed/articles.json
@@ -2,7 +2,7 @@
 	"articles": [
 		{
 			"title": "More Ways to Withdraw",
-			"summary": "Coming soon: new withdraw options and a redesigned revenue dashboard",
+			"summary": "New withdraw options and a redesigned revenue dashboard",
 			"thumbnail": "https://modrinth.com/news/article/creator-withdrawals-overhaul/thumbnail.webp",
 			"date": "2025-10-27T23:30:00.000Z",
 			"link": "https://modrinth.com/news/article/creator-withdrawals-overhaul"
diff --git a/apps/frontend/src/public/news/feed/rss.xml b/apps/frontend/src/public/news/feed/rss.xml
index 0d66e3c2..d1fb960b 100644
--- a/apps/frontend/src/public/news/feed/rss.xml
+++ b/apps/frontend/src/public/news/feed/rss.xml
@@ -4,16 +4,16 @@
         <description><![CDATA[Keep up-to-date on the latest news from Modrinth.]]></description>
         <link>https://modrinth.com/news/</link>
         <generator>@modrinth/blog</generator>
-        <lastBuildDate>Mon, 27 Oct 2025 23:06:26 GMT</lastBuildDate>
+        <lastBuildDate>Tue, 04 Nov 2025 21:20:17 GMT</lastBuildDate>
         <atom:link href="https://modrinth.com/news/feed/rss.xml" rel="self" type="application/rss+xml"/>
         <language><![CDATA[en]]></language>
         <item>
             <title><![CDATA[More Ways to Withdraw]]></title>
-            <description><![CDATA[Coming soon: new withdraw options and a redesigned revenue dashboard]]></description>
+            <description><![CDATA[New withdraw options and a redesigned revenue dashboard]]></description>
             <link>https://modrinth.com/news/article/creator-withdrawals-overhaul/</link>
             <guid isPermaLink="false">https://modrinth.com/news/article/creator-withdrawals-overhaul/</guid>
-            <pubDate>Mon, 27 Oct 2025 21:38:54 GMT</pubDate>
-            <content:encoded>&lt;![CDATA[&lt;p&gt;Hey everyone! We&apos;ve heard your feedback on creator withdrawal options, and we&apos;re excited to share that more are finally coming to Modrinth! Over the past month, we&apos;ve been working on overhauling the withdrawal experience and supporting more withdraw methods.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;This update will roll out later this week&lt;/strong&gt;, but we wanted to give everyone an early heads-up so you can hold off on withdrawing when payouts go out in a couple days in case one of the new options interests you. There&apos;s a lot packed into this release, so let&apos;s dive in!&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./revenue-page-from-home.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;h2&gt;&lt;strong&gt;TL;DR&lt;/strong&gt;&lt;/h2&gt;&lt;ul&gt;&lt;li&gt;New revenue page and withdrawal flow&lt;/li&gt;&lt;li&gt;New bank transfer option for 29 countries&lt;/li&gt;&lt;li&gt;New crypto (USDC) option for hard to reach countries&lt;/li&gt;&lt;li&gt;PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)&lt;/li&gt;&lt;li&gt;Email notifications for payout updates (available, successful, failed, etc.)&lt;/li&gt;&lt;li&gt;New withdrawal compliance&lt;/li&gt;&lt;/ul&gt;&lt;hr&gt;&lt;h2&gt;Streamlined Withdrawal Experience&lt;/h2&gt;&lt;p&gt;A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Your revenue is now displayed as a balance, with a detailed breakdown below.&lt;/strong&gt;&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./balance-progress-bar.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;blockquote&gt;&lt;p&gt;Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that&apos;s still being processed.&lt;/p&gt;&lt;/blockquote&gt;&lt;p&gt;We&apos;ve also cleaned up the transaction history. You&apos;ll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.&lt;/p&gt;&lt;h2&gt;New Withdraw Methods&lt;/h2&gt;&lt;p&gt;The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./withdraw-example.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;p&gt;Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you&apos;ll immediately see all available methods and fees for your country, including a few new ones:&lt;/p&gt;&lt;h3&gt;Bank Transfers (29 Countries)&lt;/h3&gt;&lt;p&gt;You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.&lt;/p&gt;&lt;p&gt;We&apos;re working to expand this list, most notably to Canada, the UK, and countries across Asia, but there&apos;s no timeline &lt;em&gt;yet&lt;/em&gt;.&lt;/p&gt;&lt;table&gt;&lt;thead&gt;&lt;tr&gt;&lt;th&gt;Country&lt;/th&gt;&lt;th&gt;Currency&lt;/th&gt;&lt;th&gt;Transaction Fee&lt;/th&gt;&lt;th&gt;FX Fee&lt;/th&gt;&lt;th&gt;&lt;strong&gt;Total Fee&lt;/strong&gt;&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;&lt;tbody&gt;&lt;tr&gt;&lt;td&gt;🇺🇸 USA&lt;/td&gt;&lt;td&gt;USD&lt;/td&gt;&lt;td&gt;$0.50 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5% + $0.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇪🇺 EU&lt;/td&gt;&lt;td&gt;EUR&lt;/td&gt;&lt;td&gt;€1.00 + 1%&lt;/td&gt;&lt;td&gt;0.60%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.6% + €1.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇦🇷 Argentina&lt;/td&gt;&lt;td&gt;ARS&lt;/td&gt;&lt;td&gt;$0.00 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5%&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇲🇽 Mexico&lt;/td&gt;&lt;td&gt;MXN&lt;/td&gt;&lt;td&gt;$0.50 + 1%&lt;/td&gt;&lt;td&gt;0.90%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.9% + $0.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇧🇷 Brazil&lt;/td&gt;&lt;td&gt;BRL&lt;/td&gt;&lt;td&gt;$0.25 + 1%&lt;/td&gt;&lt;td&gt;1.30% (incl. IOF)&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.3% + $0.25&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇱 Chile&lt;/td&gt;&lt;td&gt;CLP&lt;/td&gt;&lt;td&gt;$1.20 + 1%&lt;/td&gt;&lt;td&gt;0.95%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.0% + $1.20&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇷 Costa Rica&lt;/td&gt;&lt;td&gt;CRC&lt;/td&gt;&lt;td&gt;$0.80 + 1%&lt;/td&gt;&lt;td&gt;1.05%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.1% + $0.80&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇵🇪 Peru (PEN)&lt;/td&gt;&lt;td&gt;PEN&lt;/td&gt;&lt;td&gt;$1.00 + 1%&lt;/td&gt;&lt;td&gt;1.15%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.1% + $1.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇿🇦 South Africa&lt;/td&gt;&lt;td&gt;ZAR&lt;/td&gt;&lt;td&gt;$1.50 + 1%&lt;/td&gt;&lt;td&gt;1.40%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.4% + $1.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇵🇪 Peru (USD)&lt;/td&gt;&lt;td&gt;USD&lt;/td&gt;&lt;td&gt;$5.00 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5% + $5.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇴 Colombia&lt;/td&gt;&lt;td&gt;COP&lt;/td&gt;&lt;td&gt;$0.35 + 1%&lt;/td&gt;&lt;td&gt;0.95% (incl. GMF)&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.0% + $0.35&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;&lt;p&gt;&lt;em&gt;Total Fee includes both transaction and FX fees.&lt;/em&gt;&lt;/p&gt;&lt;blockquote&gt;&lt;p&gt;&lt;strong&gt;Supported EU countries:&lt;/strong&gt; Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain&lt;/p&gt;&lt;/blockquote&gt;&lt;h3&gt;Crypto Withdrawals (USDC)&lt;/h3&gt;&lt;p&gt;We&apos;ve also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.&lt;/p&gt;&lt;h3&gt;PayPal &amp;amp; Venmo&lt;/h3&gt;&lt;p&gt;We&apos;ve moved PayPal and Venmo to two different methods depending on your country:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;strong&gt;United States:&lt;/strong&gt; PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Outside of the United States:&lt;/strong&gt; PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges a flat 6%, capped at $25.00. This should be an improvement over the old method for larger creators, where PayPal charged high uncapped fees for currency conversion.&lt;/li&gt;&lt;/ul&gt;&lt;h2&gt;New Email Notifications&lt;/h2&gt;&lt;p&gt;Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what&apos;s going on.&lt;/p&gt;&lt;p&gt;This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!&lt;/p&gt;&lt;h2&gt;Tax Compliance&lt;/h2&gt;&lt;p&gt;Last but not least, we&apos;re also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.&lt;/p&gt;&lt;p&gt;Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they&apos;ll be prompted to fill out a W-8 or W-9 tax form, depending on their country.&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;/news/article/creator-withdrawals-overhaul/tax-compliance.png&quot; alt=&quot;A snippet of the tax form stage of the new withdraw modal.&quot;&gt;&lt;/p&gt;&lt;p&gt;Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we&apos;re sending money to.&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! 💚&lt;/p&gt;]]&gt;</content:encoded>
+            <pubDate>Mon, 27 Oct 2025 23:30:00 GMT</pubDate>
+            <content:encoded>&lt;![CDATA[&lt;p&gt;Hey everyone! We&apos;ve heard your feedback on creator withdrawal options, and we&apos;re excited to share that more are finally coming to Modrinth! Over the past month, we&apos;ve been working on overhauling the withdrawal experience and supporting more withdraw methods.&lt;/p&gt;&lt;p&gt;There&apos;s a lot packed into this release, so let&apos;s dive in!&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./revenue-page-from-home.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;h2&gt;&lt;strong&gt;TL;DR&lt;/strong&gt;&lt;/h2&gt;&lt;ul&gt;&lt;li&gt;New revenue page and withdrawal flow&lt;/li&gt;&lt;li&gt;New bank transfer option for 29 countries&lt;/li&gt;&lt;li&gt;New crypto (USDC) option for hard to reach countries&lt;/li&gt;&lt;li&gt;PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)&lt;/li&gt;&lt;li&gt;Email notifications for payout updates (available, successful, failed, etc.)&lt;/li&gt;&lt;li&gt;New withdrawal compliance&lt;/li&gt;&lt;/ul&gt;&lt;hr&gt;&lt;h2&gt;Streamlined Withdrawal Experience&lt;/h2&gt;&lt;p&gt;A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Your revenue is now displayed as a balance, with a detailed breakdown below.&lt;/strong&gt;&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./balance-progress-bar.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;blockquote&gt;&lt;p&gt;Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that&apos;s still being processed.&lt;/p&gt;&lt;/blockquote&gt;&lt;p&gt;We&apos;ve also cleaned up the transaction history. You&apos;ll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.&lt;/p&gt;&lt;h2&gt;New Withdraw Methods&lt;/h2&gt;&lt;p&gt;The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./withdraw-example.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;p&gt;Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you&apos;ll immediately see all available methods and fees for your country, including a few new ones:&lt;/p&gt;&lt;h3&gt;Bank Transfers (29 Countries)&lt;/h3&gt;&lt;p&gt;You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.&lt;/p&gt;&lt;p&gt;We&apos;re working to expand this list, most notably to Canada, the UK, and countries across Asia, but there&apos;s no timeline &lt;em&gt;yet&lt;/em&gt;.&lt;/p&gt;&lt;table&gt;&lt;thead&gt;&lt;tr&gt;&lt;th&gt;Country&lt;/th&gt;&lt;th&gt;Currency&lt;/th&gt;&lt;th&gt;Transaction Fee&lt;/th&gt;&lt;th&gt;FX Fee&lt;/th&gt;&lt;th&gt;&lt;strong&gt;Total Fee&lt;/strong&gt;&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;&lt;tbody&gt;&lt;tr&gt;&lt;td&gt;🇺🇸 USA&lt;/td&gt;&lt;td&gt;USD&lt;/td&gt;&lt;td&gt;$0.50 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5% + $0.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇪🇺 EU&lt;/td&gt;&lt;td&gt;EUR&lt;/td&gt;&lt;td&gt;€1.00 + 1%&lt;/td&gt;&lt;td&gt;0.60%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.6% + €1.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇦🇷 Argentina&lt;/td&gt;&lt;td&gt;ARS&lt;/td&gt;&lt;td&gt;$0.00 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5%&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇲🇽 Mexico&lt;/td&gt;&lt;td&gt;MXN&lt;/td&gt;&lt;td&gt;$0.50 + 1%&lt;/td&gt;&lt;td&gt;0.90%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.9% + $0.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇧🇷 Brazil&lt;/td&gt;&lt;td&gt;BRL&lt;/td&gt;&lt;td&gt;$0.25 + 1%&lt;/td&gt;&lt;td&gt;1.30% (incl. IOF)&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.3% + $0.25&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇱 Chile&lt;/td&gt;&lt;td&gt;CLP&lt;/td&gt;&lt;td&gt;$1.20 + 1%&lt;/td&gt;&lt;td&gt;0.95%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.0% + $1.20&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇷 Costa Rica&lt;/td&gt;&lt;td&gt;CRC&lt;/td&gt;&lt;td&gt;$0.80 + 1%&lt;/td&gt;&lt;td&gt;1.05%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.1% + $0.80&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇵🇪 Peru (PEN)&lt;/td&gt;&lt;td&gt;PEN&lt;/td&gt;&lt;td&gt;$1.00 + 1%&lt;/td&gt;&lt;td&gt;1.15%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.1% + $1.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇿🇦 South Africa&lt;/td&gt;&lt;td&gt;ZAR&lt;/td&gt;&lt;td&gt;$1.50 + 1%&lt;/td&gt;&lt;td&gt;1.40%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.4% + $1.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇵🇪 Peru (USD)&lt;/td&gt;&lt;td&gt;USD&lt;/td&gt;&lt;td&gt;$5.00 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5% + $5.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇴 Colombia&lt;/td&gt;&lt;td&gt;COP&lt;/td&gt;&lt;td&gt;$0.35 + 1%&lt;/td&gt;&lt;td&gt;0.95% (incl. GMF)&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.0% + $0.35&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;&lt;p&gt;&lt;em&gt;Total Fee includes both transaction and FX fees.&lt;/em&gt;&lt;/p&gt;&lt;blockquote&gt;&lt;p&gt;&lt;strong&gt;Supported EU countries:&lt;/strong&gt; Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain&lt;/p&gt;&lt;/blockquote&gt;&lt;h3&gt;Crypto Withdrawals (USDC)&lt;/h3&gt;&lt;p&gt;We&apos;ve also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.&lt;/p&gt;&lt;h3&gt;PayPal &amp;amp; Venmo&lt;/h3&gt;&lt;p&gt;We&apos;ve moved PayPal and Venmo to two different methods depending on your country:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;strong&gt;United States:&lt;/strong&gt; PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Outside of the United States:&lt;/strong&gt; PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges a flat 6%, capped at $25.00. This should be an improvement over the old method for larger creators, where PayPal charged high uncapped fees for currency conversion.&lt;/li&gt;&lt;/ul&gt;&lt;h2&gt;New Email Notifications&lt;/h2&gt;&lt;p&gt;Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what&apos;s going on.&lt;/p&gt;&lt;p&gt;This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!&lt;/p&gt;&lt;h2&gt;Tax Compliance&lt;/h2&gt;&lt;p&gt;Last but not least, we&apos;re also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.&lt;/p&gt;&lt;p&gt;Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they&apos;ll be prompted to fill out a W-8 or W-9 tax form, depending on their country.&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;/news/article/creator-withdrawals-overhaul/tax-compliance.png&quot; alt=&quot;A snippet of the tax form stage of the new withdraw modal.&quot;&gt;&lt;/p&gt;&lt;p&gt;Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we&apos;re sending money to.&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! 💚&lt;/p&gt;]]&gt;</content:encoded>
         </item>
         <item>
             <title><![CDATA[Standing By Our Values]]></title>
diff --git a/packages/blog/articles/creator-withdrawals-overhaul.md b/packages/blog/articles/creator-withdrawals-overhaul.md
index 58a6a93e..5305b955 100644
--- a/packages/blog/articles/creator-withdrawals-overhaul.md
+++ b/packages/blog/articles/creator-withdrawals-overhaul.md
@@ -1,13 +1,13 @@
 ---
 title: More Ways to Withdraw
-summary: 'Coming soon: new withdraw options and a redesigned revenue dashboard'
+summary: 'New withdraw options and a redesigned revenue dashboard'
 date: 2025-10-27T16:30:00-07:00
 authors: ['AJfd8YH6', 'bOHH0P9Z', 'xSQqYYIN']
 ---
 
 Hey everyone! We've heard your feedback on creator withdrawal options, and we're excited to share that more are finally coming to Modrinth! Over the past month, we've been working on overhauling the withdrawal experience and supporting more withdraw methods.
 
-**This update will roll out later this week**, but we wanted to give everyone an early heads-up so you can hold off on withdrawing when payouts go out in a couple days in case one of the new options interests you. There's a lot packed into this release, so let's dive in!
+There's a lot packed into this release, so let's dive in!
 
 <div class="video-wrapper mb-8">
 	<video autoplay loop muted playsinline>
diff --git a/packages/blog/compiled/creator_withdrawals_overhaul.content.ts b/packages/blog/compiled/creator_withdrawals_overhaul.content.ts
index 3dc98ec8..4a0bed35 100644
--- a/packages/blog/compiled/creator_withdrawals_overhaul.content.ts
+++ b/packages/blog/compiled/creator_withdrawals_overhaul.content.ts
@@ -1,2 +1,2 @@
 // AUTO-GENERATED FILE - DO NOT EDIT
-export const html = `<p>Hey everyone! We've heard your feedback on creator withdrawal options, and we're excited to share that more are finally coming to Modrinth! Over the past month, we've been working on overhauling the withdrawal experience and supporting more withdraw methods.</p><p><strong>This update will roll out later this week</strong>, but we wanted to give everyone an early heads-up so you can hold off on withdrawing when payouts go out in a couple days in case one of the new options interests you. There's a lot packed into this release, so let's dive in!</p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./revenue-page-from-home.mp4" type="video/mp4"></video></div><h2><strong>TL;DR</strong></h2><ul><li>New revenue page and withdrawal flow</li><li>New bank transfer option for 29 countries</li><li>New crypto (USDC) option for hard to reach countries</li><li>PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)</li><li>Email notifications for payout updates (available, successful, failed, etc.)</li><li>New withdrawal compliance</li></ul><hr><h2>Streamlined Withdrawal Experience</h2><p>A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.</p><p><strong>Your revenue is now displayed as a balance, with a detailed breakdown below.</strong></p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./balance-progress-bar.mp4" type="video/mp4"></video></div><blockquote><p>Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that's still being processed.</p></blockquote><p>We've also cleaned up the transaction history. You'll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.</p><h2>New Withdraw Methods</h2><p>The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.</p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./withdraw-example.mp4" type="video/mp4"></video></div><p>Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you'll immediately see all available methods and fees for your country, including a few new ones:</p><h3>Bank Transfers (29 Countries)</h3><p>You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.</p><p>We're working to expand this list, most notably to Canada, the UK, and countries across Asia, but there's no timeline <em>yet</em>.</p><table><thead><tr><th>Country</th><th>Currency</th><th>Transaction Fee</th><th>FX Fee</th><th><strong>Total Fee</strong></th></tr></thead><tbody><tr><td>🇺🇸 USA</td><td>USD</td><td>$0.50 + 1%</td><td>0.50%</td><td><strong>~1.5% + $0.50</strong></td></tr><tr><td>🇪🇺 EU</td><td>EUR</td><td>€1.00 + 1%</td><td>0.60%</td><td><strong>~1.6% + €1.00</strong></td></tr><tr><td>🇦🇷 Argentina</td><td>ARS</td><td>$0.00 + 1%</td><td>0.50%</td><td><strong>~1.5%</strong></td></tr><tr><td>🇲🇽 Mexico</td><td>MXN</td><td>$0.50 + 1%</td><td>0.90%</td><td><strong>~1.9% + $0.50</strong></td></tr><tr><td>🇧🇷 Brazil</td><td>BRL</td><td>$0.25 + 1%</td><td>1.30% (incl. IOF)</td><td><strong>~2.3% + $0.25</strong></td></tr><tr><td>🇨🇱 Chile</td><td>CLP</td><td>$1.20 + 1%</td><td>0.95%</td><td><strong>~2.0% + $1.20</strong></td></tr><tr><td>🇨🇷 Costa Rica</td><td>CRC</td><td>$0.80 + 1%</td><td>1.05%</td><td><strong>~2.1% + $0.80</strong></td></tr><tr><td>🇵🇪 Peru (PEN)</td><td>PEN</td><td>$1.00 + 1%</td><td>1.15%</td><td><strong>~2.1% + $1.00</strong></td></tr><tr><td>🇿🇦 South Africa</td><td>ZAR</td><td>$1.50 + 1%</td><td>1.40%</td><td><strong>~2.4% + $1.50</strong></td></tr><tr><td>🇵🇪 Peru (USD)</td><td>USD</td><td>$5.00 + 1%</td><td>0.50%</td><td><strong>~1.5% + $5.00</strong></td></tr><tr><td>🇨🇴 Colombia</td><td>COP</td><td>$0.35 + 1%</td><td>0.95% (incl. GMF)</td><td><strong>~2.0% + $0.35</strong></td></tr></tbody></table><p><em>Total Fee includes both transaction and FX fees.</em></p><blockquote><p><strong>Supported EU countries:</strong> Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain</p></blockquote><h3>Crypto Withdrawals (USDC)</h3><p>We've also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.</p><h3>PayPal &amp; Venmo</h3><p>We've moved PayPal and Venmo to two different methods depending on your country:</p><ul><li><strong>United States:</strong> PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.</li><li><strong>Outside of the United States:</strong> PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges a flat 6%, capped at $25.00. This should be an improvement over the old method for larger creators, where PayPal charged high uncapped fees for currency conversion.</li></ul><h2>New Email Notifications</h2><p>Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what's going on.</p><p>This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!</p><h2>Tax Compliance</h2><p>Last but not least, we're also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.</p><p>Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they'll be prompted to fill out a W-8 or W-9 tax form, depending on their country.</p><p><img src="/news/article/creator-withdrawals-overhaul/tax-compliance.png" alt="A snippet of the tax form stage of the new withdraw modal."></p><p>Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we're sending money to.</p><hr><p>Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! 💚</p>`;
+export const html = `<p>Hey everyone! We've heard your feedback on creator withdrawal options, and we're excited to share that more are finally coming to Modrinth! Over the past month, we've been working on overhauling the withdrawal experience and supporting more withdraw methods.</p><p>There's a lot packed into this release, so let's dive in!</p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./revenue-page-from-home.mp4" type="video/mp4"></video></div><h2><strong>TL;DR</strong></h2><ul><li>New revenue page and withdrawal flow</li><li>New bank transfer option for 29 countries</li><li>New crypto (USDC) option for hard to reach countries</li><li>PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)</li><li>Email notifications for payout updates (available, successful, failed, etc.)</li><li>New withdrawal compliance</li></ul><hr><h2>Streamlined Withdrawal Experience</h2><p>A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.</p><p><strong>Your revenue is now displayed as a balance, with a detailed breakdown below.</strong></p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./balance-progress-bar.mp4" type="video/mp4"></video></div><blockquote><p>Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that's still being processed.</p></blockquote><p>We've also cleaned up the transaction history. You'll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.</p><h2>New Withdraw Methods</h2><p>The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.</p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./withdraw-example.mp4" type="video/mp4"></video></div><p>Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you'll immediately see all available methods and fees for your country, including a few new ones:</p><h3>Bank Transfers (29 Countries)</h3><p>You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.</p><p>We're working to expand this list, most notably to Canada, the UK, and countries across Asia, but there's no timeline <em>yet</em>.</p><table><thead><tr><th>Country</th><th>Currency</th><th>Transaction Fee</th><th>FX Fee</th><th><strong>Total Fee</strong></th></tr></thead><tbody><tr><td>🇺🇸 USA</td><td>USD</td><td>$0.50 + 1%</td><td>0.50%</td><td><strong>~1.5% + $0.50</strong></td></tr><tr><td>🇪🇺 EU</td><td>EUR</td><td>€1.00 + 1%</td><td>0.60%</td><td><strong>~1.6% + €1.00</strong></td></tr><tr><td>🇦🇷 Argentina</td><td>ARS</td><td>$0.00 + 1%</td><td>0.50%</td><td><strong>~1.5%</strong></td></tr><tr><td>🇲🇽 Mexico</td><td>MXN</td><td>$0.50 + 1%</td><td>0.90%</td><td><strong>~1.9% + $0.50</strong></td></tr><tr><td>🇧🇷 Brazil</td><td>BRL</td><td>$0.25 + 1%</td><td>1.30% (incl. IOF)</td><td><strong>~2.3% + $0.25</strong></td></tr><tr><td>🇨🇱 Chile</td><td>CLP</td><td>$1.20 + 1%</td><td>0.95%</td><td><strong>~2.0% + $1.20</strong></td></tr><tr><td>🇨🇷 Costa Rica</td><td>CRC</td><td>$0.80 + 1%</td><td>1.05%</td><td><strong>~2.1% + $0.80</strong></td></tr><tr><td>🇵🇪 Peru (PEN)</td><td>PEN</td><td>$1.00 + 1%</td><td>1.15%</td><td><strong>~2.1% + $1.00</strong></td></tr><tr><td>🇿🇦 South Africa</td><td>ZAR</td><td>$1.50 + 1%</td><td>1.40%</td><td><strong>~2.4% + $1.50</strong></td></tr><tr><td>🇵🇪 Peru (USD)</td><td>USD</td><td>$5.00 + 1%</td><td>0.50%</td><td><strong>~1.5% + $5.00</strong></td></tr><tr><td>🇨🇴 Colombia</td><td>COP</td><td>$0.35 + 1%</td><td>0.95% (incl. GMF)</td><td><strong>~2.0% + $0.35</strong></td></tr></tbody></table><p><em>Total Fee includes both transaction and FX fees.</em></p><blockquote><p><strong>Supported EU countries:</strong> Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain</p></blockquote><h3>Crypto Withdrawals (USDC)</h3><p>We've also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.</p><h3>PayPal &amp; Venmo</h3><p>We've moved PayPal and Venmo to two different methods depending on your country:</p><ul><li><strong>United States:</strong> PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.</li><li><strong>Outside of the United States:</strong> PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges a flat 6%, capped at $25.00. This should be an improvement over the old method for larger creators, where PayPal charged high uncapped fees for currency conversion.</li></ul><h2>New Email Notifications</h2><p>Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what's going on.</p><p>This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!</p><h2>Tax Compliance</h2><p>Last but not least, we're also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.</p><p>Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they'll be prompted to fill out a W-8 or W-9 tax form, depending on their country.</p><p><img src="/news/article/creator-withdrawals-overhaul/tax-compliance.png" alt="A snippet of the tax form stage of the new withdraw modal."></p><p>Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we're sending money to.</p><hr><p>Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! 💚</p>`;
diff --git a/packages/blog/compiled/creator_withdrawals_overhaul.ts b/packages/blog/compiled/creator_withdrawals_overhaul.ts
index cd7b41cf..3131ccd4 100644
--- a/packages/blog/compiled/creator_withdrawals_overhaul.ts
+++ b/packages/blog/compiled/creator_withdrawals_overhaul.ts
@@ -2,7 +2,7 @@
 export const article = {
   html: () => import(`./creator_withdrawals_overhaul.content`).then(m => m.html),
   title: "More Ways to Withdraw",
-  summary: "Coming soon: new withdraw options and a redesigned revenue dashboard",
+  summary: "New withdraw options and a redesigned revenue dashboard",
   date: "2025-10-27T23:30:00.000Z",
   slug: "creator-withdrawals-overhaul",
   authors: ["AJfd8YH6","bOHH0P9Z","xSQqYYIN"],

From 4636372ff48f3161549fa7c6e4fba39193a5889b Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:13:51 -0800
Subject: [PATCH 17/64] changelog

---
 packages/utils/changelog.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 2ed4903d..4371787e 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,12 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-11-04T16:20:00-07:00`,
+		product: 'web',
+		body: `## Improvements
+- Some bugfixes to the new withdrawal experience.`,
+	},
 	{
 		date: `2025-11-03T15:30:00-07:00`,
 		product: 'web',

From 23d098eee574f47515288ab50c8829e86b2d90ae Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Tue, 4 Nov 2025 17:50:54 -0800
Subject: [PATCH 18/64] Fix error chain logging and withdrawal fees (#4718)

* Log Labrinth errors properly

* Tweak how we do Tremendous fees

* Fix maths for Tremendous fees
---
 apps/labrinth/src/main.rs              |  4 ++--
 apps/labrinth/src/queue/payouts/mod.rs | 28 +++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/labrinth/src/main.rs b/apps/labrinth/src/main.rs
index 643d6062..799a202d 100644
--- a/apps/labrinth/src/main.rs
+++ b/apps/labrinth/src/main.rs
@@ -317,11 +317,11 @@ struct ApiDoc;
 fn log_error(err: &actix_web::Error) {
     if err.as_response_error().status_code().is_client_error() {
         tracing::debug!(
-            "Error encountered while processing the incoming HTTP request: {err}"
+            "Error encountered while processing the incoming HTTP request: {err:#?}"
         );
     } else {
         tracing::error!(
-            "Error encountered while processing the incoming HTTP request: {err}"
+            "Error encountered while processing the incoming HTTP request: {err:#?}"
         );
     }
 }
diff --git a/apps/labrinth/src/queue/payouts/mod.rs b/apps/labrinth/src/queue/payouts/mod.rs
index 2f8af3a5..5260db51 100644
--- a/apps/labrinth/src/queue/payouts/mod.rs
+++ b/apps/labrinth/src/queue/payouts/mod.rs
@@ -706,9 +706,17 @@ impl PayoutsQueue {
                     None
                 };
 
+                // In the Tremendous dashboard, we have configured it so that,
+                // if we make a $10 request for a premium method, *we* get
+                // charged an extra 4% - the user gets the full $10, and we get
+                // $10.40 subtracted from our Tremendous balance.
+                //
+                // To offset this, we (the platform) take the fees off before
+                // we send the request to Tremendous. Afterwards, the method
+                // (Tremendous) will take 0% off the top of our $10.
                 PayoutFees {
-                    method_fee: fee,
-                    platform_fee: dec!(0),
+                    method_fee: dec!(0),
+                    platform_fee: fee,
                     exchange_rate,
                 }
             }
@@ -853,9 +861,19 @@ async fn get_tremendous_payout_methods(
         // https://help.tremendous.com/hc/en-us/articles/41472317536787-Premium-reward-options
         let fee = match product.category.as_str() {
             "paypal" | "venmo" => PayoutMethodFee {
-                percentage: dec!(0.06),
-                min: dec!(1.00),
-                max: Some(dec!(25.00)),
+                // If a user withdraws $10:
+                //
+                //   amount charged by Tremendous = X * 1.04 = $10.00
+                //
+                // We have to solve for X here:
+                //
+                //   X = $10.00 / 1.04
+                //
+                // So the percentage fee is `1 - (1 / 1.04)`
+                // Roughly 0.03846, not 0.04
+                percentage: dec!(1) - (dec!(1) / dec!(1.04)),
+                min: dec!(0.25),
+                max: None,
             },
             _ => PayoutMethodFee {
                 percentage: dec!(0),

From 3437387885bfe3e2ce0c3f65ec6155cfc3a88a2b Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Tue, 4 Nov 2025 17:51:07 -0800
Subject: [PATCH 19/64] Fix fee amount for Tremendous PayPal (#4720)

---
 apps/frontend/src/providers/creator-withdraw.ts             | 2 +-
 apps/frontend/src/public/news/feed/rss.xml                  | 4 ++--
 packages/blog/articles/creator-withdrawals-overhaul.md      | 6 +++++-
 .../blog/compiled/creator_withdrawals_overhaul.content.ts   | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/frontend/src/providers/creator-withdraw.ts b/apps/frontend/src/providers/creator-withdraw.ts
index 3ea3a6ae..002caa5b 100644
--- a/apps/frontend/src/providers/creator-withdraw.ts
+++ b/apps/frontend/src/providers/creator-withdraw.ts
@@ -480,7 +480,7 @@ export function createWithdrawContext(
 				label: paymentMethodMessages.paypalInternational,
 				icon: PayPalColorIcon,
 				methodId: internationalPaypalMethod.id,
-				fee: '≈ 6%, max $25',
+				fee: '≈ 3.84%',
 				type: 'tremendous',
 			})
 		}
diff --git a/apps/frontend/src/public/news/feed/rss.xml b/apps/frontend/src/public/news/feed/rss.xml
index d1fb960b..34e9b10a 100644
--- a/apps/frontend/src/public/news/feed/rss.xml
+++ b/apps/frontend/src/public/news/feed/rss.xml
@@ -4,7 +4,7 @@
         <description><![CDATA[Keep up-to-date on the latest news from Modrinth.]]></description>
         <link>https://modrinth.com/news/</link>
         <generator>@modrinth/blog</generator>
-        <lastBuildDate>Tue, 04 Nov 2025 21:20:17 GMT</lastBuildDate>
+        <lastBuildDate>Wed, 05 Nov 2025 01:42:11 GMT</lastBuildDate>
         <atom:link href="https://modrinth.com/news/feed/rss.xml" rel="self" type="application/rss+xml"/>
         <language><![CDATA[en]]></language>
         <item>
@@ -13,7 +13,7 @@
             <link>https://modrinth.com/news/article/creator-withdrawals-overhaul/</link>
             <guid isPermaLink="false">https://modrinth.com/news/article/creator-withdrawals-overhaul/</guid>
             <pubDate>Mon, 27 Oct 2025 23:30:00 GMT</pubDate>
-            <content:encoded>&lt;![CDATA[&lt;p&gt;Hey everyone! We&apos;ve heard your feedback on creator withdrawal options, and we&apos;re excited to share that more are finally coming to Modrinth! Over the past month, we&apos;ve been working on overhauling the withdrawal experience and supporting more withdraw methods.&lt;/p&gt;&lt;p&gt;There&apos;s a lot packed into this release, so let&apos;s dive in!&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./revenue-page-from-home.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;h2&gt;&lt;strong&gt;TL;DR&lt;/strong&gt;&lt;/h2&gt;&lt;ul&gt;&lt;li&gt;New revenue page and withdrawal flow&lt;/li&gt;&lt;li&gt;New bank transfer option for 29 countries&lt;/li&gt;&lt;li&gt;New crypto (USDC) option for hard to reach countries&lt;/li&gt;&lt;li&gt;PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)&lt;/li&gt;&lt;li&gt;Email notifications for payout updates (available, successful, failed, etc.)&lt;/li&gt;&lt;li&gt;New withdrawal compliance&lt;/li&gt;&lt;/ul&gt;&lt;hr&gt;&lt;h2&gt;Streamlined Withdrawal Experience&lt;/h2&gt;&lt;p&gt;A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Your revenue is now displayed as a balance, with a detailed breakdown below.&lt;/strong&gt;&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./balance-progress-bar.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;blockquote&gt;&lt;p&gt;Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that&apos;s still being processed.&lt;/p&gt;&lt;/blockquote&gt;&lt;p&gt;We&apos;ve also cleaned up the transaction history. You&apos;ll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.&lt;/p&gt;&lt;h2&gt;New Withdraw Methods&lt;/h2&gt;&lt;p&gt;The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./withdraw-example.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;p&gt;Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you&apos;ll immediately see all available methods and fees for your country, including a few new ones:&lt;/p&gt;&lt;h3&gt;Bank Transfers (29 Countries)&lt;/h3&gt;&lt;p&gt;You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.&lt;/p&gt;&lt;p&gt;We&apos;re working to expand this list, most notably to Canada, the UK, and countries across Asia, but there&apos;s no timeline &lt;em&gt;yet&lt;/em&gt;.&lt;/p&gt;&lt;table&gt;&lt;thead&gt;&lt;tr&gt;&lt;th&gt;Country&lt;/th&gt;&lt;th&gt;Currency&lt;/th&gt;&lt;th&gt;Transaction Fee&lt;/th&gt;&lt;th&gt;FX Fee&lt;/th&gt;&lt;th&gt;&lt;strong&gt;Total Fee&lt;/strong&gt;&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;&lt;tbody&gt;&lt;tr&gt;&lt;td&gt;🇺🇸 USA&lt;/td&gt;&lt;td&gt;USD&lt;/td&gt;&lt;td&gt;$0.50 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5% + $0.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇪🇺 EU&lt;/td&gt;&lt;td&gt;EUR&lt;/td&gt;&lt;td&gt;€1.00 + 1%&lt;/td&gt;&lt;td&gt;0.60%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.6% + €1.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇦🇷 Argentina&lt;/td&gt;&lt;td&gt;ARS&lt;/td&gt;&lt;td&gt;$0.00 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5%&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇲🇽 Mexico&lt;/td&gt;&lt;td&gt;MXN&lt;/td&gt;&lt;td&gt;$0.50 + 1%&lt;/td&gt;&lt;td&gt;0.90%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.9% + $0.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇧🇷 Brazil&lt;/td&gt;&lt;td&gt;BRL&lt;/td&gt;&lt;td&gt;$0.25 + 1%&lt;/td&gt;&lt;td&gt;1.30% (incl. IOF)&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.3% + $0.25&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇱 Chile&lt;/td&gt;&lt;td&gt;CLP&lt;/td&gt;&lt;td&gt;$1.20 + 1%&lt;/td&gt;&lt;td&gt;0.95%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.0% + $1.20&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇷 Costa Rica&lt;/td&gt;&lt;td&gt;CRC&lt;/td&gt;&lt;td&gt;$0.80 + 1%&lt;/td&gt;&lt;td&gt;1.05%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.1% + $0.80&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇵🇪 Peru (PEN)&lt;/td&gt;&lt;td&gt;PEN&lt;/td&gt;&lt;td&gt;$1.00 + 1%&lt;/td&gt;&lt;td&gt;1.15%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.1% + $1.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇿🇦 South Africa&lt;/td&gt;&lt;td&gt;ZAR&lt;/td&gt;&lt;td&gt;$1.50 + 1%&lt;/td&gt;&lt;td&gt;1.40%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.4% + $1.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇵🇪 Peru (USD)&lt;/td&gt;&lt;td&gt;USD&lt;/td&gt;&lt;td&gt;$5.00 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5% + $5.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇴 Colombia&lt;/td&gt;&lt;td&gt;COP&lt;/td&gt;&lt;td&gt;$0.35 + 1%&lt;/td&gt;&lt;td&gt;0.95% (incl. GMF)&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.0% + $0.35&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;&lt;p&gt;&lt;em&gt;Total Fee includes both transaction and FX fees.&lt;/em&gt;&lt;/p&gt;&lt;blockquote&gt;&lt;p&gt;&lt;strong&gt;Supported EU countries:&lt;/strong&gt; Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain&lt;/p&gt;&lt;/blockquote&gt;&lt;h3&gt;Crypto Withdrawals (USDC)&lt;/h3&gt;&lt;p&gt;We&apos;ve also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.&lt;/p&gt;&lt;h3&gt;PayPal &amp;amp; Venmo&lt;/h3&gt;&lt;p&gt;We&apos;ve moved PayPal and Venmo to two different methods depending on your country:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;strong&gt;United States:&lt;/strong&gt; PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Outside of the United States:&lt;/strong&gt; PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges a flat 6%, capped at $25.00. This should be an improvement over the old method for larger creators, where PayPal charged high uncapped fees for currency conversion.&lt;/li&gt;&lt;/ul&gt;&lt;h2&gt;New Email Notifications&lt;/h2&gt;&lt;p&gt;Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what&apos;s going on.&lt;/p&gt;&lt;p&gt;This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!&lt;/p&gt;&lt;h2&gt;Tax Compliance&lt;/h2&gt;&lt;p&gt;Last but not least, we&apos;re also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.&lt;/p&gt;&lt;p&gt;Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they&apos;ll be prompted to fill out a W-8 or W-9 tax form, depending on their country.&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;/news/article/creator-withdrawals-overhaul/tax-compliance.png&quot; alt=&quot;A snippet of the tax form stage of the new withdraw modal.&quot;&gt;&lt;/p&gt;&lt;p&gt;Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we&apos;re sending money to.&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! 💚&lt;/p&gt;]]&gt;</content:encoded>
+            <content:encoded>&lt;![CDATA[&lt;p&gt;&lt;strong&gt;Edited November 4, 2025&lt;/strong&gt; to correct information about international PayPal withdrawal fees&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Hey everyone! We&apos;ve heard your feedback on creator withdrawal options, and we&apos;re excited to share that more are finally coming to Modrinth! Over the past month, we&apos;ve been working on overhauling the withdrawal experience and supporting more withdraw methods.&lt;/p&gt;&lt;p&gt;There&apos;s a lot packed into this release, so let&apos;s dive in!&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./revenue-page-from-home.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;h2&gt;&lt;strong&gt;TL;DR&lt;/strong&gt;&lt;/h2&gt;&lt;ul&gt;&lt;li&gt;New revenue page and withdrawal flow&lt;/li&gt;&lt;li&gt;New bank transfer option for 29 countries&lt;/li&gt;&lt;li&gt;New crypto (USDC) option for hard to reach countries&lt;/li&gt;&lt;li&gt;PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)&lt;/li&gt;&lt;li&gt;Email notifications for payout updates (available, successful, failed, etc.)&lt;/li&gt;&lt;li&gt;New withdrawal compliance&lt;/li&gt;&lt;/ul&gt;&lt;hr&gt;&lt;h2&gt;Streamlined Withdrawal Experience&lt;/h2&gt;&lt;p&gt;A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Your revenue is now displayed as a balance, with a detailed breakdown below.&lt;/strong&gt;&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./balance-progress-bar.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;blockquote&gt;&lt;p&gt;Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that&apos;s still being processed.&lt;/p&gt;&lt;/blockquote&gt;&lt;p&gt;We&apos;ve also cleaned up the transaction history. You&apos;ll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.&lt;/p&gt;&lt;h2&gt;New Withdraw Methods&lt;/h2&gt;&lt;p&gt;The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.&lt;/p&gt;&lt;div class=&quot;video-wrapper mb-8&quot;&gt;&lt;video autoplay loop muted playsinline&gt;&lt;source src=&quot;./withdraw-example.mp4&quot; type=&quot;video/mp4&quot;&gt;&lt;/video&gt;&lt;/div&gt;&lt;p&gt;Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you&apos;ll immediately see all available methods and fees for your country, including a few new ones:&lt;/p&gt;&lt;h3&gt;Bank Transfers (29 Countries)&lt;/h3&gt;&lt;p&gt;You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.&lt;/p&gt;&lt;p&gt;We&apos;re working to expand this list, most notably to Canada, the UK, and countries across Asia, but there&apos;s no timeline &lt;em&gt;yet&lt;/em&gt;.&lt;/p&gt;&lt;table&gt;&lt;thead&gt;&lt;tr&gt;&lt;th&gt;Country&lt;/th&gt;&lt;th&gt;Currency&lt;/th&gt;&lt;th&gt;Transaction Fee&lt;/th&gt;&lt;th&gt;FX Fee&lt;/th&gt;&lt;th&gt;&lt;strong&gt;Total Fee&lt;/strong&gt;&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;&lt;tbody&gt;&lt;tr&gt;&lt;td&gt;🇺🇸 USA&lt;/td&gt;&lt;td&gt;USD&lt;/td&gt;&lt;td&gt;$0.50 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5% + $0.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇪🇺 EU&lt;/td&gt;&lt;td&gt;EUR&lt;/td&gt;&lt;td&gt;€1.00 + 1%&lt;/td&gt;&lt;td&gt;0.60%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.6% + €1.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇦🇷 Argentina&lt;/td&gt;&lt;td&gt;ARS&lt;/td&gt;&lt;td&gt;$0.00 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5%&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇲🇽 Mexico&lt;/td&gt;&lt;td&gt;MXN&lt;/td&gt;&lt;td&gt;$0.50 + 1%&lt;/td&gt;&lt;td&gt;0.90%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.9% + $0.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇧🇷 Brazil&lt;/td&gt;&lt;td&gt;BRL&lt;/td&gt;&lt;td&gt;$0.25 + 1%&lt;/td&gt;&lt;td&gt;1.30% (incl. IOF)&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.3% + $0.25&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇱 Chile&lt;/td&gt;&lt;td&gt;CLP&lt;/td&gt;&lt;td&gt;$1.20 + 1%&lt;/td&gt;&lt;td&gt;0.95%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.0% + $1.20&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇷 Costa Rica&lt;/td&gt;&lt;td&gt;CRC&lt;/td&gt;&lt;td&gt;$0.80 + 1%&lt;/td&gt;&lt;td&gt;1.05%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.1% + $0.80&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇵🇪 Peru (PEN)&lt;/td&gt;&lt;td&gt;PEN&lt;/td&gt;&lt;td&gt;$1.00 + 1%&lt;/td&gt;&lt;td&gt;1.15%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.1% + $1.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇿🇦 South Africa&lt;/td&gt;&lt;td&gt;ZAR&lt;/td&gt;&lt;td&gt;$1.50 + 1%&lt;/td&gt;&lt;td&gt;1.40%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.4% + $1.50&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇵🇪 Peru (USD)&lt;/td&gt;&lt;td&gt;USD&lt;/td&gt;&lt;td&gt;$5.00 + 1%&lt;/td&gt;&lt;td&gt;0.50%&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~1.5% + $5.00&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;🇨🇴 Colombia&lt;/td&gt;&lt;td&gt;COP&lt;/td&gt;&lt;td&gt;$0.35 + 1%&lt;/td&gt;&lt;td&gt;0.95% (incl. GMF)&lt;/td&gt;&lt;td&gt;&lt;strong&gt;~2.0% + $0.35&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;&lt;p&gt;&lt;em&gt;Total Fee includes both transaction and FX fees.&lt;/em&gt;&lt;/p&gt;&lt;blockquote&gt;&lt;p&gt;&lt;strong&gt;Supported EU countries:&lt;/strong&gt; Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain&lt;/p&gt;&lt;/blockquote&gt;&lt;h3&gt;Crypto Withdrawals (USDC)&lt;/h3&gt;&lt;p&gt;We&apos;ve also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.&lt;/p&gt;&lt;h3&gt;PayPal &amp;amp; Venmo&lt;/h3&gt;&lt;p&gt;We&apos;ve moved PayPal and Venmo to two different methods depending on your country:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;strong&gt;United States:&lt;/strong&gt; PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Outside of the United States:&lt;/strong&gt; PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges approximately 3.84% on the total amount. This should be an improvement over the old method, which had hidden FX fees that could end up much higher.&lt;/li&gt;&lt;/ul&gt;&lt;h2&gt;New Email Notifications&lt;/h2&gt;&lt;p&gt;Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what&apos;s going on.&lt;/p&gt;&lt;p&gt;This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!&lt;/p&gt;&lt;h2&gt;Tax Compliance&lt;/h2&gt;&lt;p&gt;Last but not least, we&apos;re also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.&lt;/p&gt;&lt;p&gt;Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they&apos;ll be prompted to fill out a W-8 or W-9 tax form, depending on their country.&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;/news/article/creator-withdrawals-overhaul/tax-compliance.png&quot; alt=&quot;A snippet of the tax form stage of the new withdraw modal.&quot;&gt;&lt;/p&gt;&lt;p&gt;Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we&apos;re sending money to.&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! 💚&lt;/p&gt;]]&gt;</content:encoded>
         </item>
         <item>
             <title><![CDATA[Standing By Our Values]]></title>
diff --git a/packages/blog/articles/creator-withdrawals-overhaul.md b/packages/blog/articles/creator-withdrawals-overhaul.md
index 5305b955..9514b459 100644
--- a/packages/blog/articles/creator-withdrawals-overhaul.md
+++ b/packages/blog/articles/creator-withdrawals-overhaul.md
@@ -5,6 +5,10 @@ date: 2025-10-27T16:30:00-07:00
 authors: ['AJfd8YH6', 'bOHH0P9Z', 'xSQqYYIN']
 ---
 
+**Edited November 4, 2025** to correct information about international PayPal withdrawal fees
+
+---
+
 Hey everyone! We've heard your feedback on creator withdrawal options, and we're excited to share that more are finally coming to Modrinth! Over the past month, we've been working on overhauling the withdrawal experience and supporting more withdraw methods.
 
 There's a lot packed into this release, so let's dive in!
@@ -87,7 +91,7 @@ We've also added USDC withdrawals on the Polygon network. This option is availab
 We've moved PayPal and Venmo to two different methods depending on your country:
 
 - **United States:** PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.
-- **Outside of the United States:** PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges a flat 6%, capped at $25.00. This should be an improvement over the old method for larger creators, where PayPal charged high uncapped fees for currency conversion.
+- **Outside of the United States:** PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges approximately 3.84% on the total amount. This should be an improvement over the old method, which had hidden FX fees that could end up much higher.
 
 ## New Email Notifications
 
diff --git a/packages/blog/compiled/creator_withdrawals_overhaul.content.ts b/packages/blog/compiled/creator_withdrawals_overhaul.content.ts
index 4a0bed35..1d610ae6 100644
--- a/packages/blog/compiled/creator_withdrawals_overhaul.content.ts
+++ b/packages/blog/compiled/creator_withdrawals_overhaul.content.ts
@@ -1,2 +1,2 @@
 // AUTO-GENERATED FILE - DO NOT EDIT
-export const html = `<p>Hey everyone! We've heard your feedback on creator withdrawal options, and we're excited to share that more are finally coming to Modrinth! Over the past month, we've been working on overhauling the withdrawal experience and supporting more withdraw methods.</p><p>There's a lot packed into this release, so let's dive in!</p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./revenue-page-from-home.mp4" type="video/mp4"></video></div><h2><strong>TL;DR</strong></h2><ul><li>New revenue page and withdrawal flow</li><li>New bank transfer option for 29 countries</li><li>New crypto (USDC) option for hard to reach countries</li><li>PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)</li><li>Email notifications for payout updates (available, successful, failed, etc.)</li><li>New withdrawal compliance</li></ul><hr><h2>Streamlined Withdrawal Experience</h2><p>A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.</p><p><strong>Your revenue is now displayed as a balance, with a detailed breakdown below.</strong></p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./balance-progress-bar.mp4" type="video/mp4"></video></div><blockquote><p>Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that's still being processed.</p></blockquote><p>We've also cleaned up the transaction history. You'll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.</p><h2>New Withdraw Methods</h2><p>The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.</p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./withdraw-example.mp4" type="video/mp4"></video></div><p>Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you'll immediately see all available methods and fees for your country, including a few new ones:</p><h3>Bank Transfers (29 Countries)</h3><p>You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.</p><p>We're working to expand this list, most notably to Canada, the UK, and countries across Asia, but there's no timeline <em>yet</em>.</p><table><thead><tr><th>Country</th><th>Currency</th><th>Transaction Fee</th><th>FX Fee</th><th><strong>Total Fee</strong></th></tr></thead><tbody><tr><td>🇺🇸 USA</td><td>USD</td><td>$0.50 + 1%</td><td>0.50%</td><td><strong>~1.5% + $0.50</strong></td></tr><tr><td>🇪🇺 EU</td><td>EUR</td><td>€1.00 + 1%</td><td>0.60%</td><td><strong>~1.6% + €1.00</strong></td></tr><tr><td>🇦🇷 Argentina</td><td>ARS</td><td>$0.00 + 1%</td><td>0.50%</td><td><strong>~1.5%</strong></td></tr><tr><td>🇲🇽 Mexico</td><td>MXN</td><td>$0.50 + 1%</td><td>0.90%</td><td><strong>~1.9% + $0.50</strong></td></tr><tr><td>🇧🇷 Brazil</td><td>BRL</td><td>$0.25 + 1%</td><td>1.30% (incl. IOF)</td><td><strong>~2.3% + $0.25</strong></td></tr><tr><td>🇨🇱 Chile</td><td>CLP</td><td>$1.20 + 1%</td><td>0.95%</td><td><strong>~2.0% + $1.20</strong></td></tr><tr><td>🇨🇷 Costa Rica</td><td>CRC</td><td>$0.80 + 1%</td><td>1.05%</td><td><strong>~2.1% + $0.80</strong></td></tr><tr><td>🇵🇪 Peru (PEN)</td><td>PEN</td><td>$1.00 + 1%</td><td>1.15%</td><td><strong>~2.1% + $1.00</strong></td></tr><tr><td>🇿🇦 South Africa</td><td>ZAR</td><td>$1.50 + 1%</td><td>1.40%</td><td><strong>~2.4% + $1.50</strong></td></tr><tr><td>🇵🇪 Peru (USD)</td><td>USD</td><td>$5.00 + 1%</td><td>0.50%</td><td><strong>~1.5% + $5.00</strong></td></tr><tr><td>🇨🇴 Colombia</td><td>COP</td><td>$0.35 + 1%</td><td>0.95% (incl. GMF)</td><td><strong>~2.0% + $0.35</strong></td></tr></tbody></table><p><em>Total Fee includes both transaction and FX fees.</em></p><blockquote><p><strong>Supported EU countries:</strong> Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain</p></blockquote><h3>Crypto Withdrawals (USDC)</h3><p>We've also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.</p><h3>PayPal &amp; Venmo</h3><p>We've moved PayPal and Venmo to two different methods depending on your country:</p><ul><li><strong>United States:</strong> PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.</li><li><strong>Outside of the United States:</strong> PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges a flat 6%, capped at $25.00. This should be an improvement over the old method for larger creators, where PayPal charged high uncapped fees for currency conversion.</li></ul><h2>New Email Notifications</h2><p>Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what's going on.</p><p>This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!</p><h2>Tax Compliance</h2><p>Last but not least, we're also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.</p><p>Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they'll be prompted to fill out a W-8 or W-9 tax form, depending on their country.</p><p><img src="/news/article/creator-withdrawals-overhaul/tax-compliance.png" alt="A snippet of the tax form stage of the new withdraw modal."></p><p>Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we're sending money to.</p><hr><p>Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! 💚</p>`;
+export const html = `<p><strong>Edited November 4, 2025</strong> to correct information about international PayPal withdrawal fees</p><hr><p>Hey everyone! We've heard your feedback on creator withdrawal options, and we're excited to share that more are finally coming to Modrinth! Over the past month, we've been working on overhauling the withdrawal experience and supporting more withdraw methods.</p><p>There's a lot packed into this release, so let's dive in!</p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./revenue-page-from-home.mp4" type="video/mp4"></video></div><h2><strong>TL;DR</strong></h2><ul><li>New revenue page and withdrawal flow</li><li>New bank transfer option for 29 countries</li><li>New crypto (USDC) option for hard to reach countries</li><li>PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)</li><li>Email notifications for payout updates (available, successful, failed, etc.)</li><li>New withdrawal compliance</li></ul><hr><h2>Streamlined Withdrawal Experience</h2><p>A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.</p><p><strong>Your revenue is now displayed as a balance, with a detailed breakdown below.</strong></p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./balance-progress-bar.mp4" type="video/mp4"></video></div><blockquote><p>Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that's still being processed.</p></blockquote><p>We've also cleaned up the transaction history. You'll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.</p><h2>New Withdraw Methods</h2><p>The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.</p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./withdraw-example.mp4" type="video/mp4"></video></div><p>Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you'll immediately see all available methods and fees for your country, including a few new ones:</p><h3>Bank Transfers (29 Countries)</h3><p>You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.</p><p>We're working to expand this list, most notably to Canada, the UK, and countries across Asia, but there's no timeline <em>yet</em>.</p><table><thead><tr><th>Country</th><th>Currency</th><th>Transaction Fee</th><th>FX Fee</th><th><strong>Total Fee</strong></th></tr></thead><tbody><tr><td>🇺🇸 USA</td><td>USD</td><td>$0.50 + 1%</td><td>0.50%</td><td><strong>~1.5% + $0.50</strong></td></tr><tr><td>🇪🇺 EU</td><td>EUR</td><td>€1.00 + 1%</td><td>0.60%</td><td><strong>~1.6% + €1.00</strong></td></tr><tr><td>🇦🇷 Argentina</td><td>ARS</td><td>$0.00 + 1%</td><td>0.50%</td><td><strong>~1.5%</strong></td></tr><tr><td>🇲🇽 Mexico</td><td>MXN</td><td>$0.50 + 1%</td><td>0.90%</td><td><strong>~1.9% + $0.50</strong></td></tr><tr><td>🇧🇷 Brazil</td><td>BRL</td><td>$0.25 + 1%</td><td>1.30% (incl. IOF)</td><td><strong>~2.3% + $0.25</strong></td></tr><tr><td>🇨🇱 Chile</td><td>CLP</td><td>$1.20 + 1%</td><td>0.95%</td><td><strong>~2.0% + $1.20</strong></td></tr><tr><td>🇨🇷 Costa Rica</td><td>CRC</td><td>$0.80 + 1%</td><td>1.05%</td><td><strong>~2.1% + $0.80</strong></td></tr><tr><td>🇵🇪 Peru (PEN)</td><td>PEN</td><td>$1.00 + 1%</td><td>1.15%</td><td><strong>~2.1% + $1.00</strong></td></tr><tr><td>🇿🇦 South Africa</td><td>ZAR</td><td>$1.50 + 1%</td><td>1.40%</td><td><strong>~2.4% + $1.50</strong></td></tr><tr><td>🇵🇪 Peru (USD)</td><td>USD</td><td>$5.00 + 1%</td><td>0.50%</td><td><strong>~1.5% + $5.00</strong></td></tr><tr><td>🇨🇴 Colombia</td><td>COP</td><td>$0.35 + 1%</td><td>0.95% (incl. GMF)</td><td><strong>~2.0% + $0.35</strong></td></tr></tbody></table><p><em>Total Fee includes both transaction and FX fees.</em></p><blockquote><p><strong>Supported EU countries:</strong> Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain</p></blockquote><h3>Crypto Withdrawals (USDC)</h3><p>We've also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.</p><h3>PayPal &amp; Venmo</h3><p>We've moved PayPal and Venmo to two different methods depending on your country:</p><ul><li><strong>United States:</strong> PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.</li><li><strong>Outside of the United States:</strong> PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges approximately 3.84% on the total amount. This should be an improvement over the old method, which had hidden FX fees that could end up much higher.</li></ul><h2>New Email Notifications</h2><p>Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what's going on.</p><p>This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!</p><h2>Tax Compliance</h2><p>Last but not least, we're also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.</p><p>Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they'll be prompted to fill out a W-8 or W-9 tax form, depending on their country.</p><p><img src="/news/article/creator-withdrawals-overhaul/tax-compliance.png" alt="A snippet of the tax form stage of the new withdraw modal."></p><p>Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we're sending money to.</p><hr><p>Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! 💚</p>`;

From 1bad1a57b0e32baeeafd5d759c6342df05df11aa Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Tue, 4 Nov 2025 18:29:18 -0800
Subject: [PATCH 20/64] changelog

---
 packages/utils/changelog.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 4371787e..069176fb 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,12 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-11-04T18:20:00-07:00`,
+		product: 'web',
+		body: `## Improvements
+- Fixed an issue with PayPal International fees.`,
+	},
 	{
 		date: `2025-11-04T16:20:00-07:00`,
 		product: 'web',

From 7437a833ef7508cb8de6add5439b077cd8eb070b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Talbot?=
 <108630700+fetchfern@users.noreply.github.com>
Date: Wed, 5 Nov 2025 11:43:59 -0800
Subject: [PATCH 21/64] Fix payout notifications (#4707)

* Add limit to payouts_values_notifications synchronizer

* Set payout notification threshold to $1

* Fix formatting

* Query cache
---
 ...c6dfc60c93c6cecf947c2f96b43926ce5147c4aafe9089cd.json} | 4 ++--
 ...107b3ffaef3f153b01c2f9d8b14a0fa8078cfd908aa3255f.json} | 8 +++++---
 apps/labrinth/src/database/models/notification_item.rs    | 2 +-
 .../src/database/models/payouts_values_notifications.rs   | 3 +++
 apps/labrinth/src/queue/email/templates.rs                | 2 +-
 apps/labrinth/src/queue/payouts/mod.rs                    | 1 +
 6 files changed, 13 insertions(+), 7 deletions(-)
 rename apps/labrinth/.sqlx/{query-7910f8c982de4c9c8f3b40cecda741d6d43c3084b7f347e5da31c353cc9bae53.json => query-807d42d4aab8312fc6dfc60c93c6cecf947c2f96b43926ce5147c4aafe9089cd.json} (89%)
 rename apps/labrinth/.sqlx/{query-603c1109f8c5a9a5b45b3f531fcb6b597ac01c831fbbcb296fc5ba08cc622482.json => query-ba8b07d9cd62d9ec107b3ffaef3f153b01c2f9d8b14a0fa8078cfd908aa3255f.json} (58%)

diff --git a/apps/labrinth/.sqlx/query-7910f8c982de4c9c8f3b40cecda741d6d43c3084b7f347e5da31c353cc9bae53.json b/apps/labrinth/.sqlx/query-807d42d4aab8312fc6dfc60c93c6cecf947c2f96b43926ce5147c4aafe9089cd.json
similarity index 89%
rename from apps/labrinth/.sqlx/query-7910f8c982de4c9c8f3b40cecda741d6d43c3084b7f347e5da31c353cc9bae53.json
rename to apps/labrinth/.sqlx/query-807d42d4aab8312fc6dfc60c93c6cecf947c2f96b43926ce5147c4aafe9089cd.json
index d245c543..9380c69d 100644
--- a/apps/labrinth/.sqlx/query-7910f8c982de4c9c8f3b40cecda741d6d43c3084b7f347e5da31c353cc9bae53.json
+++ b/apps/labrinth/.sqlx/query-807d42d4aab8312fc6dfc60c93c6cecf947c2f96b43926ce5147c4aafe9089cd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            WITH\n              period_payouts AS (\n                SELECT\n                  ids.notification_id,\n                  ids.user_id,\n                  ids.date_available,\n                  FLOOR(COALESCE(SUM(pv.amount), 0.0) * 100) :: BIGINT sum -- Convert to cents\n                  FROM UNNEST($1::bigint[], $2::bigint[], $3::timestamptz[]) AS ids(notification_id, user_id, date_available)\n                LEFT JOIN payouts_values pv ON pv.user_id = ids.user_id AND pv.date_available = ids.date_available\n                GROUP BY ids.user_id, ids.notification_id, ids.date_available\n              )\n            INSERT INTO notifications (\n                id, user_id, body\n            )\n            SELECT\n              notification_id id,\n              user_id,\n              JSONB_BUILD_OBJECT(\n                'type', 'payout_available',\n                'date_available', to_jsonb(date_available),\n                'amount', to_jsonb(sum)\n              ) body\n            FROM period_payouts\n            WHERE sum > 0\n            ",
+  "query": "\n            WITH\n              period_payouts AS (\n                SELECT\n                  ids.notification_id,\n                  ids.user_id,\n                  ids.date_available,\n                  FLOOR(COALESCE(SUM(pv.amount), 0.0) * 100) :: BIGINT sum -- Convert to cents\n                  FROM UNNEST($1::bigint[], $2::bigint[], $3::timestamptz[]) AS ids(notification_id, user_id, date_available)\n                LEFT JOIN payouts_values pv ON pv.user_id = ids.user_id AND pv.date_available = ids.date_available\n                GROUP BY ids.user_id, ids.notification_id, ids.date_available\n              )\n            INSERT INTO notifications (\n                id, user_id, body\n            )\n            SELECT\n              notification_id id,\n              user_id,\n              JSONB_BUILD_OBJECT(\n                'type', 'payout_available',\n                'date_available', to_jsonb(date_available),\n                'amount', to_jsonb(sum)\n              ) body\n            FROM period_payouts\n            WHERE sum >= 100\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -12,5 +12,5 @@
     },
     "nullable": []
   },
-  "hash": "7910f8c982de4c9c8f3b40cecda741d6d43c3084b7f347e5da31c353cc9bae53"
+  "hash": "807d42d4aab8312fc6dfc60c93c6cecf947c2f96b43926ce5147c4aafe9089cd"
 }
diff --git a/apps/labrinth/.sqlx/query-603c1109f8c5a9a5b45b3f531fcb6b597ac01c831fbbcb296fc5ba08cc622482.json b/apps/labrinth/.sqlx/query-ba8b07d9cd62d9ec107b3ffaef3f153b01c2f9d8b14a0fa8078cfd908aa3255f.json
similarity index 58%
rename from apps/labrinth/.sqlx/query-603c1109f8c5a9a5b45b3f531fcb6b597ac01c831fbbcb296fc5ba08cc622482.json
rename to apps/labrinth/.sqlx/query-ba8b07d9cd62d9ec107b3ffaef3f153b01c2f9d8b14a0fa8078cfd908aa3255f.json
index 3d0c4126..d2ccf628 100644
--- a/apps/labrinth/.sqlx/query-603c1109f8c5a9a5b45b3f531fcb6b597ac01c831fbbcb296fc5ba08cc622482.json
+++ b/apps/labrinth/.sqlx/query-ba8b07d9cd62d9ec107b3ffaef3f153b01c2f9d8b14a0fa8078cfd908aa3255f.json
@@ -1,12 +1,14 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n\t\tINSERT INTO payouts_values_notifications (date_available, user_id, notified)\n\t\tSELECT DISTINCT date_available, user_id, false notified\n\t\tFROM payouts_values\n\t\tWHERE date_available > NOW()\n\t\tON CONFLICT (date_available, user_id) DO NOTHING\n\t\t",
+  "query": "\n\t\tINSERT INTO payouts_values_notifications (date_available, user_id, notified)\n\t\tSELECT DISTINCT date_available, user_id, false notified\n\t\tFROM payouts_values\n\t\tWHERE date_available > NOW()\n\t\tLIMIT $1\n\t\tON CONFLICT (date_available, user_id) DO NOTHING\n\t\t",
   "describe": {
     "columns": [],
     "parameters": {
-      "Left": []
+      "Left": [
+        "Int8"
+      ]
     },
     "nullable": []
   },
-  "hash": "603c1109f8c5a9a5b45b3f531fcb6b597ac01c831fbbcb296fc5ba08cc622482"
+  "hash": "ba8b07d9cd62d9ec107b3ffaef3f153b01c2f9d8b14a0fa8078cfd908aa3255f"
 }
diff --git a/apps/labrinth/src/database/models/notification_item.rs b/apps/labrinth/src/database/models/notification_item.rs
index aad14784..bf3d5e7d 100644
--- a/apps/labrinth/src/database/models/notification_item.rs
+++ b/apps/labrinth/src/database/models/notification_item.rs
@@ -81,7 +81,7 @@ impl NotificationBuilder {
                 'amount', to_jsonb(sum)
               ) body
             FROM period_payouts
-            WHERE sum > 0
+            WHERE sum >= 100
             ",
             &notification_ids[..],
             &users_raw_ids[..],
diff --git a/apps/labrinth/src/database/models/payouts_values_notifications.rs b/apps/labrinth/src/database/models/payouts_values_notifications.rs
index 0483d2ab..12dbf3f9 100644
--- a/apps/labrinth/src/database/models/payouts_values_notifications.rs
+++ b/apps/labrinth/src/database/models/payouts_values_notifications.rs
@@ -56,6 +56,7 @@ impl PayoutsValuesNotification {
 
 pub async fn synchronize_future_payout_values(
     exec: impl sqlx::PgExecutor<'_>,
+    limit: i64,
 ) -> Result<(), DatabaseError> {
     sqlx::query!(
         "
@@ -63,8 +64,10 @@ pub async fn synchronize_future_payout_values(
 		SELECT DISTINCT date_available, user_id, false notified
 		FROM payouts_values
 		WHERE date_available > NOW()
+		LIMIT $1
 		ON CONFLICT (date_available, user_id) DO NOTHING
 		",
+        limit,
     )
     .execute(exec)
     .await?;
diff --git a/apps/labrinth/src/queue/email/templates.rs b/apps/labrinth/src/queue/email/templates.rs
index c2234fef..dafcd15b 100644
--- a/apps/labrinth/src/queue/email/templates.rs
+++ b/apps/labrinth/src/queue/email/templates.rs
@@ -631,7 +631,7 @@ async fn collect_template_variables(
 
             map.insert(
                 PAYOUTAVAILABLE_AMOUNT,
-                format!("USD${:.2}", *amount as f64 / 100.0),
+                format!("${:.2} USD", *amount as f64 / 100.0),
             );
 
             Ok(EmailTemplate::Static(map))
diff --git a/apps/labrinth/src/queue/payouts/mod.rs b/apps/labrinth/src/queue/payouts/mod.rs
index 5260db51..d40a7d91 100644
--- a/apps/labrinth/src/queue/payouts/mod.rs
+++ b/apps/labrinth/src/queue/payouts/mod.rs
@@ -1355,6 +1355,7 @@ pub async fn index_payouts_notifications(
 
     payouts_values_notifications::synchronize_future_payout_values(
         &mut *transaction,
+        200,
     )
     .await?;
     let items = payouts_values_notifications::PayoutsValuesNotification::unnotified_users_with_available_payouts_with_limit(&mut *transaction, 200).await?;

From 7674433f88193073c8d2d349457a213f1f454568 Mon Sep 17 00:00:00 2001
From: Jerozgen <jerozgen@gmail.com>
Date: Thu, 6 Nov 2025 13:37:37 +0300
Subject: [PATCH 22/64] Improve nags translation strings (#4693)

---
 .../ui/moderation/ModerationProjectNags.vue   |  2 +-
 apps/frontend/src/locales/en-US/index.json    |  2 +-
 packages/moderation/src/data/nags/core.ts     | 24 +++++++------------
 .../moderation/src/data/nags/description.ts   |  6 ++---
 packages/moderation/src/data/nags/links.ts    |  5 ++--
 packages/moderation/src/data/nags/tags.ts     |  6 ++---
 .../moderation/src/locales/en-US/index.json   | 22 ++++++++---------
 7 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue b/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue
index 9b773814..7b0f19d0 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue
@@ -139,7 +139,7 @@ const messages = defineMessages({
 	resubmitForReviewDesc: {
 		id: 'project-moderation-nags.resubmit-for-review-desc',
 		defaultMessage:
-			"Your project has been {status} by Modrinth's staff. In most cases, you can resubmit for review after addressing the staff's message.",
+			"Your project has been {status, select, rejected {rejected} withheld {withheld} other {{status}}} by Modrinth's staff. In most cases, you can resubmit for review after addressing the staff's message.",
 	},
 	visitModerationPage: {
 		id: 'project-moderation-nags.visit-moderation-page',
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index d478056d..0fde57f3 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -1887,7 +1887,7 @@
     "message": "Resubmit for review"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Your project has been {status} by Modrinth's staff. In most cases, you can resubmit for review after addressing the staff's message."
+    "message": "Your project has been {status, select, rejected {rejected} withheld {withheld} other {{status}}} by Modrinth's staff. In most cases, you can resubmit for review after addressing the staff's message."
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "You must complete the required steps in the publishing checklist!"
diff --git a/packages/moderation/src/data/nags/core.ts b/packages/moderation/src/data/nags/core.ts
index 32efbce2..da7d416f 100644
--- a/packages/moderation/src/data/nags/core.ts
+++ b/packages/moderation/src/data/nags/core.ts
@@ -1,4 +1,3 @@
-import { formatProjectType } from '@modrinth/utils'
 import { defineMessage, useVIntl } from '@vintl/vintl'
 
 import type { Nag, NagContext } from '../../types/nags'
@@ -8,7 +7,7 @@ export const coreNags: Nag[] = [
 		id: 'moderator-feedback',
 		title: defineMessage({
 			id: 'nags.moderator-feedback.title',
-			defaultMessage: 'Review moderator feedback',
+			defaultMessage: 'Review feedback',
 		}),
 		description: defineMessage({
 			id: 'nags.moderator-feedback.description',
@@ -100,23 +99,15 @@ export const coreNags: Nag[] = [
 		}),
 		description: (context: NagContext) => {
 			const { formatMessage } = useVIntl()
-			const projectType = formatProjectType(context.project.project_type).toLowerCase()
-			let msg = ''
-			if (context.project.project_type === 'resourcepack') {
-				msg =
-					', except for audio or localization packs. If this describes your pack, please select the appropriate tag'
-			}
-			const resourcepackMessage = msg
 
 			return formatMessage(
 				defineMessage({
 					id: 'nags.upload-gallery-image.description',
 					defaultMessage:
-						'At least one gallery image is required to showcase the content of your {type}{resourcepackMessage}.',
+						'At least one gallery image is required to showcase the content of your {type, select, resourcepack {resource pack, except for audio or localization packs. If this describes your pack, please select the appropriate tag} shader {shader} other {project}}.',
 				}),
 				{
-					type: projectType,
-					resourcepackMessage: resourcepackMessage,
+					type: context.project.project_type,
 				},
 			)
 		},
@@ -232,10 +223,10 @@ export const coreNags: Nag[] = [
 			return formatMessage(
 				defineMessage({
 					id: 'nags.select-environments.description',
-					defaultMessage: `Select the environments your {projectType} functions on.`,
+					defaultMessage: `Select the environments your {type, select, mod {mod} modpack {modpack} other {project}} functions on.`,
 				}),
 				{
-					projectType: formatProjectType(context.project.project_type).toLowerCase(),
+					type: context.project.project_type,
 				},
 			)
 		},
@@ -272,10 +263,11 @@ export const coreNags: Nag[] = [
 			return formatMessage(
 				defineMessage({
 					id: 'nags.select-license.description',
-					defaultMessage: 'Select the license your {projectType} is distributed under.',
+					defaultMessage:
+						'Select the license your {type, select, mod {mod} modpack {modpack} resourcepack {resource pack} shader {shader} plugin {plugin} datapack {data pack} other {project}} is distributed under.',
 				}),
 				{
-					projectType: formatProjectType(context.project.project_type).toLowerCase(),
+					type: context.project.project_type,
 				},
 			)
 		},
diff --git a/packages/moderation/src/data/nags/description.ts b/packages/moderation/src/data/nags/description.ts
index 5e8ba316..722f5117 100644
--- a/packages/moderation/src/data/nags/description.ts
+++ b/packages/moderation/src/data/nags/description.ts
@@ -127,7 +127,7 @@ export const descriptionNags: Nag[] = [
 				defineMessage({
 					id: 'nags.description-too-short.description',
 					defaultMessage:
-						'Your description is {length} readable characters. At least {minChars} characters is recommended to create a clear and informative description.',
+						'Your description is {length, plural, one {# readable character} other {# readable characters}}. At least {minChars, plural, one {# character} other {# characters}} is recommended to create a clear and informative description.',
 				}),
 				{
 					length: readableLength,
@@ -198,7 +198,7 @@ export const descriptionNags: Nag[] = [
 				defineMessage({
 					id: 'nags.summary-too-short.description',
 					defaultMessage:
-						'Your summary is {length} characters. At least {minChars} characters is recommended to create an informative and enticing summary.',
+						'Your summary is {length, plural, one {# character} other {# characters}}. At least {minChars, plural, one {# character} other {# characters}} is recommended to create an informative and enticing summary.',
 				}),
 				{
 					length: context.project.description?.length || 0,
@@ -292,7 +292,7 @@ export const descriptionNags: Nag[] = [
 		description: defineMessage({
 			id: 'nags.title-contains-technical-info.description',
 			defaultMessage:
-				"Keeping your project's Name clean and makes it memorable easier to find. Version and loader information is automatically displayed alongside your project.",
+				"Keeping your project's Name clean makes it memorable and easier to find. Version and loader information is automatically displayed alongside your project.",
 		}),
 		status: 'warning',
 		shouldShow: (context: NagContext) => {
diff --git a/packages/moderation/src/data/nags/links.ts b/packages/moderation/src/data/nags/links.ts
index 4dbc2a97..297d5ce1 100644
--- a/packages/moderation/src/data/nags/links.ts
+++ b/packages/moderation/src/data/nags/links.ts
@@ -1,4 +1,3 @@
-import { formatProjectType } from '@modrinth/utils'
 import { defineMessage, useVIntl } from '@vintl/vintl'
 
 import type { Nag, NagContext } from '../../types/nags'
@@ -218,10 +217,10 @@ export const linksNags: Nag[] = [
 				defineMessage({
 					id: 'nags.gpl-license-source-required.description',
 					defaultMessage:
-						'Your {projectType} uses a license which requires source code to be available. Please provide a source code link or sources file for each additional version, or consider using a different license.',
+						'Your {type, select, mod {mod} plugin {plugin} other {project}} uses a license which requires source code to be available. Please provide a source code link or sources file for each additional version, or consider using a different license.',
 				}),
 				{
-					projectType: formatProjectType(context.project.project_type).toLowerCase(),
+					type: context.project.project_type,
 				},
 			)
 		},
diff --git a/packages/moderation/src/data/nags/tags.ts b/packages/moderation/src/data/nags/tags.ts
index c900941c..9931da62 100644
--- a/packages/moderation/src/data/nags/tags.ts
+++ b/packages/moderation/src/data/nags/tags.ts
@@ -39,7 +39,7 @@ export const tagsNags: Nag[] = [
 				defineMessage({
 					id: 'nags.too-many-tags.description',
 					defaultMessage:
-						"You've selected {tagCount} tags. Consider reducing to {maxTagCount} or fewer to make sure your project appears in relevant search results.",
+						"You've selected {tagCount, plural, one {# tag} other {# tags}}. Consider reducing to {maxTagCount} or fewer to make sure your project appears in relevant search results.",
 				}),
 				{
 					tagCount,
@@ -82,7 +82,7 @@ export const tagsNags: Nag[] = [
 				defineMessage({
 					id: 'nags.multiple-resolution-tags.description',
 					defaultMessage:
-						"You've selected {count} resolution tags ({tags}). Resource packs should typically only have one resolution tag that matches their primary resolution.",
+						"You've selected {count, plural, one {# resolution tag} other {# resolution tags}} ({tags}). Resource packs should typically only have one resolution tag that matches their primary resolution.",
 				}),
 				{
 					count: resolutionTags.length,
@@ -129,7 +129,7 @@ export const tagsNags: Nag[] = [
 				defineMessage({
 					id: 'nags.all-tags-selected.description',
 					defaultMessage:
-						"You've selected all {totalAvailableTags} available tags. This defeats the purpose of tags, which are meant to help users find relevant projects. Please select only the tags that are relevant to your project.",
+						"You've selected all {totalAvailableTags, plural, one {# available tag} other {# available tags}}. This defeats the purpose of tags, which are meant to help users find relevant projects. Please select only the tags that are relevant to your project.",
 				}),
 				{
 					totalAvailableTags,
diff --git a/packages/moderation/src/locales/en-US/index.json b/packages/moderation/src/locales/en-US/index.json
index 64af46a5..31bb3c38 100644
--- a/packages/moderation/src/locales/en-US/index.json
+++ b/packages/moderation/src/locales/en-US/index.json
@@ -18,13 +18,13 @@
     "defaultMessage": "Add external links"
   },
   "nags.all-tags-selected.description": {
-    "defaultMessage": "You've selected all {totalAvailableTags} available tags. This defeats the purpose of tags, which are meant to help users find relevant projects. Please select only the tags that are relevant to your project."
+    "defaultMessage": "You've selected all {totalAvailableTags, plural, one {# available tag} other {# available tags}}. This defeats the purpose of tags, which are meant to help users find relevant projects. Please select only the tags that are relevant to your project."
   },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Select accurate tags"
   },
   "nags.description-too-short.description": {
-    "defaultMessage": "Your description is {length} readable characters. At least {minChars} characters is recommended to create a clear and informative description."
+    "defaultMessage": "Your description is {length, plural, one {# readable character} other {# readable characters}}. At least {minChars, plural, one {# character} other {# characters}} is recommended to create a clear and informative description."
   },
   "nags.description-too-short.title": {
     "defaultMessage": "Expand the description"
@@ -54,7 +54,7 @@
     "defaultMessage": "Visit gallery page"
   },
   "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Your {projectType} uses a license which requires source code to be available. Please provide a source code link or sources file for each additional version, or consider using a different license."
+    "defaultMessage": "Your {type, select, mod {mod} plugin {plugin} other {project}} uses a license which requires source code to be available. Please provide a source code link or sources file for each additional version, or consider using a different license."
   },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Provide source code"
@@ -114,22 +114,22 @@
     "defaultMessage": "Review and address all concerns from the moderation team before resubmitting."
   },
   "nags.moderator-feedback.title": {
-    "defaultMessage": "Review moderator feedback"
+    "defaultMessage": "Review feedback"
   },
   "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "You've selected {count} resolution tags ({tags}). Resource packs should typically only have one resolution tag that matches their primary resolution."
+    "defaultMessage": "You've selected {count, plural, one {# resolution tag} other {# resolution tags}} ({tags}). Resource packs should typically only have one resolution tag that matches their primary resolution."
   },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Select correct resolution"
   },
   "nags.select-environments.description": {
-    "defaultMessage": "Select the environments your {projectType} functions on."
+    "defaultMessage": "Select the environments your {type, select, mod {mod} modpack {modpack} other {project}} functions on."
   },
   "nags.select-environments.title": {
     "defaultMessage": "Select environments"
   },
   "nags.select-license.description": {
-    "defaultMessage": "Select the license your {projectType} is distributed under."
+    "defaultMessage": "Select the license your {type, select, mod {mod} modpack {modpack} resourcepack {resource pack} shader {shader} plugin {plugin} datapack {data pack} other {project}} is distributed under."
   },
   "nags.select-license.title": {
     "defaultMessage": "Select a license"
@@ -171,25 +171,25 @@
     "defaultMessage": "Clear up the summary"
   },
   "nags.summary-too-short.description": {
-    "defaultMessage": "Your summary is {length} characters. At least {minChars} characters is recommended to create an informative and enticing summary."
+    "defaultMessage": "Your summary is {length, plural, one {# character} other {# characters}}. At least {minChars, plural, one {# character} other {# characters}} is recommended to create an informative and enticing summary."
   },
   "nags.summary-too-short.title": {
     "defaultMessage": "Expand the summary"
   },
   "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Keeping your project's Name clean and makes it memorable easier to find. Version and loader information is automatically displayed alongside your project."
+    "defaultMessage": "Keeping your project's Name clean makes it memorable and easier to find. Version and loader information is automatically displayed alongside your project."
   },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Clean up the name"
   },
   "nags.too-many-tags.description": {
-    "defaultMessage": "You've selected {tagCount} tags. Consider reducing to {maxTagCount} or fewer to make sure your project appears in relevant search results."
+    "defaultMessage": "You've selected {tagCount, plural, one {# tag} other {# tags}}. Consider reducing to {maxTagCount} or fewer to make sure your project appears in relevant search results."
   },
   "nags.too-many-tags.title": {
     "defaultMessage": "Select accurate tags"
   },
   "nags.upload-gallery-image.description": {
-    "defaultMessage": "At least one gallery image is required to showcase the content of your {type}{resourcepackMessage}."
+    "defaultMessage": "At least one gallery image is required to showcase the content of your {type, select, resourcepack {resource pack, except for audio or localization packs. If this describes your pack, please select the appropriate tag} shader {shader} other {project}}."
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Upload a gallery image"

From 60ffa756539f99aeb867ac69671069f2f1e4b620 Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Thu, 6 Nov 2025 21:55:07 +0000
Subject: [PATCH 23/64] feat: 2nd batch of withdraw QA changes (#4724)

* polish: increase gap between svg and text in empty state

* fix: use ts & change cancel btn style

* fix: btn style

* polish: new transaction page design

* fix: navstack match nested + csv download

* fix: lint & i18n

* Add tooltip to CSV download button + standard btn style

Signed-off-by: Calum H. <contact@cal.engineer>

* fix: lint & i18n

---------

Signed-off-by: Calum H. <contact@cal.engineer>
---
 apps/frontend/src/components/ui/NavStack.vue  |  23 +-
 .../ui/dashboard/RevenueTransaction.vue       |  76 +++--
 apps/frontend/src/locales/en-US/index.json    |  12 +
 apps/frontend/src/pages/dashboard.vue         |   2 +-
 .../src/pages/dashboard/revenue/index.vue     |   2 +-
 .../src/pages/dashboard/revenue/transfers.vue | 271 +++++++++++++-----
 packages/assets/generated-icons.ts            |   4 +
 packages/assets/icons/arrow-down-left.svg     |   5 +
 packages/assets/icons/generic-list.svg        |   9 +
 9 files changed, 299 insertions(+), 105 deletions(-)
 create mode 100644 packages/assets/icons/arrow-down-left.svg
 create mode 100644 packages/assets/icons/generic-list.svg

diff --git a/apps/frontend/src/components/ui/NavStack.vue b/apps/frontend/src/components/ui/NavStack.vue
index bba0baac..43d1188e 100644
--- a/apps/frontend/src/components/ui/NavStack.vue
+++ b/apps/frontend/src/components/ui/NavStack.vue
@@ -18,6 +18,7 @@
 						v-else-if="item.link ?? item.to"
 						:to="(item.link ?? item.to) as string"
 						class="nav-item inline-flex w-full cursor-pointer items-center gap-2 text-nowrap rounded-xl border-none bg-transparent px-4 py-2.5 text-left text-base font-semibold leading-tight text-button-text transition-all hover:bg-button-bg hover:text-contrast active:scale-[0.97]"
+						:class="{ 'is-active': isActive(item as NavStackLinkItem) }"
 					>
 						<component
 							:is="item.icon"
@@ -80,6 +81,7 @@ type NavStackLinkItem = NavStackBaseItem & {
 	link?: string | null
 	to?: string | null
 	action?: (() => void) | null
+	matchNested?: boolean
 }
 
 type NavStackSeparator = { type: 'separator' }
@@ -96,6 +98,8 @@ const props = defineProps<{
 
 const ariaLabel = computed(() => props.ariaLabel ?? 'Section navigation')
 
+const route = useRoute()
+
 const slots = useSlots()
 const hasSlotContent = computed(() => {
 	const content = slots.default?.()
@@ -117,6 +121,19 @@ function getKey(item: NavStackEntry, idx: number) {
 	return link ? `link-${link}` : `action-${(item as NavStackLinkItem).label}-${idx}`
 }
 
+function isActive(item: NavStackLinkItem): boolean {
+	const link = item.link ?? item.to
+	if (!link) return false
+
+	const currentPath = route.path
+
+	if (item.matchNested) {
+		return currentPath.startsWith(link)
+	}
+
+	return currentPath === link
+}
+
 const filteredItems = computed(() => props.items?.filter((x) => x.shown === undefined || x.shown))
 </script>
 
@@ -124,11 +141,13 @@ const filteredItems = computed(() => props.items?.filter((x) => x.shown === unde
 li {
 	text-align: unset;
 }
-.router-link-exact-active.nav-item {
+.router-link-exact-active.nav-item,
+.nav-item.is-active {
 	background: var(--color-button-bg-selected);
 	color: var(--color-button-text-selected);
 }
-.router-link-exact-active.nav-item .text-contrast {
+.router-link-exact-active.nav-item .text-contrast,
+.nav-item.is-active .text-contrast {
 	color: var(--color-button-text-selected);
 }
 </style>
diff --git a/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue b/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
index 83313f39..ebb3ee3b 100644
--- a/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
+++ b/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
@@ -9,12 +9,12 @@
 		<div class="flex w-full flex-row justify-between">
 			<div class="flex flex-col">
 				<span class="text-base font-semibold text-contrast md:text-lg">{{
-					isIncome
+					transaction.type === 'payout_available'
 						? formatPayoutSource(transaction.payout_source)
 						: formatMethodName(transaction.method_type || transaction.method)
 				}}</span>
 				<span class="text-xs text-secondary md:text-sm">
-					<template v-if="!isIncome">
+					<template v-if="transaction.type === 'withdrawal'">
 						<span
 							:class="[
 								transaction.status === 'cancelling' || transaction.status === 'cancelled'
@@ -24,8 +24,8 @@
 							>{{ formatTransactionStatus(transaction.status) }} <BulletDivider
 						/></span>
 					</template>
-					{{ $dayjs(transaction.created).format('MMM DD YYYY') }}
-					<template v-if="!isIncome && transaction.fee">
+					{{ dayjs(transaction.created).format('MMM DD YYYY') }}
+					<template v-if="transaction.type === 'withdrawal' && transaction.fee">
 						<BulletDivider /> Fee {{ formatMoney(transaction.fee) }}
 					</template>
 				</span>
@@ -33,13 +33,13 @@
 			<div class="my-auto flex flex-row items-center gap-2">
 				<span
 					class="text-base font-semibold md:text-lg"
-					:class="isIncome ? 'text-green' : 'text-contrast'"
+					:class="transaction.type === 'payout_available' ? 'text-green' : 'text-contrast'"
 					>{{ formatMoney(transaction.amount) }}</span
 				>
-				<template v-if="!isIncome && transaction.status === 'in-transit'">
+				<template v-if="transaction.type === 'withdrawal' && transaction.status === 'in-transit'">
 					<Tooltip theme="dismissable-prompt" :triggers="['hover', 'focus']" no-auto-focus>
 						<span class="my-auto align-middle"
-							><ButtonStyled circular size="small">
+							><ButtonStyled circular type="outlined" size="small">
 								<button class="align-middle" @click="cancelPayout">
 									<XIcon />
 								</button> </ButtonStyled
@@ -54,32 +54,57 @@
 	</div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import { ArrowDownIcon, ArrowUpIcon, XIcon } from '@modrinth/assets'
 import { BulletDivider, ButtonStyled, injectNotificationManager } from '@modrinth/ui'
 import { capitalizeString, formatMoney } from '@modrinth/utils'
+import dayjs from 'dayjs'
 import { Tooltip } from 'floating-vue'
 
-const props = defineProps({
-	transaction: {
-		type: Object,
-		required: true,
-	},
-})
+type PayoutStatus = 'in-transit' | 'cancelling' | 'cancelled' | 'success' | 'failed'
+type PayoutMethodType = 'paypal' | 'venmo' | 'tremendous' | 'muralpay'
+type PayoutSource = 'creator_rewards' | 'affilites'
 
-const emit = defineEmits(['cancelled'])
+type WithdrawalTransaction = {
+	type: 'withdrawal'
+	id: string
+	status: PayoutStatus
+	created: string
+	amount: number
+	fee?: number | null
+	method_type?: PayoutMethodType | null
+	method?: string
+	method_id?: string
+	method_address?: string | null
+}
+
+type PayoutAvailableTransaction = {
+	type: 'payout_available'
+	created: string
+	payout_source: PayoutSource
+	amount: number
+}
+
+type Transaction = WithdrawalTransaction | PayoutAvailableTransaction
+
+const props = defineProps<{
+	transaction: Transaction
+}>()
+
+const emit = defineEmits<{
+	(e: 'cancelled'): void
+}>()
 
 const { addNotification } = injectNotificationManager()
-const auth = await useAuth()
 
 const isIncome = computed(() => props.transaction.type === 'payout_available')
 
-function formatTransactionStatus(status) {
+function formatTransactionStatus(status: string): string {
 	if (status === 'in-transit') return 'In Transit'
 	return capitalizeString(status)
 }
 
-function formatMethodName(method) {
+function formatMethodName(method: string | undefined): string {
 	if (!method) return 'Unknown'
 	switch (method) {
 		case 'paypal':
@@ -95,24 +120,27 @@ function formatMethodName(method) {
 	}
 }
 
-function formatPayoutSource(source) {
+function formatPayoutSource(source: string | undefined): string {
 	if (!source) return 'Income'
 	return source
 		.split('_')
-		.map((word) => capitalizeString(word))
+		.map((word: string) => capitalizeString(word))
 		.join(' ')
 }
 
-async function cancelPayout() {
+async function cancelPayout(): Promise<void> {
 	startLoading()
 	try {
-		await useBaseFetch(`payout/${props.transaction.id}`, {
+		const transaction = props.transaction
+		if (transaction.type !== 'withdrawal') return
+
+		await useBaseFetch(`payout/${transaction.id}`, {
 			method: 'DELETE',
 			apiVersion: 3,
 		})
-		await useAuth(auth.value.token)
+		await useAuth()
 		emit('cancelled')
-	} catch (err) {
+	} catch (err: any) {
 		addNotification({
 			title: 'Failed to cancel transaction',
 			text: err.data ? err.data.description : err,
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 0fde57f3..3c571c9c 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -854,9 +854,21 @@
   "dashboard.revenue.processing.tooltip": {
     "message": "Revenue stays in processing until the end of the month, then becomes available 60 days later."
   },
+  "dashboard.revenue.stats.received": {
+    "message": "Received"
+  },
+  "dashboard.revenue.stats.transactions": {
+    "message": "Transactions"
+  },
+  "dashboard.revenue.stats.withdrawn": {
+    "message": "Withdrawn"
+  },
   "dashboard.revenue.tos": {
     "message": "By uploading projects to Modrinth and withdrawing money from your account, you agree to our <terms-link>Rewards Program Terms</terms-link>. Learn more about the <info-link>Reward Program</info-link>."
   },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "Download as CSV"
+  },
   "dashboard.revenue.transactions.header": {
     "message": "Transactions"
   },
diff --git a/apps/frontend/src/pages/dashboard.vue b/apps/frontend/src/pages/dashboard.vue
index 826fdabf..ff7adec5 100644
--- a/apps/frontend/src/pages/dashboard.vue
+++ b/apps/frontend/src/pages/dashboard.vue
@@ -22,7 +22,7 @@
 						icon: AffiliateIcon,
 						shown: isAffiliate,
 					},
-					{ link: '/dashboard/revenue', label: 'Revenue', icon: CurrencyIcon },
+					{ link: '/dashboard/revenue', label: 'Revenue', icon: CurrencyIcon, matchNested: true },
 				]"
 			/>
 		</div>
diff --git a/apps/frontend/src/pages/dashboard/revenue/index.vue b/apps/frontend/src/pages/dashboard/revenue/index.vue
index 8cc6bd34..433e94ed 100644
--- a/apps/frontend/src/pages/dashboard/revenue/index.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/index.vue
@@ -193,7 +193,7 @@
 					@cancelled="refreshPayouts"
 				/>
 			</div>
-			<div v-else class="mx-auto flex flex-col justify-center gap-4 p-6 text-center">
+			<div v-else class="mx-auto flex flex-col justify-center gap-8 p-6 text-center">
 				<div data-svg-wrapper>
 					<svg
 						viewBox="0 0 154 94"
diff --git a/apps/frontend/src/pages/dashboard/revenue/transfers.vue b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
index 54ce5019..40acc464 100644
--- a/apps/frontend/src/pages/dashboard/revenue/transfers.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
@@ -1,34 +1,67 @@
 <template>
-	<div class="mb-6 flex flex-col gap-4 p-4 py-0 !pt-4 md:p-8 lg:p-12">
-		<div class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+	<div class="mb-20 flex flex-col gap-4 lg:pl-8">
+		<div class="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
 			<span class="text-xl font-semibold text-contrast md:text-2xl">{{
 				formatMessage(messages.transactionsHeader)
 			}}</span>
-			<div
-				class="flex w-full flex-col gap-2 min-[480px]:flex-row min-[480px]:items-center sm:max-w-[400px]"
-			>
+			<div class="flex w-full flex-row gap-2 sm:max-w-[250px] md:items-center">
 				<Combobox
 					v-model="selectedYear"
 					:options="yearOptions"
 					:display-value="selectedYear === 'all' ? 'All years' : String(selectedYear)"
 					listbox
 				/>
-				<Combobox
-					v-model="selectedMethod"
-					:options="methodOptions"
-					:display-value="selectedMethod === 'all' ? 'All types' : formatTypeLabel(selectedMethod)"
-					listbox
-				/>
+				<ButtonStyled circular>
+					<button
+						v-tooltip="formatMessage(messages.downloadCsv)"
+						:disabled="buildingCsv"
+						@click="onDownloadCSV"
+					>
+						<SpinnerIcon v-if="buildingCsv" class="animate-spin" />
+						<DownloadIcon v-else />
+					</button>
+				</ButtonStyled>
 			</div>
 		</div>
-
-		<div v-if="Object.keys(groupedTransactions).length > 0" class="flex flex-col gap-5 md:gap-6">
+		<div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
+			<div class="flex flex-col gap-3 rounded-2xl bg-surface-3 p-5">
+				<div class="flex w-full justify-between">
+					<span class="my-auto font-medium">{{ formatMessage(messages.received) }}</span>
+					<ArrowDownLeftIcon class="size-6" />
+				</div>
+				<span class="text-2xl font-semibold text-contrast md:text-4xl">{{
+					formatMoney(totalReceived)
+				}}</span>
+			</div>
+			<div class="flex flex-col gap-3 rounded-2xl bg-surface-3 p-5">
+				<div class="flex w-full justify-between">
+					<span class="my-auto font-medium">{{ formatMessage(messages.withdrawn) }}</span>
+					<ArrowUpRightIcon class="size-6" />
+				</div>
+				<span class="text-2xl font-semibold text-contrast md:text-4xl">{{
+					formatMoney(totalWithdrawn)
+				}}</span>
+			</div>
+			<div class="flex flex-col gap-3 rounded-2xl bg-surface-3 p-5">
+				<div class="flex w-full justify-between">
+					<span class="my-auto font-medium">{{ formatMessage(messages.transactions) }}</span>
+					<GenericListIcon class="size-6" />
+				</div>
+				<span class="text-2xl font-semibold text-contrast md:text-4xl">{{
+					filteredTransactions.length
+				}}</span>
+			</div>
+		</div>
+		<div
+			v-if="Object.keys(groupedTransactions).length > 0"
+			class="-mt-2 flex flex-col gap-5 md:gap-6"
+		>
 			<div
 				v-for="(transactions, period) in groupedTransactions"
 				:key="period"
 				class="flex flex-col"
 			>
-				<h3 class="text-sm font-medium text-primary md:text-base">{{ period }}</h3>
+				<h3 class="text-base font-medium text-primary md:text-lg">{{ period }}</h3>
 				<div class="flex flex-col gap-3 md:gap-4">
 					<RevenueTransaction
 						v-for="transaction in transactions"
@@ -50,8 +83,15 @@
 	</div>
 </template>
 <script setup>
-import { Combobox } from '@modrinth/ui'
-import { capitalizeString } from '@modrinth/utils'
+import {
+	ArrowDownLeftIcon,
+	ArrowUpRightIcon,
+	DownloadIcon,
+	GenericListIcon,
+	SpinnerIcon,
+} from '@modrinth/assets'
+import { ButtonStyled, Combobox } from '@modrinth/ui'
+import { formatMoney } from '@modrinth/utils'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import dayjs from 'dayjs'
 
@@ -93,68 +133,12 @@ const yearOptions = computed(() => {
 })
 
 const selectedYear = ref('all')
-
-const methodOptions = computed(() => {
-	const types = new Set()
-
-	sortedTransactions.value.forEach((x) => {
-		if (x.type === 'payout_available' && x.payout_source) {
-			types.add(x.payout_source)
-		} else if (x.type === 'withdrawal' && (x.method_type || x.method)) {
-			types.add(x.method_type || x.method)
-		}
-	})
-
-	const typeValues = ['all', ...Array.from(types)]
-
-	return typeValues.map((type) => ({
-		value: type,
-		label: type === 'all' ? 'All types' : formatTypeLabel(type),
-	}))
-})
-
-const selectedMethod = ref('all')
-
-function formatMethodLabel(method) {
-	switch (method) {
-		case 'paypal':
-			return 'PayPal'
-		case 'venmo':
-			return 'Venmo'
-		case 'tremendous':
-			return 'Tremendous'
-		case 'muralpay':
-			return 'Muralpay'
-		default:
-			return capitalizeString(method)
-	}
-}
-
-function formatTypeLabel(type) {
-	// Check if it's a payout method (withdrawal)
-	const payoutMethods = ['paypal', 'venmo', 'tremendous', 'muralpay']
-	if (payoutMethods.includes(type)) {
-		return formatMethodLabel(type)
-	}
-	// Otherwise it's a payout_source (income), convert snake_case to Title Case
-	return type
-		.split('_')
-		.map((word) => capitalizeString(word))
-		.join(' ')
-}
+const buildingCsv = ref(false)
 
 const filteredTransactions = computed(() =>
-	sortedTransactions.value
-		.filter((x) => selectedYear.value === 'all' || dayjs(x.created).year() === selectedYear.value)
-		.filter((x) => {
-			if (selectedMethod.value === 'all') return true
-			// Check if it's an income source
-			if (x.type === 'payout_available') {
-				return x.payout_source === selectedMethod.value
-			}
-			// Check if it's a withdrawal method
-			return x.type === 'withdrawal' && (x.method_type || x.method) === selectedMethod.value
-		}),
+	sortedTransactions.value.filter(
+		(x) => selectedYear.value === 'all' || dayjs(x.created).year() === selectedYear.value,
+	),
 )
 
 function getPeriodLabel(date) {
@@ -186,11 +170,141 @@ const groupedTransactions = computed(() => {
 	return groups
 })
 
+const totalReceived = computed(() => {
+	return filteredTransactions.value
+		.filter((txn) => txn.type === 'payout_available')
+		.reduce((sum, txn) => sum + Number(txn.amount), 0)
+})
+
+const totalWithdrawn = computed(() => {
+	return filteredTransactions.value
+		.filter((txn) => txn.type === 'withdrawal')
+		.reduce((sum, txn) => sum + Number(txn.amount), 0)
+})
+
+function escapeCSVField(field) {
+	if (field === null || field === undefined) return ''
+	const stringField = String(field)
+	if (stringField.includes(',') || stringField.includes('"') || stringField.includes('\n')) {
+		return `"${stringField.replace(/"/g, '""')}"`
+	}
+	return stringField
+}
+
+function transactionsToCSV() {
+	if (!filteredTransactions.value || filteredTransactions.value.length === 0) {
+		return ''
+	}
+
+	const newline = '\n'
+	const header = ['Date', 'Type', 'Source', 'Status', 'Amount', 'Fee'].join(',')
+
+	const rows = filteredTransactions.value.map((txn) => {
+		const date = dayjs(txn.created).format('YYYY-MM-DD HH:mm:ss')
+		const type = txn.type === 'withdrawal' ? 'Withdrawal' : 'Payout'
+
+		let methodOrSource = ''
+		let status = ''
+		let fee = ''
+
+		if (txn.type === 'withdrawal') {
+			const method = txn.method_type || txn.method || 'Unknown'
+			switch (method) {
+				case 'paypal':
+					methodOrSource = 'PayPal'
+					break
+				case 'venmo':
+					methodOrSource = 'Venmo'
+					break
+				case 'tremendous':
+					methodOrSource = 'Tremendous'
+					break
+				case 'muralpay':
+					methodOrSource = 'Muralpay'
+					break
+				default:
+					methodOrSource = method.charAt(0).toUpperCase() + method.slice(1)
+			}
+
+			status = txn.status
+				? txn.status.replace(/-/g, ' ').replace(/\b\w/g, (l) => l.toUpperCase())
+				: 'Unknown'
+
+			fee = txn.fee ? Number(txn.fee).toFixed(2) : '0.00'
+		} else {
+			methodOrSource = txn.payout_source
+				? txn.payout_source
+						.split('_')
+						.map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+						.join(' ')
+				: 'Unknown'
+			status = 'N/A'
+			fee = 'N/A'
+		}
+
+		const amount = Number(txn.amount).toFixed(2)
+
+		return [
+			escapeCSVField(date),
+			escapeCSVField(type),
+			escapeCSVField(methodOrSource),
+			escapeCSVField(status),
+			escapeCSVField(amount),
+			escapeCSVField(fee),
+		].join(',')
+	})
+
+	return [header, ...rows].join(newline)
+}
+
+const downloadTransactionsCSV = () => {
+	buildingCsv.value = true
+
+	try {
+		const csv = transactionsToCSV()
+
+		if (!csv) {
+			return
+		}
+
+		const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' })
+
+		const link = document.createElement('a')
+		const url = URL.createObjectURL(blob)
+		const yearSuffix = selectedYear.value === 'all' ? 'all' : selectedYear.value
+		const filename = `modrinth-transactions-${yearSuffix}.csv`
+
+		link.setAttribute('href', url)
+		link.setAttribute('download', filename)
+		link.style.visibility = 'hidden'
+		document.body.appendChild(link)
+
+		link.click()
+		document.body.removeChild(link)
+	} finally {
+		buildingCsv.value = false
+	}
+}
+
+const onDownloadCSV = useClientTry(async () => await downloadTransactionsCSV())
+
 const messages = defineMessages({
 	transactionsHeader: {
 		id: 'dashboard.revenue.transactions.header',
 		defaultMessage: 'Transactions',
 	},
+	received: {
+		id: 'dashboard.revenue.stats.received',
+		defaultMessage: 'Received',
+	},
+	withdrawn: {
+		id: 'dashboard.revenue.stats.withdrawn',
+		defaultMessage: 'Withdrawn',
+	},
+	transactions: {
+		id: 'dashboard.revenue.stats.transactions',
+		defaultMessage: 'Transactions',
+	},
 	noTransactions: {
 		id: 'dashboard.revenue.transactions.none',
 		defaultMessage: 'No transactions',
@@ -199,6 +313,9 @@ const messages = defineMessages({
 		id: 'dashboard.revenue.transactions.none.desc',
 		defaultMessage: 'Your payouts and withdrawals will appear here.',
 	},
+	downloadCsv: {
+		id: 'dashboard.revenue.transactions.btn.download-csv',
+		defaultMessage: 'Download as CSV',
+	},
 })
 </script>
-<style scoped></style>
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index 80d07ffd..0acc4816 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -7,6 +7,7 @@ import _ArchiveIcon from './icons/archive.svg?component'
 import _ArrowBigRightDashIcon from './icons/arrow-big-right-dash.svg?component'
 import _ArrowBigUpDashIcon from './icons/arrow-big-up-dash.svg?component'
 import _ArrowDownIcon from './icons/arrow-down.svg?component'
+import _ArrowDownLeftIcon from './icons/arrow-down-left.svg?component'
 import _ArrowLeftRightIcon from './icons/arrow-left-right.svg?component'
 import _ArrowUpIcon from './icons/arrow-up.svg?component'
 import _ArrowUpRightIcon from './icons/arrow-up-right.svg?component'
@@ -77,6 +78,7 @@ import _FolderSearchIcon from './icons/folder-search.svg?component'
 import _GameIcon from './icons/game.svg?component'
 import _GapIcon from './icons/gap.svg?component'
 import _GaugeIcon from './icons/gauge.svg?component'
+import _GenericListIcon from './icons/generic-list.svg?component'
 import _GiftIcon from './icons/gift.svg?component'
 import _GitGraphIcon from './icons/git-graph.svg?component'
 import _GlassesIcon from './icons/glasses.svg?component'
@@ -219,6 +221,7 @@ export const AlignLeftIcon = _AlignLeftIcon
 export const ArchiveIcon = _ArchiveIcon
 export const ArrowBigRightDashIcon = _ArrowBigRightDashIcon
 export const ArrowBigUpDashIcon = _ArrowBigUpDashIcon
+export const ArrowDownLeftIcon = _ArrowDownLeftIcon
 export const ArrowDownIcon = _ArrowDownIcon
 export const ArrowLeftRightIcon = _ArrowLeftRightIcon
 export const ArrowUpRightIcon = _ArrowUpRightIcon
@@ -290,6 +293,7 @@ export const FolderSearchIcon = _FolderSearchIcon
 export const GameIcon = _GameIcon
 export const GapIcon = _GapIcon
 export const GaugeIcon = _GaugeIcon
+export const GenericListIcon = _GenericListIcon
 export const GiftIcon = _GiftIcon
 export const GitGraphIcon = _GitGraphIcon
 export const GlassesIcon = _GlassesIcon
diff --git a/packages/assets/icons/arrow-down-left.svg b/packages/assets/icons/arrow-down-left.svg
new file mode 100644
index 00000000..8ecc640d
--- /dev/null
+++ b/packages/assets/icons/arrow-down-left.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+	stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-down-left-icon lucide-arrow-down-left">
+	<path d="M17 7 7 17" />
+	<path d="M17 17H7V7" />
+</svg>
diff --git a/packages/assets/icons/generic-list.svg b/packages/assets/icons/generic-list.svg
new file mode 100644
index 00000000..0558be4c
--- /dev/null
+++ b/packages/assets/icons/generic-list.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+	stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-list-icon lucide-list">
+	<path d="M3 5h.01" />
+	<path d="M3 12h.01" />
+	<path d="M3 19h.01" />
+	<path d="M8 5h13" />
+	<path d="M8 12h13" />
+	<path d="M8 19h13" />
+</svg>

From af39a1769cd5fe6f82ff496bb27ff00fa2a8e081 Mon Sep 17 00:00:00 2001
From: Truman Gao <106889354+tdgao@users.noreply.github.com>
Date: Thu, 6 Nov 2025 23:56:00 -0800
Subject: [PATCH 24/64] Fixes on small frontend bugs (#4719)

* Account list is not scrollable
Fixes #4688

* Selecting Glitch in the log Screen
Fixes #4687 by explicitly defining the buffer

* When sorting or grouping your instance, the option you choose does not get saved
Fixes #4647

* use label prop to specify specific local storage for grid display state

* Implement persistent filters on mods page
Fixes #4517

* fix lint errors

* update schemastore links

---------

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 .../src/components/GridDisplay.vue            | 39 ++++++++++++-------
 .../src/components/ui/AccountsCard.vue        |  2 +-
 apps/app-frontend/src/pages/instance/Logs.vue |  6 ++-
 apps/app-frontend/src/pages/instance/Mods.vue |  9 ++++-
 packages/tooling-config/typescript/base.json  |  2 +-
 packages/tooling-config/typescript/vue.json   |  2 +-
 6 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/apps/app-frontend/src/components/GridDisplay.vue b/apps/app-frontend/src/components/GridDisplay.vue
index 046244f6..c0e7fe7f 100644
--- a/apps/app-frontend/src/components/GridDisplay.vue
+++ b/apps/app-frontend/src/components/GridDisplay.vue
@@ -12,6 +12,7 @@ import {
 } from '@modrinth/assets'
 import { Button, DropdownSelect, injectNotificationManager } from '@modrinth/ui'
 import { formatCategoryHeader } from '@modrinth/utils'
+import { useStorage } from '@vueuse/core'
 import dayjs from 'dayjs'
 import { computed, ref } from 'vue'
 
@@ -121,40 +122,50 @@ const handleOptionsClick = async (args) => {
 	}
 }
 
+const state = useStorage(
+	`${props.label}-grid-display-state`,
+	{
+		group: 'Group',
+		sortBy: 'Name',
+	},
+	localStorage,
+	{ mergeDefaults: true },
+)
+
 const search = ref('')
-const group = ref('Group')
-const sortBy = ref('Name')
 
 const filteredResults = computed(() => {
+	const { group = 'Group', sortBy = 'Name' } = state.value
+
 	const instances = props.instances.filter((instance) => {
 		return instance.name.toLowerCase().includes(search.value.toLowerCase())
 	})
 
-	if (sortBy.value === 'Name') {
+	if (sortBy === 'Name') {
 		instances.sort((a, b) => {
 			return a.name.localeCompare(b.name)
 		})
 	}
 
-	if (sortBy.value === 'Game version') {
+	if (sortBy === 'Game version') {
 		instances.sort((a, b) => {
 			return a.game_version.localeCompare(b.game_version, undefined, { numeric: true })
 		})
 	}
 
-	if (sortBy.value === 'Last played') {
+	if (sortBy === 'Last played') {
 		instances.sort((a, b) => {
 			return dayjs(b.last_played ?? 0).diff(dayjs(a.last_played ?? 0))
 		})
 	}
 
-	if (sortBy.value === 'Date created') {
+	if (sortBy === 'Date created') {
 		instances.sort((a, b) => {
 			return dayjs(b.date_created).diff(dayjs(a.date_created))
 		})
 	}
 
-	if (sortBy.value === 'Date modified') {
+	if (sortBy === 'Date modified') {
 		instances.sort((a, b) => {
 			return dayjs(b.date_modified).diff(dayjs(a.date_modified))
 		})
@@ -162,7 +173,7 @@ const filteredResults = computed(() => {
 
 	const instanceMap = new Map()
 
-	if (group.value === 'Loader') {
+	if (group === 'Loader') {
 		instances.forEach((instance) => {
 			const loader = formatCategoryHeader(instance.loader)
 			if (!instanceMap.has(loader)) {
@@ -171,7 +182,7 @@ const filteredResults = computed(() => {
 
 			instanceMap.get(loader).push(instance)
 		})
-	} else if (group.value === 'Game version') {
+	} else if (group === 'Game version') {
 		instances.forEach((instance) => {
 			if (!instanceMap.has(instance.game_version)) {
 				instanceMap.set(instance.game_version, [])
@@ -179,7 +190,7 @@ const filteredResults = computed(() => {
 
 			instanceMap.get(instance.game_version).push(instance)
 		})
-	} else if (group.value === 'Group') {
+	} else if (group === 'Group') {
 		instances.forEach((instance) => {
 			if (instance.groups.length === 0) {
 				instance.groups.push('None')
@@ -199,7 +210,7 @@ const filteredResults = computed(() => {
 
 	// For 'name', we intuitively expect the sorting to apply to the name of the group first, not just the name of the instance
 	// ie: Category A should come before B, even if the first instance in B comes before the first instance in A
-	if (sortBy.value === 'Name') {
+	if (sortBy === 'Name') {
 		const sortedEntries = [...instanceMap.entries()].sort((a, b) => {
 			// None should always be first
 			if (a[0] === 'None' && b[0] !== 'None') {
@@ -217,7 +228,7 @@ const filteredResults = computed(() => {
 	}
 	// default sorting would do 1.20.4 < 1.8.9 because 2 < 8
 	// localeCompare with numeric=true puts 1.8.9 < 1.20.4 because 8 < 20
-	if (group.value === 'Game version') {
+	if (group === 'Game version') {
 		const sortedEntries = [...instanceMap.entries()].sort((a, b) => {
 			return a[0].localeCompare(b[0], undefined, { numeric: true })
 		})
@@ -241,7 +252,7 @@ const filteredResults = computed(() => {
 		</div>
 		<DropdownSelect
 			v-slot="{ selected }"
-			v-model="sortBy"
+			v-model="state.sortBy"
 			name="Sort Dropdown"
 			class="max-w-[16rem]"
 			:options="['Name', 'Last played', 'Date created', 'Date modified', 'Game version']"
@@ -252,7 +263,7 @@ const filteredResults = computed(() => {
 		</DropdownSelect>
 		<DropdownSelect
 			v-slot="{ selected }"
-			v-model="group"
+			v-model="state.group"
 			class="max-w-[16rem]"
 			name="Group Dropdown"
 			:options="['Group', 'Loader', 'Game version', 'None']"
diff --git a/apps/app-frontend/src/components/ui/AccountsCard.vue b/apps/app-frontend/src/components/ui/AccountsCard.vue
index 73d10598..54f0c510 100644
--- a/apps/app-frontend/src/components/ui/AccountsCard.vue
+++ b/apps/app-frontend/src/components/ui/AccountsCard.vue
@@ -289,7 +289,7 @@ onUnmounted(() => {
 	user-select: none;
 	-ms-user-select: none;
 	-webkit-user-select: none;
-	max-height: 98vh;
+	max-height: calc(100vh - 300px);
 	overflow-y: auto;
 
 	&::-webkit-scrollbar-track {
diff --git a/apps/app-frontend/src/pages/instance/Logs.vue b/apps/app-frontend/src/pages/instance/Logs.vue
index 43ebaf6a..a9d138f0 100644
--- a/apps/app-frontend/src/pages/instance/Logs.vue
+++ b/apps/app-frontend/src/pages/instance/Logs.vue
@@ -67,6 +67,7 @@
 				direction="vertical"
 				:item-size="20"
 				key-field="id"
+				buffer="200"
 			>
 				<div class="user no-wrap">
 					<span :style="{ color: item.prefixColor, 'font-weight': item.weight }">{{
@@ -508,7 +509,7 @@ onUnmounted(() => {
 	background-color: var(--color-accent-contrast);
 	color: var(--color-contrast);
 	border-radius: var(--radius-lg);
-	padding: 1.5rem;
+	padding-top: 1.5rem;
 	overflow-x: auto; /* Enables horizontal scrolling */
 	overflow-y: hidden; /* Disables vertical scrolling on this wrapper */
 	white-space: nowrap; /* Keeps content on a single line */
@@ -557,9 +558,10 @@ onUnmounted(() => {
 
 .user {
 	height: 32%;
-	padding: 0 12px;
+	padding: 0 1.5rem;
 	display: flex;
 
 	align-items: center;
+	user-select: text;
 }
 </style>
diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue
index be9371da..91b9f70f 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
@@ -285,6 +285,7 @@ import type { Organization, Project, TeamMember, Version } from '@modrinth/utils
 import { formatProjectType } from '@modrinth/utils'
 import { getCurrentWebview } from '@tauri-apps/api/webview'
 import { defineMessages, useVIntl } from '@vintl/vintl'
+import { useStorage } from '@vueuse/core'
 import dayjs from 'dayjs'
 import type { ComputedRef } from 'vue'
 import { computed, onUnmounted, ref, watch } from 'vue'
@@ -531,7 +532,13 @@ const filterOptions: ComputedRef<FilterOption[]> = computed(() => {
 	return options
 })
 
-const selectedFilters = ref<string[]>([])
+const selectedFilters = useStorage<string[]>(
+	`${props.instance.name}-mod-selected-filters`,
+	[],
+	sessionStorage,
+	{ mergeDefaults: true },
+)
+
 const filteredProjects = computed(() => {
 	const updatesFilter = selectedFilters.value.includes('updates')
 	const disabledFilter = selectedFilters.value.includes('disabled')
diff --git a/packages/tooling-config/typescript/base.json b/packages/tooling-config/typescript/base.json
index 49238f1b..1ecf9d32 100644
--- a/packages/tooling-config/typescript/base.json
+++ b/packages/tooling-config/typescript/base.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://json.schemastore.org/tsconfig",
+	"$schema": "https://www.schemastore.org/tsconfig",
 	"compilerOptions": {
 		"target": "ES2020",
 		"module": "ESNext",
diff --git a/packages/tooling-config/typescript/vue.json b/packages/tooling-config/typescript/vue.json
index aec16846..4abc9bf5 100644
--- a/packages/tooling-config/typescript/vue.json
+++ b/packages/tooling-config/typescript/vue.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://json.schemastore.org/tsconfig",
+	"$schema": "https://www.schemastore.org/tsconfig",
 	"extends": "@vue/tsconfig/tsconfig.dom.json",
 	"compilerOptions": {
 		"lib": ["ESNext", "DOM"],

From 06e1bc9dd60b6b864e21f96085f843c9537b612c Mon Sep 17 00:00:00 2001
From: Modrinth Bot <106493074+modrinth-bot@users.noreply.github.com>
Date: Fri, 7 Nov 2025 02:36:06 -0800
Subject: [PATCH 25/64] New translations from Crowdin (main) (#4548)

---
 .../app-frontend/src/locales/ar-SA/index.json | 112 +++-
 .../app-frontend/src/locales/az-AZ/index.json |   3 +
 .../src/locales/ceb-PH/index.json             | 313 +++++++++-
 .../app-frontend/src/locales/da-DK/index.json |  12 +
 .../app-frontend/src/locales/de-CH/index.json |  63 ++
 .../app-frontend/src/locales/de-DE/index.json |  99 +++-
 .../src/locales/es-419/index.json             |  57 ++
 .../app-frontend/src/locales/es-ES/index.json |  63 +-
 .../src/locales/fil-PH/index.json             | 289 ++++++++-
 .../app-frontend/src/locales/fr-FR/index.json |  93 +++
 .../app-frontend/src/locales/he-IL/index.json | 109 +++-
 .../app-frontend/src/locales/hu-HU/index.json |  67 ++-
 .../app-frontend/src/locales/id-ID/index.json | 108 ++++
 .../app-frontend/src/locales/it-IT/index.json |  63 ++
 .../app-frontend/src/locales/ja-JP/index.json | 105 ++++
 .../app-frontend/src/locales/ko-KR/index.json |  12 +
 .../src/locales/ms-Arab/index.json            |  63 ++
 .../app-frontend/src/locales/ms-MY/index.json |  63 ++
 .../app-frontend/src/locales/nl-NL/index.json |  45 ++
 .../app-frontend/src/locales/pl-PL/index.json |  68 ++-
 .../app-frontend/src/locales/pt-BR/index.json |  89 ++-
 .../app-frontend/src/locales/ru-RU/index.json |  87 ++-
 .../app-frontend/src/locales/th-TH/index.json |  72 +++
 .../app-frontend/src/locales/tl-PH/index.json | 297 +++++++++-
 .../app-frontend/src/locales/tr-TR/index.json |  65 ++-
 .../app-frontend/src/locales/tt-RU/index.json |   3 +
 .../app-frontend/src/locales/uk-UA/index.json |  79 ++-
 .../app-frontend/src/locales/zh-CN/index.json |  60 ++
 .../app-frontend/src/locales/zh-TW/index.json |  67 ++-
 apps/frontend/src/locales/ar-SA/index.json    | 189 ++++++
 apps/frontend/src/locales/ceb-PH/index.json   | 337 ++++++++++-
 apps/frontend/src/locales/cs-CZ/index.json    |  18 +-
 apps/frontend/src/locales/de-CH/index.json    | 135 ++++-
 apps/frontend/src/locales/de-DE/index.json    |  82 ++-
 apps/frontend/src/locales/de-DE/meta.json     |   2 +-
 apps/frontend/src/locales/es-419/index.json   |  98 +++-
 apps/frontend/src/locales/es-ES/index.json    | 176 +++++-
 apps/frontend/src/locales/fil-PH/index.json   | 307 +++++++++-
 apps/frontend/src/locales/fr-FR/index.json    | 148 ++++-
 apps/frontend/src/locales/he-IL/index.json    | 403 ++++++++++++-
 apps/frontend/src/locales/hr-HR/index.json    |   6 +
 apps/frontend/src/locales/hu-HU/index.json    | 552 ++++++++++++++++++
 apps/frontend/src/locales/id-ID/index.json    | 240 ++++++++
 apps/frontend/src/locales/id-ID/meta.json     |   2 +-
 apps/frontend/src/locales/it-IT/index.json    |  98 +++-
 apps/frontend/src/locales/ja-JP/index.json    | 147 +++++
 apps/frontend/src/locales/ko-KR/index.json    |  66 ++-
 apps/frontend/src/locales/ms-Arab/index.json  |  96 ++-
 apps/frontend/src/locales/ms-MY/index.json    |  96 ++-
 apps/frontend/src/locales/nl-NL/index.json    | 300 +++++++++-
 apps/frontend/src/locales/pl-PL/index.json    | 111 +++-
 apps/frontend/src/locales/pt-BR/index.json    | 116 +++-
 apps/frontend/src/locales/pt-PT/index.json    |  24 -
 apps/frontend/src/locales/ro-RO/index.json    |  62 +-
 apps/frontend/src/locales/ru-RU/index.json    | 243 +++++---
 .../frontend/src/locales/ru-RU/languages.json |   8 +-
 apps/frontend/src/locales/sr-CS/index.json    |  24 -
 apps/frontend/src/locales/sv-SE/index.json    |  24 +-
 apps/frontend/src/locales/tl-PH/index.json    | 313 +++++++++-
 apps/frontend/src/locales/tr-TR/index.json    | 100 +++-
 apps/frontend/src/locales/uk-UA/index.json    | 147 ++++-
 apps/frontend/src/locales/vi-VN/index.json    |   6 -
 apps/frontend/src/locales/zh-CN/index.json    | 147 ++++-
 apps/frontend/src/locales/zh-TW/index.json    | 106 +++-
 .../frontend/src/locales/zh-TW/languages.json |   2 +-
 apps/frontend/src/locales/zh-TW/meta.json     |   2 +-
 .../moderation/src/locales/ar-SA/index.json   |   6 +-
 .../moderation/src/locales/ceb-PH/index.json  |  23 +-
 .../moderation/src/locales/fil-PH/index.json  |  13 +-
 .../moderation/src/locales/he-IL/index.json   |  57 ++
 .../moderation/src/locales/hu-HU/index.json   |  15 +
 .../moderation/src/locales/ru-RU/index.json   |   2 +-
 .../moderation/src/locales/tl-PH/index.json   |   9 +
 .../moderation/src/locales/zh-TW/index.json   |   2 +-
 packages/ui/src/locales/ar-SA/index.json      |   3 +
 packages/ui/src/locales/ceb-PH/index.json     | 191 +++++-
 packages/ui/src/locales/cs-CZ/index.json      |   4 +-
 packages/ui/src/locales/de-CH/index.json      |  44 +-
 packages/ui/src/locales/de-DE/index.json      |   3 +
 packages/ui/src/locales/es-419/index.json     |   3 +
 packages/ui/src/locales/es-ES/index.json      |  27 +
 packages/ui/src/locales/fil-PH/index.json     | 161 ++++-
 packages/ui/src/locales/fr-FR/index.json      |  45 ++
 packages/ui/src/locales/he-IL/index.json      |   3 +
 packages/ui/src/locales/hu-HU/index.json      | 108 ++++
 packages/ui/src/locales/id-ID/index.json      | 410 ++++++++++++-
 packages/ui/src/locales/it-IT/index.json      |   3 +
 packages/ui/src/locales/ja-JP/index.json      |   6 +
 packages/ui/src/locales/ms-Arab/index.json    |   3 +
 packages/ui/src/locales/ms-MY/index.json      |   3 +
 packages/ui/src/locales/pl-PL/index.json      |   7 +-
 packages/ui/src/locales/pt-BR/index.json      |  11 +-
 packages/ui/src/locales/ru-RU/index.json      | 208 ++++---
 packages/ui/src/locales/tl-PH/index.json      | 183 +++++-
 packages/ui/src/locales/tr-TR/index.json      |   3 +
 packages/ui/src/locales/uk-UA/index.json      |   9 +
 packages/ui/src/locales/zh-CN/index.json      |   3 +
 packages/ui/src/locales/zh-TW/index.json      |   3 +
 98 files changed, 8173 insertions(+), 957 deletions(-)

diff --git a/apps/app-frontend/src/locales/ar-SA/index.json b/apps/app-frontend/src/locales/ar-SA/index.json
index b2baffdf..5592cd08 100644
--- a/apps/app-frontend/src/locales/ar-SA/index.json
+++ b/apps/app-frontend/src/locales/ar-SA/index.json
@@ -1,6 +1,9 @@
 {
   "app.settings.developer-mode-enabled": {
-    "message": "وضع المطوّر مُفعَّل."
+    "message": "تم تفعيل وضع المطوّر."
+  },
+  "app.settings.downloading": {
+    "message": "جار تنزيل الإصدار {version}"
   },
   "app.settings.tabs.appearance": {
     "message": "المظهر"
@@ -9,7 +12,7 @@
     "message": "خيارات النسخة الافتراضية"
   },
   "app.settings.tabs.feature-flags": {
-    "message": "إعدادات المميزات"
+    "message": "أعلام الميزات"
   },
   "app.settings.tabs.java-installations": {
     "message": "تثبيتات جافا"
@@ -20,6 +23,111 @@
   "app.settings.tabs.resource-management": {
     "message": "إدارة الموارد"
   },
+  "app.update-toast.body": {
+    "message": "تطبيق Modrinth الإصدار {version} جاهز للتثبيت!\nأعد التحميل لتحديث التطبيق الآن، أو سيتم التحديث تلقائيًا عند إغلاق تطبيق Modrinth."
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "تطبيق Modrinth الإصدار {version} جاهز للتثبيت!\nأعد التحميل لتحديث التطبيق الآن، أو سيتم التحديث تلقائيًا عند إغلاق تطبيق Modrinth."
+  },
+  "app.update-toast.body.metered": {
+    "message": "تطبيق Modrinth الإصدار {version} متاح الآن!\nنظرًا لأنك تستخدم شبكة محدودة البيانات، لم نقم بتنزيل التحديث تلقائيًا.\n"
+  },
+  "app.update-toast.changelog": {
+    "message": "سجلّ التغييرات"
+  },
+  "app.update-toast.download": {
+    "message": "تنزيل ({size})"
+  },
+  "app.update-toast.downloading": {
+    "message": "جار التنزيل..."
+  },
+  "app.update-toast.reload": {
+    "message": "إعادة تحميل"
+  },
+  "app.update-toast.title": {
+    "message": "تحديث متاح"
+  },
+  "app.update-toast.title.download-complete": {
+    "message": "اكتمل التنزيل"
+  },
+  "app.update.complete-toast.text": {
+    "message": "انقر هنا لعرض سجلّ التغييرات."
+  },
+  "app.update.complete-toast.title": {
+    "message": "تم تثبيت الإصدار {version} بنجاح!"
+  },
+  "app.update.download-update": {
+    "message": "تنزيل التحديث"
+  },
+  "app.update.downloading-update": {
+    "message": "جار تنزيل التحديث ({percent}٪)"
+  },
+  "app.update.reload-to-update": {
+    "message": "أعد التحميل لتثبيت التحديث"
+  },
+  "friends.action.add-friend": {
+    "message": "إضافة صديق"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural, one {طلب صداقة} other {طلبات صداقة}}"
+  },
+  "friends.add-friend.submit": {
+    "message": "إرسال طلب صداقة"
+  },
+  "friends.add-friend.title": {
+    "message": "جار إضافة صديق"
+  },
+  "friends.add-friend.username.description": {
+    "message": "قد يختلف عن اسم المستخدم الخاص بهم في Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "أدخل اسم مستخدم Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "ما اسم مستخدم صديقك في Modrinth؟"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>أضف أصدقاء</link> لمعرفة ما الذي يلعبونه!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "إلغاء الطلب"
+  },
+  "friends.friend.remove-friend": {
+    "message": "إزالة صديق"
+  },
+  "friends.friend.request-sent": {
+    "message": "إرسال طلب الصداقة"
+  },
+  "friends.friend.view-profile": {
+    "message": "عرض الملف الشخصي"
+  },
+  "friends.heading": {
+    "message": "أصدقاء"
+  },
+  "friends.heading.active": {
+    "message": "نشط"
+  },
+  "friends.heading.offline": {
+    "message": "غير متصل"
+  },
+  "friends.heading.online": {
+    "message": "متصل"
+  },
+  "friends.heading.pending": {
+    "message": "قيد الانتظار"
+  },
+  "friends.no-friends-match": {
+    "message": "لا يوجد أصدقاء يطابقون ‎''{query}''‎"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "ابحث عن الأصدقاء..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>سجّل الدخول إلى حساب Modrinth</link> لإضافة الأصدقاء ومعرفة ما الذي يلعبونه!"
+  },
   "instance.add-server.add-and-play": {
     "message": "إضافة واللعب"
   },
diff --git a/apps/app-frontend/src/locales/az-AZ/index.json b/apps/app-frontend/src/locales/az-AZ/index.json
index 0d884098..c6b98812 100644
--- a/apps/app-frontend/src/locales/az-AZ/index.json
+++ b/apps/app-frontend/src/locales/az-AZ/index.json
@@ -1,5 +1,8 @@
 {
   "app.settings.developer-mode-enabled": {
     "message": ""
+  },
+  "app.settings.downloading": {
+    "message": ""
   }
 }
diff --git a/apps/app-frontend/src/locales/ceb-PH/index.json b/apps/app-frontend/src/locales/ceb-PH/index.json
index 67db44f8..8f78c0bc 100644
--- a/apps/app-frontend/src/locales/ceb-PH/index.json
+++ b/apps/app-frontend/src/locales/ceb-PH/index.json
@@ -12,7 +12,7 @@
     "message": "Mga kapilian sa sukaranan nga pananglitan"
   },
   "app.settings.tabs.feature-flags": {
-    "message": "Bandera sa mga bahin"
+    "message": "Bandera sa mga panagway"
   },
   "app.settings.tabs.java-installations": {
     "message": "Mga pagtaod sa Java"
@@ -21,34 +21,115 @@
     "message": "Pribasiya"
   },
   "app.settings.tabs.resource-management": {
-    "message": "Pagdumala sa kabtangan"
+    "message": "Pagdumala sa kahinguhaan"
+  },
+  "app.update-toast.body": {
+    "message": "Andam na mataud ang Modrinth App v{version}! Pagkarga kausab aron mapasibo, o kinaugalingon pagtak-op sa Modrinth App."
   },
   "app.update-toast.body.download-complete": {
-    "message": "Nahuman ang pagkarganug sa Modrinth App v{version}. Pagkarga kausab aron matuman ang kabag-ohan, o unya nalang sa pagsara sa Modrinth App."
+    "message": "Nahuman ang pagkarganug sa Modrinth App v{version}. Pagkarga kausab aron mapasibo, o kinaugalingon pagtak-op sa Modrinth App."
   },
   "app.update-toast.body.metered": {
     "message": "Magamit na karon ang Modrinth App! Wala namo karganugi daan kay inihap man ang imong pum-ot."
   },
+  "app.update-toast.changelog": {
+    "message": "Talaan sa Kausaban"
+  },
   "app.update-toast.download": {
     "message": "Karganugi ({size})"
   },
   "app.update-toast.downloading": {
     "message": "Gakarganug..."
   },
+  "app.update-toast.reload": {
+    "message": "Kargaha pag-usab"
+  },
+  "app.update-toast.title": {
+    "message": "Naay bag-o nga pagpasibo"
+  },
   "app.update-toast.title.download-complete": {
     "message": "Nahuman ang pagkarganug"
   },
+  "app.update.complete-toast.text": {
+    "message": "Panuplok diri aron malantaw ang talaan sa kausaban."
+  },
+  "app.update.complete-toast.title": {
+    "message": "Malampusong nataud ang bersiyon nga {version}!"
+  },
   "app.update.download-update": {
     "message": "Karganugi ang kausaban"
   },
   "app.update.downloading-update": {
-    "message": "Gakarganug sa kausaban ({percent}%)"
+    "message": "Gakarganug sa pagpasibo ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "Andam mataud ang pagpasibo"
+  },
+  "friends.action.add-friend": {
+    "message": "Pagdugang og higala"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} ka hangyo sa pakighigala"
+  },
+  "friends.add-friend.submit": {
+    "message": "Pagpadala og hangyo sa pakighigala"
+  },
+  "friends.add-friend.title": {
+    "message": "Pagdugang og higala"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Mahimong galahi sa ngalan nila sa Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Ibutang ang ngalan sa tiggamit sa Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Unsa man ang ngalan sa imong higala sa Modrinth?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Pagdugang og mga higala</link> aron makit-an ang ilang ginadula!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Bawia ang hangyo"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Tangtangi ang higala"
+  },
+  "friends.friend.request-sent": {
+    "message": "Gipadala na ang hangyo sa pakighigala"
+  },
+  "friends.friend.view-profile": {
+    "message": "Tan-awa ang propayl"
+  },
+  "friends.heading": {
+    "message": "Mga higala"
+  },
+  "friends.heading.active": {
+    "message": "Malihokon"
+  },
+  "friends.heading.offline": {
+    "message": "Sira"
+  },
+  "friends.heading.online": {
+    "message": "Buka"
+  },
+  "friends.heading.pending": {
+    "message": "Gahulat"
+  },
+  "friends.no-friends-match": {
+    "message": "Walay higala nga motukma sa \"{query}\""
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Mangita sa mga higala..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
   },
   "instance.add-server.add-and-play": {
     "message": "Idugang ug dulaa"
   },
   "instance.add-server.add-server": {
-    "message": "Idugang ang tigtagad"
+    "message": "Idugang ang magsisilbi"
   },
   "instance.add-server.resource-pack.disabled": {
     "message": "Dili motugot"
@@ -60,13 +141,13 @@
     "message": "Magpatugot"
   },
   "instance.add-server.title": {
-    "message": "Pagdugang og tigtagad"
+    "message": "Pagdugang og magsisilbi"
   },
   "instance.edit-server.title": {
-    "message": "Usba ang tigtagad"
+    "message": "Usba ang magsisilbi"
   },
   "instance.edit-world.hide-from-home": {
-    "message": "Ayaw ipakita sa panid sa Balay"
+    "message": "Ayaw ipakita sa Puluy-anang panid"
   },
   "instance.edit-world.name": {
     "message": "Ngalan"
@@ -81,31 +162,49 @@
     "message": "Usba ang kalibutan"
   },
   "instance.filter.disabled": {
-    "message": "Di-gagana nga mga proyekto"
+    "message": "Di-paganhong mga proyekto"
   },
   "instance.filter.updates-available": {
     "message": "Naay bag-ong mga kausaban"
   },
+  "instance.server-modal.address": {
+    "message": "Padad-anan"
+  },
   "instance.server-modal.name": {
     "message": "Ngalan"
   },
   "instance.server-modal.placeholder-name": {
-    "message": "Minecraft nga Tigtagad"
+    "message": "Minecraft nga Magsisilbi"
   },
   "instance.server-modal.resource-pack": {
-    "message": "Putos sa kabtangan"
+    "message": "Putos sa kahinguhaan"
+  },
+  "instance.settings.tabs.general": {
+    "message": "Tinanan"
   },
   "instance.settings.tabs.general.delete": {
-    "message": "Tangtangi ang pananglitan"
+    "message": "Panas-i kining pananglitan"
   },
   "instance.settings.tabs.general.delete.button": {
-    "message": "Tangtangi ang pananglitan"
+    "message": "Panas-i kining pananglitan"
   },
   "instance.settings.tabs.general.delete.description": {
-    "message": "Malungtarong matangtang ang pananglitan sa imong himan, apil na ang imong mga kalibutan, paghan-ay, ug tanang gitaod nga sulod. Pag-amping, dili na mabawi kung tangtangon na nimo ang pananglitan."
+    "message": "Malungtarong mopanas ang pananglitan sa imong himan, apil na ang imong mga kalibutan, paghan-ay, ug tanang gitaod nga sulod. Pag-amping, dili na mabawi kung gipanas na nimo ang pananglitan."
+  },
+  "instance.settings.tabs.general.deleting.button": {
+    "message": "Gapanas..."
+  },
+  "instance.settings.tabs.general.duplicate-button": {
+    "message": "Paghulad"
+  },
+  "instance.settings.tabs.general.duplicate-button.tooltip.installing": {
+    "message": "Dili makahulad samtang nga gataud."
+  },
+  "instance.settings.tabs.general.duplicate-instance": {
+    "message": "Paghulad sa pananglitan"
   },
   "instance.settings.tabs.general.duplicate-instance.description": {
-    "message": "Buhatan og kopya kining pananglitan, apil na ang imong mga kalibutan, paghan-ay, kausaban, ug uban pa."
+    "message": "Buhatan og awat kining pananglitan, apil na ang imong mga kalibutan, paghan-ay, kausaban, ug uban pa."
   },
   "instance.settings.tabs.general.edit-icon": {
     "message": "Usba ang amoy"
@@ -113,17 +212,197 @@
   "instance.settings.tabs.general.edit-icon.remove": {
     "message": "Tangtangi ang amoy"
   },
+  "instance.settings.tabs.general.edit-icon.replace": {
+    "message": "Pulihan ang amoy"
+  },
+  "instance.settings.tabs.general.edit-icon.select": {
+    "message": "Pamili og amoy"
+  },
+  "instance.settings.tabs.general.library-groups": {
+    "message": "Mga pundok sa librarya"
+  },
+  "instance.settings.tabs.general.library-groups.create": {
+    "message": "Pagbuhat og bag-o nga pundok"
+  },
+  "instance.settings.tabs.general.library-groups.description": {
+    "message": "Gitugotan sa mga pundok sa librarya nga imong mahan-ay ang imong mga pananglitan sa nagkalain-lain nga bahin sa imong librarya."
+  },
+  "instance.settings.tabs.general.library-groups.enter-name": {
+    "message": "Ibutang ang ngalan sa pundok"
+  },
+  "instance.settings.tabs.general.name": {
+    "message": "Ngalan"
+  },
+  "instance.settings.tabs.hooks": {
+    "message": "Mga kaw-it sa paglansad"
+  },
+  "instance.settings.tabs.hooks.custom-hooks": {
+    "message": "Mga pinatuyo nga kaw-it sa paglansad"
+  },
+  "instance.settings.tabs.hooks.description": {
+    "message": "Gitugotan sa mga kaw-it ang mga eksperto nga mga tiggamit nga makapadagan og mga sistema nga sugo ayha ug paghuman malansad ang dula."
+  },
+  "instance.settings.tabs.hooks.post-exit": {
+    "message": "Human-matak-op"
+  },
+  "instance.settings.tabs.hooks.post-exit.description": {
+    "message": "Ipadagan paghuman matak-op ang dula."
+  },
+  "instance.settings.tabs.hooks.post-exit.enter": {
+    "message": "Ibutang ang human-matak-op nga sugo..."
+  },
+  "instance.settings.tabs.hooks.pre-launch": {
+    "message": "Ayha-malansad"
+  },
+  "instance.settings.tabs.hooks.pre-launch.description": {
+    "message": "Ipadagan ayha malansad ang pananglitan."
+  },
+  "instance.settings.tabs.hooks.pre-launch.enter": {
+    "message": "Ibutang ang ayha-malansad nga sugo..."
+  },
+  "instance.settings.tabs.hooks.title": {
+    "message": "Mga kaw-it sa paglansad sa dula"
+  },
+  "instance.settings.tabs.hooks.wrapper": {
+    "message": "Pamutos"
+  },
+  "instance.settings.tabs.hooks.wrapper.description": {
+    "message": "Pamutos nga sugo sa paglansad sa Minecraft."
+  },
+  "instance.settings.tabs.hooks.wrapper.enter": {
+    "message": "Ibutang ang pamutos nga sugo..."
+  },
+  "instance.settings.tabs.installation": {
+    "message": "Pagtaud"
+  },
+  "instance.settings.tabs.installation.change-version.already-installed.modded": {
+    "message": "Nataud naman ang {platform} {version} alang sa Minecraft {game_version}"
+  },
+  "instance.settings.tabs.installation.change-version.already-installed.vanilla": {
+    "message": "Nataud naman ang Banilya nga {game_version}"
+  },
+  "instance.settings.tabs.installation.change-version.button": {
+    "message": "Pulihan og bersiyon"
+  },
+  "instance.settings.tabs.installation.change-version.button.install": {
+    "message": "Itaud"
+  },
+  "instance.settings.tabs.installation.change-version.button.installing": {
+    "message": "Gataud"
+  },
+  "instance.settings.tabs.installation.change-version.cannot-while-fetching": {
+    "message": "Gapangita og mga bersiyon sa mga putos sa kausaban"
+  },
+  "instance.settings.tabs.installation.change-version.in-progress": {
+    "message": "Gataud sa bag-o nga bersiyon"
+  },
+  "instance.settings.tabs.installation.currently-installed": {
+    "message": "Pagkakarong taud"
+  },
+  "instance.settings.tabs.installation.debug-information": {
+    "message": "Kasayoran sa pagputli:"
+  },
+  "instance.settings.tabs.installation.game-version": {
+    "message": "Bersiyon sa dula"
+  },
+  "instance.settings.tabs.installation.install": {
+    "message": "Itaud"
+  },
+  "instance.settings.tabs.installation.loader-version": {
+    "message": "Bersiyon sa {loader}"
+  },
+  "instance.settings.tabs.installation.minecraft-version": {
+    "message": "Minecraft {version}"
+  },
+  "instance.settings.tabs.installation.no-loader-versions": {
+    "message": "Dili magamit ang {loader} sa Minecraft {version}. Sulayi ang ubang tigkarga sa kausaban."
+  },
+  "instance.settings.tabs.installation.platform": {
+    "message": "Pantawan"
+  },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
     "message": "Mahimo nga mobalik sa sinugdan ang tanang gitaod o giusab nga sulod sa unsay ihatag sa putos sa kausaban, tangtangon ang mga kausaban o sulod nga imong gidugang apil na ang lintunganay nga putos sa kausaban. Mahimo nga maayo ang mga tuhaw nga batasan kon naay pagbag-o sa pananglitan, apan kon gasalig na ang imong kalibutan sa dinugang nga sulod, mahimo nga madaut ani ang daan nga mga kalibutan."
   },
   "instance.settings.tabs.installation.reinstall.description": {
     "message": "Ibalik ang mga sulod sa pananglitan sa unang kahimtang, tangtangon ang mga kausaban o sulod nga imong gidugang apil na ang lintunganay nga putos sa kausaban."
   },
+  "instance.settings.tabs.installation.repair.button": {
+    "message": "Ayohon"
+  },
+  "instance.settings.tabs.installation.repair.button.repairing": {
+    "message": "Gaayo"
+  },
+  "instance.settings.tabs.installation.repair.confirm.description": {
+    "message": "Sa pag-ayo, mataud pagbalik ang mga sinaligan sa Minecraft ug mangita og mga kadunot. Mahimo nga masulbad niini ang mga isyu kun dili malunsad ang dula tungod sa mga kasaypan matud sa tiglansad, apan dili ni masulbad ang mga isyu o pagdusmog matud sa mga gitaud nga kausaban."
+  },
+  "instance.settings.tabs.installation.repair.confirm.title": {
+    "message": "Ayohon ang pananglitan?"
+  },
+  "instance.settings.tabs.installation.show-all-versions": {
+    "message": "Ipakita ang tanang bersiyon"
+  },
+  "instance.settings.tabs.installation.tooltip.action.change-version": {
+    "message": "pulihan og bersiyon"
+  },
+  "instance.settings.tabs.installation.tooltip.action.install": {
+    "message": "itaud"
+  },
+  "instance.settings.tabs.installation.tooltip.action.reinstall": {
+    "message": "itaud pag-usab"
+  },
+  "instance.settings.tabs.installation.tooltip.action.repair": {
+    "message": "ayohon"
+  },
+  "instance.settings.tabs.installation.tooltip.cannot-while-installing": {
+    "message": "Dili maka-{action} samtang nga gataud"
+  },
+  "instance.settings.tabs.installation.tooltip.cannot-while-offline": {
+    "message": "Dili maka-{action} samtang binugto"
+  },
+  "instance.settings.tabs.installation.tooltip.cannot-while-repairing": {
+    "message": "Dili maka-{action} samtang nag-ayo"
+  },
+  "instance.settings.tabs.installation.unknown-version": {
+    "message": "(diinilang bersiyon)"
+  },
+  "instance.settings.tabs.installation.unlink.confirm.description": {
+    "message": "Kun imong ipadayon, dili na nimo makatay pagbalik nga wala mohimo og bag-o nga pananglitan. Dili na ka makadawat og pagpasibo sa putos sa kausaban ug mahimo kining naandan nga."
+  },
+  "instance.settings.tabs.installation.unlink.description": {
+    "message": "Nakakatay kining pananglitan sa usa ka putos sa kausaban, pasabot ani nga dili mapasibo ang mga kausaban og dili nimo mausab ang tigkarga sa kausaban o ang bersiyon sa Minecraft. Kanunay nga mabugto kining pananglitan og putos sa kausabon kun tangtangon ang katay."
+  },
+  "instance.settings.tabs.java.hooks": {
+    "message": "Mga kaw-it"
+  },
+  "instance.settings.tabs.java.java-installation": {
+    "message": "Pagtaud sa Java"
+  },
+  "instance.settings.tabs.window": {
+    "message": "Tamboanan"
+  },
   "instance.settings.tabs.window.custom-window-settings": {
-    "message": "Mga gusto sa pinatuyo nga tamboanan"
+    "message": "Mga himutangan sa pinatuyo nga tamboanan"
+  },
+  "instance.settings.tabs.window.height": {
+    "message": "Gitas-on"
+  },
+  "instance.settings.tabs.window.width": {
+    "message": "Gilapdon"
   },
   "instance.settings.title": {
-    "message": "Mga Gusto"
+    "message": "Mga Himutangan"
+  },
+  "instance.worlds.a_minecraft_server": {
+    "message": "Usa ka Minecraft nga Magsisilbi"
+  },
+  "instance.worlds.copy_address": {
+    "message": "Awata ang padad-anan"
+  },
+  "instance.worlds.type.server": {
+    "message": "Magsisilbi"
+  },
+  "instance.worlds.type.singleplayer": {
+    "message": "Inusara nga dula"
   },
   "instance.worlds.view_instance": {
     "message": "Tan-awa ang pananglitan"
diff --git a/apps/app-frontend/src/locales/da-DK/index.json b/apps/app-frontend/src/locales/da-DK/index.json
index ffe0678b..c1dfe6b1 100644
--- a/apps/app-frontend/src/locales/da-DK/index.json
+++ b/apps/app-frontend/src/locales/da-DK/index.json
@@ -2,6 +2,9 @@
   "app.settings.developer-mode-enabled": {
     "message": "Udvikler-tilstand aktiveret."
   },
+  "app.settings.downloading": {
+    "message": "Downloader v{version}"
+  },
   "app.settings.tabs.appearance": {
     "message": "Udseende"
   },
@@ -20,6 +23,15 @@
   "app.settings.tabs.resource-management": {
     "message": "Ressourcestyring"
   },
+  "app.update-toast.body": {
+    "message": "Modrinth App v{version} er allerede installeret! Genindlæs for at opdatere nu, eller automatisk når du lukker Modrinth App."
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "Modrinth App v{version} er færdig med at download. Genindlæs for at opdatere nu, eller automatisk når du lukker Modrinth App."
+  },
+  "app.update-toast.body.metered": {
+    "message": "Modrinth App v{version} er nu tilgængelig! Siden du er på et begrænset netværk, vi downloadede den ikke automatisk."
+  },
   "instance.add-server.add-and-play": {
     "message": "Tilføj og spil"
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index b12f7264..96159cdf 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -65,6 +65,69 @@
   "app.update.reload-to-update": {
     "message": "Lade neu um Aktualisierung zu installieren"
   },
+  "friends.action.add-friend": {
+    "message": "Freund hinzufügen"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} Freundschaftsanfrage{count, plural, one {} other {n}}"
+  },
+  "friends.add-friend.submit": {
+    "message": "Freundschaftsanfrage senden"
+  },
+  "friends.add-friend.title": {
+    "message": "Einen Freund hinzufügen"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Es könnte anders als ihr Minecraft Nutzername sein!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Modrinth Nutzernamen eingeben..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Was ist der Modrinth Nutzername deines Freundes?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Füge Freunde hinzu</link> um zu sehen, was sie spielen!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Anfrage abbrechen"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Freund entfernen"
+  },
+  "friends.friend.request-sent": {
+    "message": "Freundschaftsanfrage gesendet"
+  },
+  "friends.friend.view-profile": {
+    "message": "Profil anzeigen"
+  },
+  "friends.heading": {
+    "message": "Freunde"
+  },
+  "friends.heading.active": {
+    "message": "Aktiv"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "Ausstehend"
+  },
+  "friends.no-friends-match": {
+    "message": "Keine Freunde, die mit \"{query}\" übereinstimmen"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Freunde suchen..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Logge dich in ein Modrinth Konto ein</link> um Freunde hinzuzufügen und zu sehen, was sie spielen!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Ersteue u starte"
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index e02ef3fb..3c97a9e9 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -33,7 +33,7 @@
     "message": "Die Modrinth App v{version} ist jetzt verfügbar! Da Sie sich in einem getakteten Netzwerk befinden, haben wir es nicht automatisch heruntergeladen."
   },
   "app.update-toast.changelog": {
-    "message": "Änderungen"
+    "message": "Änderungsverlauf"
   },
   "app.update-toast.download": {
     "message": "Herunterladen ({size})"
@@ -45,13 +45,13 @@
     "message": "Neu laden"
   },
   "app.update-toast.title": {
-    "message": "Aktualisierung verfügbar"
+    "message": "Update verfügbar"
   },
   "app.update-toast.title.download-complete": {
-    "message": "Herunterladen abgeschlossen"
+    "message": "Download abgeschlossen"
   },
   "app.update.complete-toast.text": {
-    "message": "Drücke hier um die Änderungen zu sehen."
+    "message": "Drücke hier, um den Änderungsverlauf zu sehen."
   },
   "app.update.complete-toast.title": {
     "message": "Version {version} wurde erfolgreich installiert!"
@@ -65,6 +65,63 @@
   "app.update.reload-to-update": {
     "message": "Neu laden um Update zu installieren"
   },
+  "friends.action.add-friend": {
+    "message": "Freund hinzufügen"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural, one {Freundesanfrage} other {Freundesanfragen}}"
+  },
+  "friends.add-friend.submit": {
+    "message": "Sende Freundesanfrage"
+  },
+  "friends.add-friend.title": {
+    "message": "Einen Freund hinzufügen"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Es kann vom Minecraft Nutzernamen abweichen!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Gebe den Modrinth Nutzername ein..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Was ist der Modrinth Nutzername deines Freundes?"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Anfrage abbrechen"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Freund entfernen"
+  },
+  "friends.friend.request-sent": {
+    "message": "Freundesanfrage gesendet"
+  },
+  "friends.friend.view-profile": {
+    "message": "Profil anzeigen"
+  },
+  "friends.heading": {
+    "message": "Freunde"
+  },
+  "friends.heading.active": {
+    "message": "Aktiv"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "Ausstehend"
+  },
+  "friends.no-friends-match": {
+    "message": "Keine Freunde die \"{query}\" entsprechen"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Suche nach Freunden..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
   "instance.add-server.add-and-play": {
     "message": "Hinzufügen und spielen"
   },
@@ -129,7 +186,7 @@
     "message": "Instanz löschen"
   },
   "instance.settings.tabs.general.delete.description": {
-    "message": "Löscht eine Instanz dauerhaft von deinem Gerät, einschließlich deiner Welten, Einstellungen und aller installierten Inhalte. Sei vorsichtig, eine gelöschte Installation ist nicht wiederherstellbar."
+    "message": "Löscht eine Instanz dauerhaft von deinem Gerät, einschließlich deiner Welten, Einstellungen und aller installierten Inhalte. Sei vorsichtig, eine gelöschte Instanz ist nicht wiederherstellbar."
   },
   "instance.settings.tabs.general.deleting.button": {
     "message": "Wird gelöscht..."
@@ -165,7 +222,7 @@
     "message": "Neue Gruppe erstellen"
   },
   "instance.settings.tabs.general.library-groups.description": {
-    "message": "Gruppen ermöglichen dir, deine Instanzen in verschiedenen Abteilen deiner Bibliothek einzuteilen."
+    "message": "Bibliotheksgruppen ermöglichen es dir, deine Instanzen in verschiedene Abteile deiner Bibliothek einzuteilen."
   },
   "instance.settings.tabs.general.library-groups.enter-name": {
     "message": "Gruppenname eingeben"
@@ -189,16 +246,16 @@
     "message": "Wird ausgeführt nach dem Beenden des Spiels."
   },
   "instance.settings.tabs.hooks.post-exit.enter": {
-    "message": "Ausgeführter Befehl nach dem Beenden des Spiels eingeben..."
+    "message": "Nach Spielbeendigung auszuführender Befehl eingeben..."
   },
   "instance.settings.tabs.hooks.pre-launch": {
     "message": "Vor dem Starten des Spiels"
   },
   "instance.settings.tabs.hooks.pre-launch.description": {
-    "message": "Wird ausgeführt nach dem Starten des Spiels."
+    "message": "Wird vor dem Starten des Spiels ausgeführt."
   },
   "instance.settings.tabs.hooks.pre-launch.enter": {
-    "message": "Ausgeführter Befehl nach dem Starten des Spiels eingeben..."
+    "message": "Vor Spielstart auszuführender Befehl eingeben..."
   },
   "instance.settings.tabs.hooks.title": {
     "message": "Start Hooks"
@@ -237,7 +294,7 @@
     "message": "Neue Version wird installiert"
   },
   "instance.settings.tabs.installation.currently-installed": {
-    "message": "Aktuell installiert"
+    "message": "Derzeit installiert"
   },
   "instance.settings.tabs.installation.debug-information": {
     "message": "Informationen für die Fehlerbehebung:"
@@ -315,19 +372,19 @@
     "message": "Version ändern"
   },
   "instance.settings.tabs.installation.tooltip.action.install": {
-    "message": "installieren"
+    "message": "Installieren"
   },
   "instance.settings.tabs.installation.tooltip.action.reinstall": {
-    "message": "neuinstallieren"
+    "message": "Neuinstallieren"
   },
   "instance.settings.tabs.installation.tooltip.action.repair": {
-    "message": "reparieren"
+    "message": "Reparieren"
   },
   "instance.settings.tabs.installation.tooltip.cannot-while-installing": {
     "message": "{action} während der Installation nicht möglich"
   },
   "instance.settings.tabs.installation.tooltip.cannot-while-offline": {
-    "message": "{action} wegen fehlender Internetverbindung nicht möglich"
+    "message": "{action} offline nicht möglich"
   },
   "instance.settings.tabs.installation.tooltip.cannot-while-repairing": {
     "message": "{action} während der Reparation nicht möglich"
@@ -363,7 +420,7 @@
     "message": "Java-Argumente"
   },
   "instance.settings.tabs.java.java-installation": {
-    "message": "Java Installation"
+    "message": "Java-Installation"
   },
   "instance.settings.tabs.java.java-memory": {
     "message": "Zugewiesener Arbeitsspeicher"
@@ -375,7 +432,7 @@
     "message": "Benutzerdefinierte Spielfenstereinstellungen"
   },
   "instance.settings.tabs.window.fullscreen": {
-    "message": "Vollbildschirm"
+    "message": "Vollbild"
   },
   "instance.settings.tabs.window.fullscreen.description": {
     "message": "Lässt das Spiel im Vollbildmodus starten (mit Verwendung von options.txt)."
@@ -384,7 +441,7 @@
     "message": "Höhe"
   },
   "instance.settings.tabs.window.height.description": {
-    "message": "Die Höhe des spiel Fensters beim Starten."
+    "message": "Die Höhe des Spielfensters beim Start."
   },
   "instance.settings.tabs.window.height.enter": {
     "message": "Höhe eingeben..."
@@ -393,7 +450,7 @@
     "message": "Breite"
   },
   "instance.settings.tabs.window.width.description": {
-    "message": "Die Breite des spiel Fensters beim Starten."
+    "message": "Die Breite des Spielfensters beim Start."
   },
   "instance.settings.tabs.window.width.enter": {
     "message": "Breite eingeben..."
@@ -447,16 +504,16 @@
     "message": "Instanzen anzeigen"
   },
   "instance.worlds.world_in_use": {
-    "message": "Welt wird aktuell benutzt"
+    "message": "Welt ist aktuell in Benutzung"
   },
   "search.filter.locked.instance": {
-    "message": "Von der Instanz vorgegeben"
+    "message": "Von der Instanz bereitgestellt"
   },
   "search.filter.locked.instance-game-version.title": {
     "message": "Spielversion ist von der Instanz vorgegeben"
   },
   "search.filter.locked.instance-loader.title": {
-    "message": "Der Loader ist von der Instanz vorgegeben"
+    "message": "Der Loader wird von der Instanz bereitgestellt"
   },
   "search.filter.locked.instance.sync": {
     "message": "Mit Instanz synchronisieren"
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index 061f33d6..68bb0f48 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -65,6 +65,63 @@
   "app.update.reload-to-update": {
     "message": "Recarga para instalar la actualización"
   },
+  "friends.action.add-friend": {
+    "message": "Agrega a un amigo"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural, one {petición} other {peticiones}} de amistad"
+  },
+  "friends.add-friend.submit": {
+    "message": "Envía una petición de amistad"
+  },
+  "friends.add-friend.title": {
+    "message": "Agrega a un amigo"
+  },
+  "friends.add-friend.username.description": {
+    "message": "¡Puede ser diferente de su apodo en Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Escribe su apodo en Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "¿Cuál es el apodo de tu amigo en Modrinth?"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Cancelar petición"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Eliminar amigo"
+  },
+  "friends.friend.request-sent": {
+    "message": "Petición de amistad enviada"
+  },
+  "friends.friend.view-profile": {
+    "message": "Ver perfil"
+  },
+  "friends.heading": {
+    "message": "Amigos"
+  },
+  "friends.heading.active": {
+    "message": "Activos"
+  },
+  "friends.heading.offline": {
+    "message": "Desconectados"
+  },
+  "friends.heading.online": {
+    "message": "Conectados"
+  },
+  "friends.heading.pending": {
+    "message": "Pendientes"
+  },
+  "friends.no-friends-match": {
+    "message": "Ningún apodo concuerda con ''{query}''"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Buscando amigos..."
+  },
+  "friends.section.heading": {
+    "message": "{title}: {count}"
+  },
   "instance.add-server.add-and-play": {
     "message": "Añadir y jugar"
   },
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index 6d7dee15..0610b983 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -24,13 +24,13 @@
     "message": "Gestión de recursos"
   },
   "app.update-toast.body": {
-    "message": "¡La aplicación Modrinth v{version} está lista para instalarse! Actualiza ahora o automáticamente al cerrar la aplicación Modrinth."
+    "message": "¡La versión v{version} de Modrinth está lista para instalarse! Actualiza ahora o automáticamente al cerrar la aplicación."
   },
   "app.update-toast.body.download-complete": {
-    "message": "La descarga de la aplicación Modrinth v{version} ha finalizado. Actualice ahora o automáticamente al cerrar la aplicación Modrinth."
+    "message": "La descarga de la versión v{version} de Modrinth ha finalizado. Actualice ahora o automáticamente al cerrar la aplicación."
   },
   "app.update-toast.body.metered": {
-    "message": "¡La aplicación Modrinth v{version} ya está disponible! Como estás conectado a una red con límite de datos, no la hemos descargado automáticamente."
+    "message": "¡La versión v{version} de Modrinth ya está disponible! Como estás conectado a una red con límite de datos, no la hemos descargado automáticamente."
   },
   "app.update-toast.changelog": {
     "message": "Registro de cambios"
@@ -65,6 +65,63 @@
   "app.update.reload-to-update": {
     "message": "Recarga para instalar la actualización"
   },
+  "friends.action.add-friend": {
+    "message": "Agrega a un amigo"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural, one {petición} other {peticiones}} de amistad"
+  },
+  "friends.add-friend.submit": {
+    "message": "Envía una petición de amistad"
+  },
+  "friends.add-friend.title": {
+    "message": "Agrega a un amigo"
+  },
+  "friends.add-friend.username.description": {
+    "message": "¡Puede ser diferente de su apodo en Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Escribe su apodo en Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "¿Cuál es el apodo de tu amigo en Modrinth?"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Cancelar petición"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Eliminar amigo"
+  },
+  "friends.friend.request-sent": {
+    "message": "Petición de amistad enviada"
+  },
+  "friends.friend.view-profile": {
+    "message": "Ver perfil"
+  },
+  "friends.heading": {
+    "message": "Amigos"
+  },
+  "friends.heading.active": {
+    "message": "Activos"
+  },
+  "friends.heading.offline": {
+    "message": "Desconectados"
+  },
+  "friends.heading.online": {
+    "message": "Conectados"
+  },
+  "friends.heading.pending": {
+    "message": "Pendientes"
+  },
+  "friends.no-friends-match": {
+    "message": "Ningún apodo concuerda con ''{query}''"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Buscando amigos..."
+  },
+  "friends.section.heading": {
+    "message": "{title}: {count}"
+  },
   "instance.add-server.add-and-play": {
     "message": "Añadir y jugar"
   },
diff --git a/apps/app-frontend/src/locales/fil-PH/index.json b/apps/app-frontend/src/locales/fil-PH/index.json
index b6620d63..d0fc9fd8 100644
--- a/apps/app-frontend/src/locales/fil-PH/index.json
+++ b/apps/app-frontend/src/locales/fil-PH/index.json
@@ -23,32 +23,113 @@
   "app.settings.tabs.resource-management": {
     "message": "Pamamahala ng resource"
   },
+  "app.update-toast.body": {
+    "message": "Ang Modrinth App v{version} ay handa nang ma-install. Mag-reload upang ma-update ngayon, o awtomatiko pagsara ng Modrinth App."
+  },
   "app.update-toast.body.download-complete": {
-    "message": "Tapos nang ma-download ang Modrinth App v{version}. Mag-reload upang ma-update ngayon, o mamaya nalang sa pagsara ng Modrinth App."
+    "message": "Tapos nang ma-download ang Modrinth App v{version}. Mag-reload upang ma-update ngayon, o awtomatiko pagsara ng Modrinth App."
   },
   "app.update-toast.body.metered": {
     "message": "Magagamit na ngayon ang Modrinth App v{version}! Hindi namin dinanload kaagad dahil naka-metro ang inyong network."
   },
+  "app.update-toast.changelog": {
+    "message": "Changelog"
+  },
   "app.update-toast.download": {
     "message": "I-download ({size})"
   },
   "app.update-toast.downloading": {
     "message": "Nagda-download..."
   },
+  "app.update-toast.reload": {
+    "message": "Mag-reload"
+  },
+  "app.update-toast.title": {
+    "message": "May bagong update"
+  },
   "app.update-toast.title.download-complete": {
     "message": "Nakumpleto ang pagdownload"
   },
+  "app.update.complete-toast.text": {
+    "message": "Magpindot rito upang matingnan ang changelog."
+  },
+  "app.update.complete-toast.title": {
+    "message": "Tagumpay na na-install ang bersiyong {version}!"
+  },
   "app.update.download-update": {
     "message": "I-download ang update"
   },
   "app.update.downloading-update": {
     "message": "Nagdadownload ng update ({percent}%)"
   },
+  "app.update.reload-to-update": {
+    "message": "Handang ma-install ang update"
+  },
+  "friends.action.add-friend": {
+    "message": "Magdagdag ng kaibigan"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count, plural, one {{count}} other {{count} na}} hiling na makipagkaibigan"
+  },
+  "friends.add-friend.submit": {
+    "message": "Magpadala ng hiling na makipagkaibigan"
+  },
+  "friends.add-friend.title": {
+    "message": "Pagdaragdag ng kaibigan"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Maaaraing hindi pareho sa kanilang pangalan sa Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Ilagay ang username sa Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Ano ang pangalan ng iyong kaibigan sa Modrinth?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Magdagdag ng mga kaibigan</link> upang makita ang kanilang nilalaro!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Kanselahin ang hiling"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Tanggalin ang kaibing"
+  },
+  "friends.friend.request-sent": {
+    "message": "Ipinadala na ang hiling na makipagkaibigan"
+  },
+  "friends.friend.view-profile": {
+    "message": "Tingnan ang profile"
+  },
+  "friends.heading": {
+    "message": "Mga kaibigan"
+  },
+  "friends.heading.active": {
+    "message": "Aktibo"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "Nakabinbin"
+  },
+  "friends.no-friends-match": {
+    "message": "Walang kaibigang tumugma sa \"{query}\""
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Hanapin ang mga kaibigan..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
   "instance.add-server.add-and-play": {
     "message": "Idagdag at laruin"
   },
   "instance.add-server.add-server": {
-    "message": "Idagdag ang serber"
+    "message": "Idagdag ang server"
   },
   "instance.add-server.resource-pack.disabled": {
     "message": "Hindi pinahihintulotan"
@@ -60,10 +141,10 @@
     "message": "Magpahintulot"
   },
   "instance.add-server.title": {
-    "message": "Magdagdag ng serber"
+    "message": "Magdagdag ng server"
   },
   "instance.edit-server.title": {
-    "message": "Baguhin ang serber"
+    "message": "Baguhin ang server"
   },
   "instance.edit-world.hide-from-home": {
     "message": "Huwag ipakita sa Home na pahina"
@@ -86,15 +167,21 @@
   "instance.filter.updates-available": {
     "message": "May bagong mga update"
   },
+  "instance.server-modal.address": {
+    "message": "Adres"
+  },
   "instance.server-modal.name": {
     "message": "Pangalan"
   },
   "instance.server-modal.placeholder-name": {
-    "message": "Minecraft na Serber"
+    "message": "Minecraft Server"
   },
   "instance.server-modal.resource-pack": {
     "message": "Resource pack"
   },
+  "instance.settings.tabs.general": {
+    "message": "General"
+  },
   "instance.settings.tabs.general.delete": {
     "message": "I-delete ang instansiya"
   },
@@ -104,6 +191,18 @@
   "instance.settings.tabs.general.delete.description": {
     "message": "Permanenteng matatanggal ang instansiya sa iyong device, kasali na ang iyong mga mundo, konpigurasyon, at lahat ng nakainstall na kontento. Mag-ingat, kapag magtanggal ka ng instansiya ay hindi na ito mababawi."
   },
+  "instance.settings.tabs.general.deleting.button": {
+    "message": "Nagde-delete..."
+  },
+  "instance.settings.tabs.general.duplicate-button": {
+    "message": "I-duplicate"
+  },
+  "instance.settings.tabs.general.duplicate-button.tooltip.installing": {
+    "message": "Hindi makaka-duplicate habang nag-i-install."
+  },
+  "instance.settings.tabs.general.duplicate-instance": {
+    "message": "I-duplicate ang instansiya"
+  },
   "instance.settings.tabs.general.duplicate-instance.description": {
     "message": "Gagawan ng kopya ng instansiyang ito, kasali na ang mga mundo, konpigurasyon, mods, at iba pa."
   },
@@ -113,18 +212,198 @@
   "instance.settings.tabs.general.edit-icon.remove": {
     "message": "Tanggalin ang ikono"
   },
+  "instance.settings.tabs.general.edit-icon.replace": {
+    "message": "Palitan ang ikono"
+  },
+  "instance.settings.tabs.general.edit-icon.select": {
+    "message": "Pumili ng ikono"
+  },
+  "instance.settings.tabs.general.library-groups": {
+    "message": "Mga grupo ng librerya"
+  },
+  "instance.settings.tabs.general.library-groups.create": {
+    "message": "Gumawa ng bagong grupo"
+  },
+  "instance.settings.tabs.general.library-groups.description": {
+    "message": "Binibigyan ng mga grupo ng librerya na iyong maayos ang iyong mga instansiya sa iba't-ibang pangkat in iyong librerya."
+  },
+  "instance.settings.tabs.general.library-groups.enter-name": {
+    "message": "Ilagay ang pangalan ng grupo"
+  },
+  "instance.settings.tabs.general.name": {
+    "message": "Pangalan"
+  },
+  "instance.settings.tabs.hooks": {
+    "message": "Mga launch hook"
+  },
+  "instance.settings.tabs.hooks.custom-hooks": {
+    "message": "Mga custom na launch hook"
+  },
+  "instance.settings.tabs.hooks.description": {
+    "message": "Binibigyan-daan ng mga hook ang mga ekspertong user na makapagtakbo ng mga system command bago at pagkatapos ma-launch ang laro."
+  },
+  "instance.settings.tabs.hooks.post-exit": {
+    "message": "Post-exist"
+  },
+  "instance.settings.tabs.hooks.post-exit.description": {
+    "message": "Ipapatakbo pagkatapos magsara ang laro."
+  },
+  "instance.settings.tabs.hooks.post-exit.enter": {
+    "message": "Ilagay ang post-exit command..."
+  },
+  "instance.settings.tabs.hooks.pre-launch": {
+    "message": "Pre-launch"
+  },
+  "instance.settings.tabs.hooks.pre-launch.description": {
+    "message": "Ipapatakbo bago mai-launch ang instansiya."
+  },
+  "instance.settings.tabs.hooks.pre-launch.enter": {
+    "message": "Ilagay ang pre-launch command..."
+  },
+  "instance.settings.tabs.hooks.title": {
+    "message": "Mga launch hook ng laro"
+  },
+  "instance.settings.tabs.hooks.wrapper": {
+    "message": "Wrapper"
+  },
+  "instance.settings.tabs.hooks.wrapper.description": {
+    "message": "Wrapper command sa pag-launch ng Minecraft."
+  },
+  "instance.settings.tabs.hooks.wrapper.enter": {
+    "message": "Ilagay ang wrapper command..."
+  },
+  "instance.settings.tabs.installation": {
+    "message": "Instalasyon"
+  },
+  "instance.settings.tabs.installation.change-version.already-installed.modded": {
+    "message": "Naka-install naman ang {platform} {version} para sa Minecraft {game_version}"
+  },
+  "instance.settings.tabs.installation.change-version.already-installed.vanilla": {
+    "message": "Naka-install naman ang Vanilla {game_version}"
+  },
+  "instance.settings.tabs.installation.change-version.button": {
+    "message": "Palitan ang bersiyon"
+  },
+  "instance.settings.tabs.installation.change-version.button.install": {
+    "message": "I-install"
+  },
+  "instance.settings.tabs.installation.change-version.button.installing": {
+    "message": "Ini-install"
+  },
+  "instance.settings.tabs.installation.change-version.cannot-while-fetching": {
+    "message": "Nagfe-fetch ng mga bersiyon ng modpack"
+  },
+  "instance.settings.tabs.installation.change-version.in-progress": {
+    "message": "Ini-install ang bagong bersiyon"
+  },
+  "instance.settings.tabs.installation.currently-installed": {
+    "message": "Kasalukuyang naka-install"
+  },
+  "instance.settings.tabs.installation.debug-information": {
+    "message": "Impormasyon sa pagdebug:"
+  },
+  "instance.settings.tabs.installation.game-version": {
+    "message": "Bersiyon ng laro"
+  },
+  "instance.settings.tabs.installation.install": {
+    "message": "I-install"
+  },
+  "instance.settings.tabs.installation.loader-version": {
+    "message": "Bersiyon ng {loader}"
+  },
+  "instance.settings.tabs.installation.minecraft-version": {
+    "message": "Minecraft {version}"
+  },
+  "instance.settings.tabs.installation.no-loader-versions": {
+    "message": "Hindi magagamit ang {loader} sa Minecraft {version}. Sumubok ng ibang mod loader."
+  },
+  "instance.settings.tabs.installation.platform": {
+    "message": "Plataporma"
+  },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
     "message": "Ang pagrere-install ay maaaring mare-reset ang lahat ng na-install o binago na kontento sa kung anong ibibigay ng modpack, tatanggalin ang mga mods o kontentong idinagdag mo lalo na ang mga orihinal na modpack. Maaari nitong masiayos ang mga hindi inaasahang pag-uugali kung may pagbabagong naganap sa instansiya, ngunit kung dumedepende na ang iyong mundo sa karagdagang kontento, maaari nitong masira ang mga umiiral na mundo."
   },
   "instance.settings.tabs.installation.reinstall.description": {
     "message": "I-reset ang mga kontento ng instansiya sa orihinal niyang estado, tatanggalin ang mga mods o kontentong idinagdag mo lalo na ang mga orihinal na modpack."
   },
+  "instance.settings.tabs.installation.repair.button": {
+    "message": "Ayusin"
+  },
+  "instance.settings.tabs.installation.repair.button.repairing": {
+    "message": "Inaayos"
+  },
+  "instance.settings.tabs.installation.repair.confirm.description": {
+    "message": "Sa pagre-repair, mare-reinstall ang mga dependency ng Minecraft at maghahanap ng mga kurapsiyon. Maaaring maresolbe nito ang mga isyu kung hindi malu-launch ang laro dahil sa mga launcher-related error, ngunit hindi nito mareresolbe ang mga isyu o pag-crash na dulot nga mga na-install na mod."
+  },
+  "instance.settings.tabs.installation.repair.confirm.title": {
+    "message": "Ayusin ang instansiya?"
+  },
+  "instance.settings.tabs.installation.show-all-versions": {
+    "message": "Ipakita ang lahat ng bersiyon"
+  },
+  "instance.settings.tabs.installation.tooltip.action.change-version": {
+    "message": "palitan ang bersiyon"
+  },
+  "instance.settings.tabs.installation.tooltip.action.install": {
+    "message": "i-install"
+  },
+  "instance.settings.tabs.installation.tooltip.action.reinstall": {
+    "message": "i-reinstall"
+  },
+  "instance.settings.tabs.installation.tooltip.action.repair": {
+    "message": "ayusin"
+  },
+  "instance.settings.tabs.installation.tooltip.cannot-while-installing": {
+    "message": "Hindi makaka-{action} habang nag-i-install"
+  },
+  "instance.settings.tabs.installation.tooltip.cannot-while-offline": {
+    "message": "Hindi makaka-{action} habang nasa offline"
+  },
+  "instance.settings.tabs.installation.tooltip.cannot-while-repairing": {
+    "message": "Hindi makaka-{action} habang nag-aayos"
+  },
+  "instance.settings.tabs.installation.unknown-version": {
+    "message": "(hindi kilalang bersiyon)"
+  },
+  "instance.settings.tabs.installation.unlink.confirm.description": {
+    "message": "Kapag ipagpatuloy mo, hindi mo na itong mai-link muli ng hindi gagawa ng bagong instansiya. Hindi ka makakatanggap ng mga update ng modpack at magiging normal na itong."
+  },
+  "instance.settings.tabs.installation.unlink.description": {
+    "message": "Ang instansiyang ito ay naka-link sa isang modpack, ibig sabihin ang mga mod ay hindi mai-update at hindi mo mapapalitan ang mod loader o ang bersiyon ng Minecraft."
+  },
+  "instance.settings.tabs.java.hooks": {
+    "message": "Mga hook"
+  },
+  "instance.settings.tabs.java.java-installation": {
+    "message": "Instalasyon ng Java"
+  },
+  "instance.settings.tabs.window": {
+    "message": "Window"
+  },
   "instance.settings.tabs.window.custom-window-settings": {
     "message": "Mga setting sa custom na window"
   },
+  "instance.settings.tabs.window.height": {
+    "message": "Taas"
+  },
+  "instance.settings.tabs.window.width": {
+    "message": "Lapad"
+  },
   "instance.settings.title": {
     "message": "Mga Setting"
   },
+  "instance.worlds.a_minecraft_server": {
+    "message": "Isang Minecraft Server"
+  },
+  "instance.worlds.copy_address": {
+    "message": "Kopyahin ang adres"
+  },
+  "instance.worlds.type.server": {
+    "message": "Server"
+  },
+  "instance.worlds.type.singleplayer": {
+    "message": "Pang-isahang laro"
+  },
   "instance.worlds.view_instance": {
     "message": "Tingnan ang instansiya"
   }
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index 86aac14c..88ab70e3 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -2,6 +2,9 @@
   "app.settings.developer-mode-enabled": {
     "message": "Mode développeur activé."
   },
+  "app.settings.downloading": {
+    "message": "Téléchargement de la version {version}"
+  },
   "app.settings.tabs.appearance": {
     "message": "Apparence"
   },
@@ -20,6 +23,21 @@
   "app.settings.tabs.resource-management": {
     "message": "Gestion des ressources"
   },
+  "app.update-toast.body": {
+    "message": "L'application Modrinth v{version} est prêtes à être installé ! Relancez l'application pour faire la mise à jour maintenant ou la mise à jour se fera automatiquement lorsque vous fermerez l'application Modrinth."
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "L'application Modrinth v{version} a finis d'être téléchargé ! Relancez l'application pour faire la mise à jour maintenant ou la mise à jour se fera automatiquement lorsque vous fermerez l'application Modrinth."
+  },
+  "app.update-toast.body.metered": {
+    "message": "L'application Modrinth v{version} est disponible dès maintenant ! Lorsque vous êtes sur un réseau limité ou en donnée mobile, nous ne téléchargerons pas les mises à jour automatiquement."
+  },
+  "app.update-toast.changelog": {
+    "message": "Notes de changement"
+  },
+  "app.update-toast.download": {
+    "message": "Télécharger ({size})"
+  },
   "app.update-toast.downloading": {
     "message": "Téléchargement..."
   },
@@ -32,9 +50,84 @@
   "app.update-toast.title.download-complete": {
     "message": "Téléchargement terminé"
   },
+  "app.update.complete-toast.text": {
+    "message": "Cliquez ici pour voir les changements récents."
+  },
+  "app.update.complete-toast.title": {
+    "message": "La version {version} a été téléchargée avec succès !"
+  },
   "app.update.download-update": {
     "message": "Télécharger la mise à jour"
   },
+  "app.update.downloading-update": {
+    "message": "Téléchargement de la mise à jour ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "Relancez l'application pour installer la mise à jour"
+  },
+  "friends.action.add-friend": {
+    "message": "Ajouter un ami"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural,one {demande}other {demandes}} d'ami"
+  },
+  "friends.add-friend.submit": {
+    "message": "Envoyer une demande d'ami"
+  },
+  "friends.add-friend.title": {
+    "message": "Ajouter un ami"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Ça peut être différent de son pseudo Minecraft !"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Entrez un pseudo Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Quel est le pseudo Modrinth de votre ami ?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Ajouter des amis</link> pour voir à quoi ils jouent !"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Annuler la demande"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Supprimer l'ami"
+  },
+  "friends.friend.request-sent": {
+    "message": "La demande d'ami a été envoyé"
+  },
+  "friends.friend.view-profile": {
+    "message": "Voir le profile"
+  },
+  "friends.heading": {
+    "message": "Amis"
+  },
+  "friends.heading.active": {
+    "message": "Actif"
+  },
+  "friends.heading.offline": {
+    "message": "Hors ligne"
+  },
+  "friends.heading.online": {
+    "message": "En ligne"
+  },
+  "friends.heading.pending": {
+    "message": "En attente"
+  },
+  "friends.no-friends-match": {
+    "message": "Aucuns amis ne correspondent à \"{query}\""
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Chercher des amis..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Créer un compte Modrinth</link> pour ajouter des amis et voir à quoi ils jouent !"
+  },
   "instance.add-server.add-and-play": {
     "message": "Ajouter et jouer"
   },
diff --git a/apps/app-frontend/src/locales/he-IL/index.json b/apps/app-frontend/src/locales/he-IL/index.json
index e496d982..745b198c 100644
--- a/apps/app-frontend/src/locales/he-IL/index.json
+++ b/apps/app-frontend/src/locales/he-IL/index.json
@@ -2,6 +2,9 @@
   "app.settings.developer-mode-enabled": {
     "message": "מצב מפתח מופעל."
   },
+  "app.settings.downloading": {
+    "message": "מוריד גרסה {version}"
+  },
   "app.settings.tabs.appearance": {
     "message": "מראה"
   },
@@ -20,6 +23,57 @@
   "app.settings.tabs.resource-management": {
     "message": "ניהול משאבים"
   },
+  "app.update-toast.body": {
+    "message": "Modrinth App גרסה: {version} מוכנה להורדה!\nרענן כדי להוריד עכשיו, או באופן אוטומטי כאשר תסגור את האפליקציה."
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "Modrinth App גרסה {version} סיימה את תהליך ההורדה. רענן כדי לעדכן עכשיו, או באופן אוטומטי כאשר תסגור את האפליקציה."
+  },
+  "app.update-toast.body.metered": {
+    "message": "אפליקצית מודרינת' גרסה {version} זמינה עכשיו! מכיוון שאתה על נתונים, אנחנו לא הורדנו אותה אוטומטית."
+  },
+  "app.update-toast.changelog": {
+    "message": "יומן שינויים"
+  },
+  "app.update-toast.download": {
+    "message": "הורד ({size})"
+  },
+  "app.update-toast.downloading": {
+    "message": "מוריד..."
+  },
+  "app.update-toast.reload": {
+    "message": "רענן"
+  },
+  "app.update-toast.title": {
+    "message": "עדכונים זמינים"
+  },
+  "app.update-toast.title.download-complete": {
+    "message": "הורדה הושלמה"
+  },
+  "app.update.complete-toast.text": {
+    "message": "לחץ כאן כדי לראות את יומן השינויים."
+  },
+  "app.update.complete-toast.title": {
+    "message": "גרסה {version} הותקנה בהצלחה!"
+  },
+  "app.update.download-update": {
+    "message": "הורד עדכון"
+  },
+  "app.update.downloading-update": {
+    "message": "מוריד עדכון ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "רענן בכדי להתקין את העדכונים"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>הוסף חברים</link> כדי לראות במה הם משחקים!"
+  },
+  "friends.heading": {
+    "message": "חברים"
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
   "instance.add-server.add-and-play": {
     "message": "הוסף ושחק"
   },
@@ -51,7 +105,7 @@
     "message": "עולם מיינקראפט"
   },
   "instance.edit-world.reset-icon": {
-    "message": "איפוס אייקון"
+    "message": "אפס סמל"
   },
   "instance.edit-world.title": {
     "message": "ערוך עולם"
@@ -84,7 +138,7 @@
     "message": "מחק התקנה"
   },
   "instance.settings.tabs.general.delete.description": {
-    "message": "מוחק לצמיתות את התקנה זו מהמכשיר שלך, כולל העולמות שלך, הגדרות, וכל התוכן המותקן. תיזהר, מכיוון שלאחר מחיקת התקנה אין דרך להחזיר אותה."
+    "message": "מוחק לצמיתות את התקנה זו מהמכשיר שלך, כולל העולמות שלך, הגדרות, וכל התוכן המותקן. שים לב, לאחר מחיקת ההתקנה אין דרך להחזיר אותה."
   },
   "instance.settings.tabs.general.deleting.button": {
     "message": "מוחק..."
@@ -99,19 +153,19 @@
     "message": "שכפל התקנה"
   },
   "instance.settings.tabs.general.duplicate-instance.description": {
-    "message": "יוצר עותק של התקנה זו, כולל עולם, הגדרות, מודים, וכו."
+    "message": "יוצר עותק של התקנה זו, כולל עולמות, הגדרות, מודים, וכדומה."
   },
   "instance.settings.tabs.general.edit-icon": {
-    "message": "ערוך אייקון"
+    "message": "ערוך סמל"
   },
   "instance.settings.tabs.general.edit-icon.remove": {
-    "message": "הסר אייקון"
+    "message": "הסר סמל"
   },
   "instance.settings.tabs.general.edit-icon.replace": {
-    "message": "החלף אייקון"
+    "message": "החלף סמל"
   },
   "instance.settings.tabs.general.edit-icon.select": {
-    "message": "בחר אייקון"
+    "message": "בחר סמל"
   },
   "instance.settings.tabs.general.library-groups": {
     "message": "קבוצות ספרייה"
@@ -120,7 +174,7 @@
     "message": "צור קבוצה חדשה"
   },
   "instance.settings.tabs.general.library-groups.description": {
-    "message": "קבוצות ספרייה מאפשרות לך לארגן את ההתקנות שלך לפי חלקים שונים."
+    "message": "קבוצות ספרייה מאפשרות לך לארגן את ההתקנות שלך לחלקים שונים בספרייה שלך."
   },
   "instance.settings.tabs.general.library-groups.enter-name": {
     "message": "הכנס שם קבוצה"
@@ -132,7 +186,7 @@
     "message": "פעולות בעת הפעלה"
   },
   "instance.settings.tabs.hooks.custom-hooks": {
-    "message": "מותאם אישית"
+    "message": "פעולות בעת הפעלה מותאמות אישית"
   },
   "instance.settings.tabs.hooks.description": {
     "message": "פעולות בעת הפעלה מאפשרות למשתמשים מתקדמים להריץ פקודות מערכת מסוימות לפני ואחרי שהמשחק מופעל."
@@ -147,16 +201,16 @@
     "message": "הכנס פקודה לאחר יציאה..."
   },
   "instance.settings.tabs.hooks.pre-launch": {
-    "message": "טרום-השקה"
+    "message": "טרום-הפעלה"
   },
   "instance.settings.tabs.hooks.pre-launch.description": {
-    "message": "מופעל לפני שהאינסטנס מתחיל."
+    "message": "מופעל לפני שההתקנה מופעלת."
   },
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "הכנס פקודה לפני ההפעלה..."
   },
   "instance.settings.tabs.hooks.title": {
-    "message": "פקודות הפעלה מותאמות"
+    "message": "פעולות הפעלה"
   },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "מעטפת"
@@ -174,7 +228,7 @@
     "message": "{platform} {version} בשביל מיינקראפט {game_version} כבר מותקן"
   },
   "instance.settings.tabs.installation.change-version.already-installed.vanilla": {
-    "message": "ונילה {game_version} כבר מותקן"
+    "message": "וונילה {game_version} כבר מותקן"
   },
   "instance.settings.tabs.installation.change-version.button": {
     "message": "שנה גרסה"
@@ -186,7 +240,7 @@
     "message": "מתקין"
   },
   "instance.settings.tabs.installation.change-version.cannot-while-fetching": {
-    "message": "אחזור גרסאות מודפאקים"
+    "message": "מאחזר גרסאות חבילת מודים"
   },
   "instance.settings.tabs.installation.change-version.in-progress": {
     "message": "מתקין גרסה חדשה"
@@ -198,7 +252,7 @@
     "message": "מידע ניפוי שגיאות:"
   },
   "instance.settings.tabs.installation.fetching-modpack-details": {
-    "message": "אחזור פרטי מודפאקים"
+    "message": "מאחזר פרטי חבילת מודים"
   },
   "instance.settings.tabs.installation.game-version": {
     "message": "גרסת משחק"
@@ -216,13 +270,13 @@
     "message": "מיינקראפט {version}"
   },
   "instance.settings.tabs.installation.no-connection": {
-    "message": "לא ניתן לאחזר את פרטי המודפאק המקושר. אנא בדוק את חיבור האינטרנט שלך."
+    "message": "לא ניתן לאחזר את פרטי חבילת המודים המקושרת. אנא בדוק את חיבור האינטרנט שלך."
   },
   "instance.settings.tabs.installation.no-loader-versions": {
-    "message": "{loader}\" אינו זמין עבור מיינקראפט {version}. נסה מעלה מודים אחר."
+    "message": "{loader} אינו זמין עבור מיינקראפט {version}. אנא נסה טוען מודים אחר."
   },
   "instance.settings.tabs.installation.no-modpack-found": {
-    "message": "אינסטנס זה מקושר למודפק, אך המודפק לא נמצא ב-Modrinth."
+    "message": "התקנה זאת מקושרת לחבילת מודים, אך חבילת המודים לא נמצאה במודרינת'."
   },
   "instance.settings.tabs.installation.platform": {
     "message": "פלטפורמה"
@@ -234,13 +288,13 @@
     "message": "מתקין מחדש את חבילת המודים"
   },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
-    "message": "התקנה מחדש תאפס את כל התוכן המותקן או ששונה, ותחזיר אותו למצב שסופק על ידי חבילת המודים, תוך הסרת כל מוד או תוכן שהוספתם מעבר להתקנה המקורית. פעולה זו עשויה לתקן תקלות שנגרמו משינויים במופע, אך אם העולמות שלכם תלויים בתוכן נוסף שהותקן, היא עלולה לשבש אותם."
+    "message": "התקנה מחדש תאפס את כל התוכן המותקן או ששונה, ותחזיר אותו למצב שסופק על ידי חבילת המודים, תוך הסרת כל מוד או תוכן שהוספתם מעבר להתקנה המקורית. פעולה זו עשויה לתקן תקלות שנגרמו משינויים בהתקנה, אך אם העולמות שלכם תלויים בתוכן נוסף שהותקן, היא עלולה לשבש אותם."
   },
   "instance.settings.tabs.installation.reinstall.confirm.title": {
     "message": "האם אתה בטוח שברצונך להתקין מחדש instance זה?"
   },
   "instance.settings.tabs.installation.reinstall.description": {
-    "message": "מאפס את התוכן שנמצא ב-instance למצבו המקורי, תוך הסרת כל מוד או תוכן שהוספת מעבר למודפק המקורי."
+    "message": "מאפס את התוכן שנמצא בהתקנה למצבו המקורי, תוך הסרת כל מוד או תוכן ששונה מעבר לחבילת המודים המקורית."
   },
   "instance.settings.tabs.installation.reinstall.title": {
     "message": "התקן מחדש חבילת מודים"
@@ -294,16 +348,16 @@
     "message": "לבטל את הקישור של ההתקנה הזו"
   },
   "instance.settings.tabs.installation.unlink.confirm.description": {
-    "message": "אם תמשיך, לא תוכל לקשר אותו מחדש מבלי ליצור instance חדש לחלוטין. לא תקבל עוד עדכונים למודפקים, והוא יהפוך לרגיל."
+    "message": "אם תמשיך, לא תוכל לקשר אותה מחדש מבלי ליצור התקנה חדשה לחלוטין. לא תקבל עוד עדכונים לחבילת המודים, והיא תהפוך להתקנה רגילה."
   },
   "instance.settings.tabs.installation.unlink.confirm.title": {
     "message": "האם אתה בטוח שברצונך לנתק את הקישור ל-instance הזה?"
   },
   "instance.settings.tabs.installation.unlink.description": {
-    "message": "Instance זה מקושר ל-modpack, מה שאומר שלא ניתן לעדכן מודים ולא ניתן לשנות את ה-mod loader או את גרסת מיינקראפט. הניתוק יבטל לצמיתות את הקישור של instance זה מה-modpack."
+    "message": "התקנה זאת מקושרת לחבילת מודים, מה שאומר שלא ניתן לעדכן מודים ולא ניתן לשנות את טוען המודים או את גרסת המיינקראפט. הניתוק יבטל לצמיתות את הקישור של התקנה זאת לחבילת המודים."
   },
   "instance.settings.tabs.installation.unlink.title": {
-    "message": "נתק קישור מ-modpack"
+    "message": "נתק קישור מחבילת מודים"
   },
   "instance.settings.tabs.java": {
     "message": "ג'אווה וזיכרון"
@@ -383,6 +437,12 @@
   "instance.worlds.no_contact": {
     "message": "לא ניתן ליצור קשר עם השרת"
   },
+  "instance.worlds.no_server_quick_play": {
+    "message": "אתה יכול רק לקפוץ ישירות לשרתים מהגרסא אלפא 1.0.5 ואלך"
+  },
+  "instance.worlds.no_singleplayer_quick_play": {
+    "message": "אתה יכול לקפוץ ישירות לעולמות החל מהגרסא 1.20 ומעלה"
+  },
   "instance.worlds.play_instance": {
     "message": "שחק בהתקנה"
   },
@@ -404,6 +464,9 @@
   "search.filter.locked.instance-game-version.title": {
     "message": "גרסאת המשחק מסופקת על ידי ההתקנה"
   },
+  "search.filter.locked.instance-loader.title": {
+    "message": "מטען מודים מסופק ע\"י ההתקן"
+  },
   "search.filter.locked.instance.sync": {
     "message": "סנכרן עם התקנה"
   }
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index e9e8d2c6..49626479 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -3,7 +3,7 @@
     "message": "Fejlesztői mód bekapcsolva."
   },
   "app.settings.downloading": {
-    "message": "Letöltés v{version}"
+    "message": "v{version} letöltése"
   },
   "app.settings.tabs.appearance": {
     "message": "Megjelenés"
@@ -60,11 +60,74 @@
     "message": "Frissítés letöltése"
   },
   "app.update.downloading-update": {
-    "message": "Frissítés folyamatban ({percent}%)"
+    "message": "Frissítés letöltése ({percent}%)"
   },
   "app.update.reload-to-update": {
     "message": "A telepítéshez újraindítás szükséges"
   },
+  "friends.action.add-friend": {
+    "message": "Barát hozzáadása"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} barát {count, plural, other {kérelem}}"
+  },
+  "friends.add-friend.submit": {
+    "message": "Barátkérelem elküldése"
+  },
+  "friends.add-friend.title": {
+    "message": "Barát hozzáadása"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Más is lehet, mint a Minecraft felhasználóneve!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Barát Modrinth felhasználóneve..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Mi a barátod Modrinth felhasználóneve?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Vegyél fel barátokat</link>, hogy lásd mivel játszanak!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Barátkérelem visszavonása"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Barát eltávolítása"
+  },
+  "friends.friend.request-sent": {
+    "message": "Barátkérelem elküldve"
+  },
+  "friends.friend.view-profile": {
+    "message": "Profil megtekintése"
+  },
+  "friends.heading": {
+    "message": "Barátok"
+  },
+  "friends.heading.active": {
+    "message": "Aktív"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "Jóváhagyásra vár"
+  },
+  "friends.no-friends-match": {
+    "message": "Nincsen \"{query}\" nevű barátod"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Keresés a barátaid között..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Lépj be Modrinth fiókba</link>, hogy felvehess barátokat és lásd mivel játszanak!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Hozzáadás és játék"
   },
diff --git a/apps/app-frontend/src/locales/id-ID/index.json b/apps/app-frontend/src/locales/id-ID/index.json
index ef3dfba4..6a0672cd 100644
--- a/apps/app-frontend/src/locales/id-ID/index.json
+++ b/apps/app-frontend/src/locales/id-ID/index.json
@@ -2,6 +2,9 @@
   "app.settings.developer-mode-enabled": {
     "message": "Mode pengembang dihidupkan."
   },
+  "app.settings.downloading": {
+    "message": "Mengunduh v{version}"
+  },
   "app.settings.tabs.appearance": {
     "message": "Tampilan"
   },
@@ -20,6 +23,111 @@
   "app.settings.tabs.resource-management": {
     "message": "Manajemen sumber"
   },
+  "app.update-toast.body": {
+    "message": "Modrinth App v{version} siap dipasang! Muat ulang untuk memperbarui sekarang, atau secara otomatis saat Anda menutup Modrinth App."
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "Modrinth App v{version} telah selesai mengunduh. Muat ulang untuk memperbarui sekarang, atau secara otomatis saat Anda menutup Modrinth App."
+  },
+  "app.update-toast.body.metered": {
+    "message": "Modrinth App v{version} sudah tersedia! Karena Anda saat ini sedang berada dalam jaringan terukur, kami tidak mengunduhnya secara otomatis."
+  },
+  "app.update-toast.changelog": {
+    "message": "Log perubahan"
+  },
+  "app.update-toast.download": {
+    "message": "Unduh ({size})"
+  },
+  "app.update-toast.downloading": {
+    "message": "Mengunduh..."
+  },
+  "app.update-toast.reload": {
+    "message": "Muat ulang"
+  },
+  "app.update-toast.title": {
+    "message": "Pembaruan tersedia"
+  },
+  "app.update-toast.title.download-complete": {
+    "message": "Selesai mengunduh"
+  },
+  "app.update.complete-toast.text": {
+    "message": "Klik di sini untuk melihat log perubahan."
+  },
+  "app.update.complete-toast.title": {
+    "message": "Versi {version} berhasil dipasang!"
+  },
+  "app.update.download-update": {
+    "message": "Unduh pembaruan"
+  },
+  "app.update.downloading-update": {
+    "message": "Mengunduh pembaruan ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "Muat ulang untuk memasang pembaruan"
+  },
+  "friends.action.add-friend": {
+    "message": "Tambah teman"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural, other {permintaan}} teman"
+  },
+  "friends.add-friend.submit": {
+    "message": "Kirim permintaan teman"
+  },
+  "friends.add-friend.title": {
+    "message": "Menambah teman"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Ia mungkin memiliki nama yang berbeda dari nama pengguna Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Masukkan nama pengguna Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Apakah nama pengguna Modrinth teman Anda?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Tambah teman</link> untuk melihat apa yang mereka mainkan!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Batalkan permintaan"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Hapus teman"
+  },
+  "friends.friend.request-sent": {
+    "message": "Permintaan teman dikirim"
+  },
+  "friends.friend.view-profile": {
+    "message": "Lihat profil"
+  },
+  "friends.heading": {
+    "message": "Teman"
+  },
+  "friends.heading.active": {
+    "message": "Aktif"
+  },
+  "friends.heading.offline": {
+    "message": "Luring"
+  },
+  "friends.heading.online": {
+    "message": "Daring"
+  },
+  "friends.heading.pending": {
+    "message": "Menunggu"
+  },
+  "friends.no-friends-match": {
+    "message": "Tidak ada teman dengan nama \"{query}\""
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Cari teman..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Masuk ke akun Modrinth</link> untuk menambah teman dan melihat apa yang mereka mainkan!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Tambah dan mainkan"
   },
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index b426d12c..ab8c2b85 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -65,6 +65,69 @@
   "app.update.reload-to-update": {
     "message": "Ricarica per installare aggiornamento"
   },
+  "friends.action.add-friend": {
+    "message": "Stringi un'amicizia"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural, one {richiesta} other {richieste}} d'amicizia"
+  },
+  "friends.add-friend.submit": {
+    "message": "Invia richiesta d'amicizia"
+  },
+  "friends.add-friend.title": {
+    "message": "Stringendo l'amicizia"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Potrebbe essere diverso dal nome utente di Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Inserisci il nome utente Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Con quale utente Modrinth vuoi stringere l'amicizia?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Stringi un'amicizia</link> per sapere a cosa stanno giocando!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Annulla richiesta"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Annulla amicizia"
+  },
+  "friends.friend.request-sent": {
+    "message": "Richiesta d'amicizia inviata"
+  },
+  "friends.friend.view-profile": {
+    "message": "Visita profilo"
+  },
+  "friends.heading": {
+    "message": "Amicizie"
+  },
+  "friends.heading.active": {
+    "message": "Attivo"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "In sospeso"
+  },
+  "friends.no-friends-match": {
+    "message": "Nessuna amicizia pertinente a ''{query}''"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Cerca amicizie..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Accedi all'account Modrinth</link> per stringere amicizie e sapere a cosa stanno giocando!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Aggiungi e gioca"
   },
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index 8d51ce5e..dd1a1803 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -2,6 +2,9 @@
   "app.settings.developer-mode-enabled": {
     "message": "開発者モードがオンになっています。"
   },
+  "app.settings.downloading": {
+    "message": "v{version}をダウンロード中"
+  },
   "app.settings.tabs.appearance": {
     "message": "表示設定"
   },
@@ -20,6 +23,108 @@
   "app.settings.tabs.resource-management": {
     "message": "リソース管理"
   },
+  "app.update-toast.body": {
+    "message": "Modrinth App v{version}は今すぐインストールできます！再起動して今すぐ更新するか、アプリを閉じた際に自動で更新されます。"
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "Modrinth App v{version}のダウンロードが完了しました。再起動して今すぐ更新するか、アプリを閉じた際に自動で更新されます。"
+  },
+  "app.update-toast.body.metered": {
+    "message": "Modrinth App v{version}は今すぐダウンロードできます！従量課金制ネットワークを使用しているため自動でダウンロードはされていません。"
+  },
+  "app.update-toast.changelog": {
+    "message": "更新履歴"
+  },
+  "app.update-toast.download": {
+    "message": "ダウンロード ({size})"
+  },
+  "app.update-toast.downloading": {
+    "message": "ダウンロード中..."
+  },
+  "app.update-toast.reload": {
+    "message": "再起動"
+  },
+  "app.update-toast.title": {
+    "message": "アップデートが可能"
+  },
+  "app.update-toast.title.download-complete": {
+    "message": "ダウンロード完了"
+  },
+  "app.update.complete-toast.text": {
+    "message": "クリックすると更新履歴を表示できます。"
+  },
+  "app.update.complete-toast.title": {
+    "message": "バージョン {version} のインストールが正常に完了しました！"
+  },
+  "app.update.download-update": {
+    "message": "アップデートをダウンロード"
+  },
+  "app.update.downloading-update": {
+    "message": "アップデートをダウンロード中 ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "再起動して今すぐ更新"
+  },
+  "friends.action.add-friend": {
+    "message": "フレンドを追加"
+  },
+  "friends.add-friend.submit": {
+    "message": "フレンド申請を送信"
+  },
+  "friends.add-friend.title": {
+    "message": "フレンドを追加中"
+  },
+  "friends.add-friend.username.description": {
+    "message": "これはMinecraftユーザーネームと違う可能性があります！"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Modrinthユーザーネームを入力..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "あなたのフレンドのModrinthユーザーネームは何ですか？"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>友達を追加</link>して、彼らが何をしているか見てみよう！"
+  },
+  "friends.friend.cancel-request": {
+    "message": "申請をキャンセル"
+  },
+  "friends.friend.remove-friend": {
+    "message": "フレンドを削除"
+  },
+  "friends.friend.request-sent": {
+    "message": "フレンド申請が送信されました"
+  },
+  "friends.friend.view-profile": {
+    "message": "プロフィールを表示"
+  },
+  "friends.heading": {
+    "message": "フレンド"
+  },
+  "friends.heading.active": {
+    "message": "活動中"
+  },
+  "friends.heading.offline": {
+    "message": "オフライン"
+  },
+  "friends.heading.online": {
+    "message": "オンライン"
+  },
+  "friends.heading.pending": {
+    "message": "保留中"
+  },
+  "friends.no-friends-match": {
+    "message": "フレンド\"{query}\"は見つかりませんでした"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "フレンドを検索…"
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Modrinthアカウントにサインイン</link>して友達を追加し、彼らがプレイしているゲームをチェックしよう！"
+  },
   "instance.add-server.add-and-play": {
     "message": "追加してプレイ"
   },
diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json
index 218ac1a2..4e370a4d 100644
--- a/apps/app-frontend/src/locales/ko-KR/index.json
+++ b/apps/app-frontend/src/locales/ko-KR/index.json
@@ -23,6 +23,18 @@
   "app.settings.tabs.resource-management": {
     "message": "리소스 관리"
   },
+  "app.update-toast.changelog": {
+    "message": "변경사항"
+  },
+  "app.update-toast.download": {
+    "message": "다운로드 ({size})"
+  },
+  "app.update-toast.downloading": {
+    "message": "다운로드 중..."
+  },
+  "app.update-toast.reload": {
+    "message": "리로드"
+  },
   "instance.add-server.add-and-play": {
     "message": "추가하고 플레이"
   },
diff --git a/apps/app-frontend/src/locales/ms-Arab/index.json b/apps/app-frontend/src/locales/ms-Arab/index.json
index 5bc07033..135298c0 100644
--- a/apps/app-frontend/src/locales/ms-Arab/index.json
+++ b/apps/app-frontend/src/locales/ms-Arab/index.json
@@ -65,6 +65,69 @@
   "app.update.reload-to-update": {
     "message": "موات سمولا اونتوق مماسڠ کمس کيني"
   },
+  "friends.action.add-friend": {
+    "message": "تمبه راکن"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural, other {ڤرمينتاٴن}} راکن"
+  },
+  "friends.add-friend.submit": {
+    "message": "هانتر ڤرمينتاٴن راکن"
+  },
+  "friends.add-friend.title": {
+    "message": "منمبه راکن"
+  },
+  "friends.add-friend.username.description": {
+    "message": "اي موڠکين بربيذا درڤد نام ڤڠݢونا ماٴينکرف‌ت مريک!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "ماسوقکن نام ڤڠݢونا Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "اڤاکه نام ڤڠݢونا Modrinth راکن اندا؟"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>تمبه راکن</link> اونتوق مليهت اڤ يڠ مريک ماءينکن!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "بطلکن ڤرمينتاٴن"
+  },
+  "friends.friend.remove-friend": {
+    "message": "اليه کلوار راکن"
+  },
+  "friends.friend.request-sent": {
+    "message": "ڤرمينتاٴن راکن تله دهانتر"
+  },
+  "friends.friend.view-profile": {
+    "message": "ليهت ڤروفيل"
+  },
+  "friends.heading": {
+    "message": "راکن"
+  },
+  "friends.heading.active": {
+    "message": "اکتيف"
+  },
+  "friends.heading.offline": {
+    "message": "لوار تالين"
+  },
+  "friends.heading.online": {
+    "message": "دالم تالين"
+  },
+  "friends.heading.pending": {
+    "message": "منوڠݢو"
+  },
+  "friends.no-friends-match": {
+    "message": "تياد راکن يڠ سڤادن دڠن ''{query}''"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "چاري راکن..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>لوݢ ماسوق کأکاٴون Modrinth</link> اونتوق منمبه راکن دان مليهت اڤ يڠ مريک ماءينکن!"
+  },
   "instance.add-server.add-and-play": {
     "message": "تمبه دان ماءين"
   },
diff --git a/apps/app-frontend/src/locales/ms-MY/index.json b/apps/app-frontend/src/locales/ms-MY/index.json
index beee8054..0fd462a1 100644
--- a/apps/app-frontend/src/locales/ms-MY/index.json
+++ b/apps/app-frontend/src/locales/ms-MY/index.json
@@ -65,6 +65,69 @@
   "app.update.reload-to-update": {
     "message": "Muat semula untuk memasang kemas kini"
   },
+  "friends.action.add-friend": {
+    "message": "Tambah rakan"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural, other {permintaan}} rakan"
+  },
+  "friends.add-friend.submit": {
+    "message": "Hantar permintaan rakan"
+  },
+  "friends.add-friend.title": {
+    "message": "Menambah rakan"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Ia mungkin berbeza daripada nama pengguna Minecraft mereka!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Masukkan nama pengguna Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Apakah nama pengguna Modrinth rakan anda?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Tambah rakan</link> untuk melihat apa yang mereka mainkan!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Batalkan permintaan"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Alih keluar rakan"
+  },
+  "friends.friend.request-sent": {
+    "message": "Permintaan rakan telah dihantar"
+  },
+  "friends.friend.view-profile": {
+    "message": "Lihat profil"
+  },
+  "friends.heading": {
+    "message": "Rakan"
+  },
+  "friends.heading.active": {
+    "message": "Aktif"
+  },
+  "friends.heading.offline": {
+    "message": "Luar Talian"
+  },
+  "friends.heading.online": {
+    "message": "Dalam Talian"
+  },
+  "friends.heading.pending": {
+    "message": "Menunggu"
+  },
+  "friends.no-friends-match": {
+    "message": "Tiada rakan yang sepadan dengan ''{query}''"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Cari rakan..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Log masuk ke akaun Modrinth</link> untuk menambah rakan dan melihat apa yang mereka mainkan!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Tambah dan main"
   },
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
index 46d1ea03..ab5a93c4 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -2,6 +2,9 @@
   "app.settings.developer-mode-enabled": {
     "message": "Ontwikkelaarsmodus ingeschakeld."
   },
+  "app.settings.downloading": {
+    "message": "v{version} wordt gedownload"
+  },
   "app.settings.tabs.appearance": {
     "message": "Uiterlijk"
   },
@@ -20,6 +23,48 @@
   "app.settings.tabs.resource-management": {
     "message": "Bronnenbeheer"
   },
+  "app.update-toast.body": {
+    "message": "Modrinth App v{version} is klaar om geïnstalleerd te worden! Herlaad om nu te updaten, of automatisch wanneer je de Modrinth App afsluit."
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "Modrinth App v{version} is klaar met downloaden. Herlaad om nu te updaten, of automatisch wanneer je de Modrinth App afsluit."
+  },
+  "app.update-toast.body.metered": {
+    "message": "Modrinth App v{version} is nu beschikbaar! Omdat je nu op een netwerk met datalimiet zit, is de download niet automatisch gestart."
+  },
+  "app.update-toast.changelog": {
+    "message": "Changelog"
+  },
+  "app.update-toast.download": {
+    "message": "Download ({size})"
+  },
+  "app.update-toast.downloading": {
+    "message": "Aan het downloaden..."
+  },
+  "app.update-toast.reload": {
+    "message": "Herlaad"
+  },
+  "app.update-toast.title": {
+    "message": "Update beschikbaar"
+  },
+  "app.update-toast.title.download-complete": {
+    "message": "Downloaden voltooid"
+  },
+  "app.update.complete-toast.text": {
+    "message": "Klik hier om de changelog te bekijken."
+  },
+  "app.update.complete-toast.title": {
+    "message": "Versie {version} is succesvol geïnstalleerd!"
+  },
+  "app.update.download-update": {
+    "message": "Download update"
+  },
+  "app.update.downloading-update": {
+    "message": "Update downloaden ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "Herlaad om de update te installeren"
+  },
   "instance.add-server.add-and-play": {
     "message": "Toevoegen en spelen"
   },
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
index 17ec128d..a44592f2 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -24,7 +24,10 @@
     "message": "Zarządzanie zasobami"
   },
   "app.update-toast.body": {
-    "message": "Nowa wersja Modrinth v{version} jest gotowa do pobrania! Odśwież, żeby zaktualizować teraz, albo automatycznie, gdy zamkniesz aplikację Modrinth."
+    "message": "Wersja Modrinth App v{version} jest gotowa do pobrania! Odśwież, żeby zaktualizować teraz, albo automatycznie, gdy zamkniesz Modrinth App."
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "Wersja Modrinth App v{version} została pobrana. Odśwież, żeby zaktualizować teraz, albo automatycznie, gdy zamkniesz Modrinth App."
   },
   "app.update-toast.body.metered": {
     "message": "Wersja v{version} Modrinth App jest dostępna! Skoro korzystasz z sieci taryfowej, nie pobraliśmy jej automatycznie."
@@ -62,6 +65,69 @@
   "app.update.reload-to-update": {
     "message": "Załaduj ponownie, aby zainstalować aktualizację"
   },
+  "friends.action.add-friend": {
+    "message": "Dodaj znajomego"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural, one {zaproszenie} few {zaproszenia} other {zaproszeń}} do znajomych"
+  },
+  "friends.add-friend.submit": {
+    "message": "Wyślij zaproszenie"
+  },
+  "friends.add-friend.title": {
+    "message": "Dodawanie znajomego"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Może różnić się od nazwy użytkownika Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Wpisz nazwę użytkownika Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Jaka jest nazwa użytkownika Twojego znajomego?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Dodaj znajomych</link> by widzieć, w co grają!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Anuluj zaproszenie"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Usuń z znajomych"
+  },
+  "friends.friend.request-sent": {
+    "message": "Wysłano zaproszenie"
+  },
+  "friends.friend.view-profile": {
+    "message": "Pokaż profil"
+  },
+  "friends.heading": {
+    "message": "Znajomi"
+  },
+  "friends.heading.active": {
+    "message": "Aktywny"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "Oczekujące"
+  },
+  "friends.no-friends-match": {
+    "message": "Nie znaleziono znajomych pasujących do zapytania \"{query}\""
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Szukaj znajomych..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Zaloguj się na konto Modrinth</link> by dodać znajomych i widzieć, w co grają!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Dodaj i graj"
   },
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index 50ad1437..71d3491d 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -1,6 +1,6 @@
 {
   "app.settings.developer-mode-enabled": {
-    "message": "Modo desenvolvedor ativado."
+    "message": "Modo desenvolvedor."
   },
   "app.settings.downloading": {
     "message": "Baixando v{version}"
@@ -54,7 +54,7 @@
     "message": "Clique aqui para ver as mudanças."
   },
   "app.update.complete-toast.title": {
-    "message": "Versão {version} instalada com sucesso!"
+    "message": "Versão {version} instalada!"
   },
   "app.update.download-update": {
     "message": "Baixar atualização"
@@ -63,7 +63,70 @@
     "message": "Baixando atualização ({percent}%)"
   },
   "app.update.reload-to-update": {
-    "message": "Recarregar para instalar a atualização"
+    "message": "Recarregue para instalar a atualização"
+  },
+  "friends.action.add-friend": {
+    "message": "Adicionar um amigo"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count, plural, =0 {Nenhuma solicitação de amizade} one {{count} solicitação de amizade} other {{count} solicitações de amizade}}"
+  },
+  "friends.add-friend.submit": {
+    "message": "Enviar amizade"
+  },
+  "friends.add-friend.title": {
+    "message": "Adicionando amigo"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Pode ser diferente do nome que ele usa no Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Insira o nome de usuário..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Qual o nome de usuário do seu amigo no Modrinth?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Adicione amigos</link> para ver o que eles estão jogando!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Cancelar solicitação"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Remover amigo"
+  },
+  "friends.friend.request-sent": {
+    "message": "Solicitação de amizade enviada"
+  },
+  "friends.friend.view-profile": {
+    "message": "Ver perfil"
+  },
+  "friends.heading": {
+    "message": "Amigos"
+  },
+  "friends.heading.active": {
+    "message": "Ativo"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "Pendente"
+  },
+  "friends.no-friends-match": {
+    "message": "Nenhum amigo corresponde a \"{query}\""
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Buscar amigos..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Inicie uma sessão com o Modrinth</link> para adicionar amigos e ver o que eles estão jogando!"
   },
   "instance.add-server.add-and-play": {
     "message": "Adicionar e jogar"
@@ -129,7 +192,7 @@
     "message": "Excluir instância"
   },
   "instance.settings.tabs.general.delete.description": {
-    "message": "Apaga permanente a instância do seu dispositivo, incluindo seus mundos, configurações e todo o conteúdo instalado. Tenha cuidado, porque não será possível recuperá-la após apaga-la."
+    "message": "Exclui permanentemente uma instância do seu dispositivo, incluindo seus mundos, configurações e todo o conteúdo instalado. Tome cuidado, pois, uma vez excluída, a instância não poderá ser recuperada."
   },
   "instance.settings.tabs.general.deleting.button": {
     "message": "Excluindo..."
@@ -174,13 +237,13 @@
     "message": "Nome"
   },
   "instance.settings.tabs.hooks": {
-    "message": "Gatilhos de inicialização"
+    "message": "Ações de inicialização"
   },
   "instance.settings.tabs.hooks.custom-hooks": {
-    "message": "Gatilho de inicialização personalizado"
+    "message": "Ações de inicialização personalizadas"
   },
   "instance.settings.tabs.hooks.description": {
-    "message": "Os Gatilhos permitem que usuários mais experientes executem comandos do sistema antes e depois de inicializar o jogo."
+    "message": "Essas ações permitem que usuários mais experientes executem comandos do sistema antes e depois de inicializar o jogo."
   },
   "instance.settings.tabs.hooks.post-exit": {
     "message": "Ao sair"
@@ -189,10 +252,10 @@
     "message": "Executado após o jogo fechar."
   },
   "instance.settings.tabs.hooks.post-exit.enter": {
-    "message": "Insira o comando de pós-saída..."
+    "message": "Insira o comando a ser executado após o jogo fechar..."
   },
   "instance.settings.tabs.hooks.pre-launch": {
-    "message": "Antes de inicializar"
+    "message": "Pré-inicialização"
   },
   "instance.settings.tabs.hooks.pre-launch.description": {
     "message": "Executado antes que a instância seja inicializada."
@@ -201,7 +264,7 @@
     "message": "Insira o comando a ser executado antes da inicialização..."
   },
   "instance.settings.tabs.hooks.title": {
-    "message": "Gatilhos de inicialização do jogo"
+    "message": "Ações de inicialização do jogo"
   },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Comando auxiliar"
@@ -210,7 +273,7 @@
     "message": "Comando auxiliar para iniciar o Minecraft."
   },
   "instance.settings.tabs.hooks.wrapper.enter": {
-    "message": "Insira um comando auxiliar..."
+    "message": "Insira um comando..."
   },
   "instance.settings.tabs.installation": {
     "message": "Instalação"
@@ -237,7 +300,7 @@
     "message": "Instalando nova versão"
   },
   "instance.settings.tabs.installation.currently-installed": {
-    "message": "Instalado atualmente"
+    "message": "Versão instalada"
   },
   "instance.settings.tabs.installation.debug-information": {
     "message": "Informação de depuração:"
@@ -357,7 +420,7 @@
     "message": "Variáveis de ambiente"
   },
   "instance.settings.tabs.java.hooks": {
-    "message": "Gatilhos"
+    "message": "Ações"
   },
   "instance.settings.tabs.java.java-arguments": {
     "message": "Argumentos do Java"
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 12f50a00..136a29eb 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -12,7 +12,7 @@
     "message": "Предустановки"
   },
   "app.settings.tabs.feature-flags": {
-    "message": "Экспериментальные функции"
+    "message": "Флаги функций"
   },
   "app.settings.tabs.java-installations": {
     "message": "Установки Java"
@@ -30,7 +30,7 @@
     "message": "Скачивание Modrinth App v{version} завершено. Перезапустите приложение, чтобы обновить его, или оно обновится автоматически при закрытии."
   },
   "app.update-toast.body.metered": {
-    "message": "Modrinth App v{version} доступно к скачиванию! Используется лимитное подключение, поэтому скачивание не началось автоматически."
+    "message": "Modrinth App v{version} доступно для скачивания! Используется лимитное подключение, поэтому скачивание не началось автоматически."
   },
   "app.update-toast.changelog": {
     "message": "Список изменений"
@@ -63,7 +63,70 @@
     "message": "Скачивание обновления ({percent}%)"
   },
   "app.update.reload-to-update": {
-    "message": "Перезапустить для обновления"
+    "message": "Перезапустить и обновить"
+  },
+  "friends.action.add-friend": {
+    "message": "Добавить в друзья"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural, one {запрос} few {запроса} many {запросов} other {запроса}} дружбы"
+  },
+  "friends.add-friend.submit": {
+    "message": "Отправить запрос дружбы"
+  },
+  "friends.add-friend.title": {
+    "message": "Добавление в друзья"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Оно может быть не таким, как в Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Введите имя на Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Какое имя у друга на Modrinth?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Добавьте друзей</link>, чтобы знать, во что они играют!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Отменить запрос"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Удалить из друзей"
+  },
+  "friends.friend.request-sent": {
+    "message": "Отправлен запрос дружбы"
+  },
+  "friends.friend.view-profile": {
+    "message": "Открыть профиль"
+  },
+  "friends.heading": {
+    "message": "Друзья"
+  },
+  "friends.heading.active": {
+    "message": "В игре"
+  },
+  "friends.heading.offline": {
+    "message": "Не в сети"
+  },
+  "friends.heading.online": {
+    "message": "В сети"
+  },
+  "friends.heading.pending": {
+    "message": "В ожидании"
+  },
+  "friends.no-friends-match": {
+    "message": "Нет друзей по запросу «{query}»"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Поиск по друзьям..."
+  },
+  "friends.section.heading": {
+    "message": "{title} — {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Войдите в Modrinth</link>, чтобы добавлять друзей и знать, во что они играют!"
   },
   "instance.add-server.add-and-play": {
     "message": "Добавить и играть"
@@ -84,7 +147,7 @@
     "message": "Добавление сервера"
   },
   "instance.edit-server.title": {
-    "message": "Изменение сервера"
+    "message": "Настройка сервера"
   },
   "instance.edit-world.hide-from-home": {
     "message": "Не показывать на главной"
@@ -99,7 +162,7 @@
     "message": "Сбросить иконку"
   },
   "instance.edit-world.title": {
-    "message": "Изменение информации о мире"
+    "message": "Изменение мира"
   },
   "instance.filter.disabled": {
     "message": "Отключённые"
@@ -174,13 +237,13 @@
     "message": "Название"
   },
   "instance.settings.tabs.hooks": {
-    "message": "Настройки запуска"
+    "message": "Команды запуска"
   },
   "instance.settings.tabs.hooks.custom-hooks": {
     "message": "Изменение команд запуска"
   },
   "instance.settings.tabs.hooks.description": {
-    "message": "Позволяют опытным пользователям задать системные команды, выполняемые перед запуском и после закрытия игры."
+    "message": "Позволяет опытным пользователям задать системные команды, выполняемые до и после запуска игры."
   },
   "instance.settings.tabs.hooks.post-exit": {
     "message": "После выхода"
@@ -201,13 +264,13 @@
     "message": "Введите команду перед запуском..."
   },
   "instance.settings.tabs.hooks.title": {
-    "message": "Настройки запуска игры"
+    "message": "Команды запуска игры"
   },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Обёртка"
   },
   "instance.settings.tabs.hooks.wrapper.description": {
-    "message": "Команда обёртки для запуска Minecraft."
+    "message": "Команда-обёртка для запуска Minecraft."
   },
   "instance.settings.tabs.hooks.wrapper.enter": {
     "message": "Команда обёртки..."
@@ -252,7 +315,7 @@
     "message": "Установить"
   },
   "instance.settings.tabs.installation.install.in-progress": {
-    "message": "Выполняется установка..."
+    "message": "Выполняется установка"
   },
   "instance.settings.tabs.installation.loader-version": {
     "message": "Версия {loader}"
@@ -303,7 +366,7 @@
     "message": "Восстановить сборку?"
   },
   "instance.settings.tabs.installation.repair.in-progress": {
-    "message": "Выполняется исправление..."
+    "message": "Выполняется исправление"
   },
   "instance.settings.tabs.installation.reset-selections": {
     "message": "Сбросить выбор"
@@ -357,7 +420,7 @@
     "message": "Переменные среды"
   },
   "instance.settings.tabs.java.hooks": {
-    "message": "Настройки запуска"
+    "message": "Команды запуска"
   },
   "instance.settings.tabs.java.java-arguments": {
     "message": "Аргументы Java"
diff --git a/apps/app-frontend/src/locales/th-TH/index.json b/apps/app-frontend/src/locales/th-TH/index.json
index 74bf663c..45316ede 100644
--- a/apps/app-frontend/src/locales/th-TH/index.json
+++ b/apps/app-frontend/src/locales/th-TH/index.json
@@ -2,9 +2,18 @@
   "app.settings.developer-mode-enabled": {
     "message": "กำลังอยู่ในโหมดผู้พัฒนา"
   },
+  "app.settings.downloading": {
+    "message": "ดาวน์โหลด เวอร์ชั่น{version}"
+  },
   "app.settings.tabs.appearance": {
     "message": "รูปลักษณ์"
   },
+  "app.settings.tabs.default-instance-options": {
+    "message": "ตัวเลือกอินสแตนซ์เริ่มต้น"
+  },
+  "app.settings.tabs.feature-flags": {
+    "message": "ระบบควบคุมการเปิดใช้งานฟีเจอร์"
+  },
   "app.settings.tabs.java-installations": {
     "message": "การจัดการ Java ที่ติดตั้ง"
   },
@@ -14,6 +23,48 @@
   "app.settings.tabs.resource-management": {
     "message": "การจัดการทรัพยากร"
   },
+  "app.update-toast.body": {
+    "message": "Modrinth App v{version} พร้อมติดตั้งแล้ว! รีโหลดเพื่ออัปเดตทันที หรือจะอัปเดตอัตโนมัติเมื่อคุณปิดแอป"
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "Modrinth App v{version} ดาวน์โหลดเสร็จแล้ว! รีโหลดเพื่ออัปเดตทันที หรือจะอัปเดตอัตโนมัติเมื่อคุณปิดแอป"
+  },
+  "app.update-toast.body.metered": {
+    "message": "Modrinth App v{version} พร้อมให้ดาวน์โหลดแล้ว! เนื่องจากคุณกำลังใช้งานเครือข่ายที่มีการคิดค่าใช้จ่ายตามปริมาณข้อมูล ระบบจึงไม่ได้ดาวน์โหลดอัตโนมัติ"
+  },
+  "app.update-toast.changelog": {
+    "message": "บันทึกการเปลี่ยนแปลง"
+  },
+  "app.update-toast.download": {
+    "message": "ดาวน์โหลด ({size})"
+  },
+  "app.update-toast.downloading": {
+    "message": "กำลังดาวน์โหลด...."
+  },
+  "app.update-toast.reload": {
+    "message": "รีโหลด"
+  },
+  "app.update-toast.title": {
+    "message": "อัพเดตพร้อมแล้ว"
+  },
+  "app.update-toast.title.download-complete": {
+    "message": "ดาวน์โหลดเรียบร้อยแล้ว"
+  },
+  "app.update.complete-toast.text": {
+    "message": "คลิกที่นี่เพื่อดูบันทึกการเปลี่ยนแปลง"
+  },
+  "app.update.complete-toast.title": {
+    "message": "เวอร์ชั่น {version} ถูกติดตั้งแล้ว"
+  },
+  "app.update.download-update": {
+    "message": "ดาวน์โหลดอัพเดต"
+  },
+  "app.update.downloading-update": {
+    "message": "ดาวน์โหลดอัพเดตไปแล้ว ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "รีโหลดเพื่อติดตั้งอัพเดต"
+  },
   "instance.add-server.add-and-play": {
     "message": "เพิ่มและเล่นทันที"
   },
@@ -50,6 +101,9 @@
   "instance.edit-world.title": {
     "message": "แก้ไขโลก"
   },
+  "instance.filter.disabled": {
+    "message": "ปิดโปรเจ็ค"
+  },
   "instance.filter.updates-available": {
     "message": "พบอัพเดท"
   },
@@ -68,6 +122,15 @@
   "instance.settings.tabs.general": {
     "message": "ทั่วไป"
   },
+  "instance.settings.tabs.general.delete": {
+    "message": "ลบอินสแตนซ์"
+  },
+  "instance.settings.tabs.general.delete.button": {
+    "message": "ลบอินสแตนซ์"
+  },
+  "instance.settings.tabs.general.delete.description": {
+    "message": "ลบอินสแตนซ์ออกจากอุปกรณ์ของคุณอย่างถาวร รวมถึงโลก การตั้งค่า และเนื้อหาทั้งหมดที่ติดตั้งไว้ โปรดระมัดระวัง เนื่องจากเมื่อถูกลบแล้วจะไม่สามารถกู้คืนได้อีก"
+  },
   "instance.settings.tabs.general.deleting.button": {
     "message": "กำลังลบ..."
   },
@@ -77,6 +140,12 @@
   "instance.settings.tabs.general.duplicate-button.tooltip.installing": {
     "message": "ไม่สามารถทำซ้ำได้ขณะติดตั้ง"
   },
+  "instance.settings.tabs.general.duplicate-instance": {
+    "message": "สร้างสำเนาอินสแตนซ์"
+  },
+  "instance.settings.tabs.general.duplicate-instance.description": {
+    "message": "สร้างสำเนาของอินสแตนซ์นี้ รวมถึงโลก การตั้งค่า ม็อด และอื่นๆ"
+  },
   "instance.settings.tabs.general.edit-icon": {
     "message": "แก้ไขไอคอน"
   },
@@ -95,6 +164,9 @@
   "instance.settings.tabs.general.library-groups.create": {
     "message": "สร้างกลุ่มใหม่"
   },
+  "instance.settings.tabs.general.library-groups.description": {
+    "message": "กลุ่มไลบรารีช่วยให้คุณจัดระเบียบอินสแตนซ์ของคุณเป็นหมวดหมู่ต่างๆ ภายในไลบรารี"
+  },
   "instance.settings.tabs.general.library-groups.enter-name": {
     "message": "ใส่ชื่อกลุ่ม"
   },
diff --git a/apps/app-frontend/src/locales/tl-PH/index.json b/apps/app-frontend/src/locales/tl-PH/index.json
index e6a9e904..0ec27d8a 100644
--- a/apps/app-frontend/src/locales/tl-PH/index.json
+++ b/apps/app-frontend/src/locales/tl-PH/index.json
@@ -9,7 +9,7 @@
     "message": "Kiyas"
   },
   "app.settings.tabs.default-instance-options": {
-    "message": "Mga pagpipilian sa batayang pangyayari"
+    "message": "Mga pagpipilian sa batayang tularan"
   },
   "app.settings.tabs.feature-flags": {
     "message": "Watawat ng mga tampok"
@@ -23,26 +23,107 @@
   "app.settings.tabs.resource-management": {
     "message": "Pamamahala ng mapagkukunan"
   },
+  "app.update-toast.body": {
+    "message": "Handa nang maikabit ang Modrinth App v{version}. Muling dalhin upang maisapanahon, o pagkusaan pagpinid ng Modrinth App."
+  },
   "app.update-toast.body.download-complete": {
-    "message": "Tapos nang maidalamba ang Modrinth App v{version}. Muling dalhin upang matakda ang pagbabago ngayon, o mamaya nalang sa pagpinid ng Modrinth App."
+    "message": "Tapos nang maidalamba ang Modrinth App v{version}. Muling dalhin upang maisapanahon, o pagkusaan pagpinid ng Modrinth App."
   },
   "app.update-toast.body.metered": {
     "message": "Magagamit na ngayon ang Modrinth App v{version}! Hindi namin dinalamba kaagad dahil bilang ang inyong kabalagan."
   },
+  "app.update-toast.changelog": {
+    "message": "Tala ng Pagbabago"
+  },
   "app.update-toast.download": {
     "message": "Idalamba ({size})"
   },
   "app.update-toast.downloading": {
     "message": "Nagdadalamba..."
   },
+  "app.update-toast.reload": {
+    "message": "Magmulindala"
+  },
+  "app.update-toast.title": {
+    "message": "May kamakailang pagsasapanahon"
+  },
   "app.update-toast.title.download-complete": {
     "message": "Natapos ang pagdalamba"
   },
+  "app.update.complete-toast.text": {
+    "message": "Magpindot rito upang matingnan ang talaan ng pagbabago."
+  },
+  "app.update.complete-toast.title": {
+    "message": "Tagumpay na nakabit ang bersiyong {version}!"
+  },
   "app.update.download-update": {
     "message": "Idalamba ang pagbabago"
   },
   "app.update.downloading-update": {
-    "message": "Nagdadalamba ng pagbabago ({percent}%)"
+    "message": "Nagdadalamba ng pagsasapanahon ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "Handang makabit ang pagsasapanahon"
+  },
+  "friends.action.add-friend": {
+    "message": "Magdagdag ng kaibigan"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count, plural, one {{count}} other {{count} na}} hiling na makipagkaibigan"
+  },
+  "friends.add-friend.submit": {
+    "message": "Magpadala ng hiling na makipagkaibigan"
+  },
+  "friends.add-friend.title": {
+    "message": "Pagdaragdag ng kaibigan"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Maaaraing hindi katulad sa kanilang pangalan sa Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Ilagay ang pangalan ng gagamit sa Modrinth... "
+  },
+  "friends.add-friend.username.title": {
+    "message": "Ano ang pangalan ng iyong kaibigan sa Modrinth?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Magdagdag ng mga kaibigan</link> upang makita ang kanilang nilalaro!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Bawiin ang hiling"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Tanggalin ang kaibing"
+  },
+  "friends.friend.request-sent": {
+    "message": "Ipinadala na ang hiling na makipagkaibigan"
+  },
+  "friends.friend.view-profile": {
+    "message": "Tingnan ang propayl"
+  },
+  "friends.heading": {
+    "message": "Mga kaibigan"
+  },
+  "friends.heading.active": {
+    "message": "Masigla"
+  },
+  "friends.heading.offline": {
+    "message": "Pinid"
+  },
+  "friends.heading.online": {
+    "message": "Bukas"
+  },
+  "friends.heading.pending": {
+    "message": "Nakabinbin"
+  },
+  "friends.no-friends-match": {
+    "message": "Walang kaibigang tumugma sa \"{query}\""
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Hanapin ang mga kaibigan..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
   },
   "instance.add-server.add-and-play": {
     "message": "Idagdag at laruin"
@@ -86,6 +167,9 @@
   "instance.filter.updates-available": {
     "message": "May mga bagong pagbabago"
   },
+  "instance.server-modal.address": {
+    "message": "Tinitirhan"
+  },
   "instance.server-modal.name": {
     "message": "Pangalan"
   },
@@ -95,14 +179,29 @@
   "instance.server-modal.resource-pack": {
     "message": "Balot ng mapagkukunan"
   },
+  "instance.settings.tabs.general": {
+    "message": "Pangkalahatan"
+  },
   "instance.settings.tabs.general.delete": {
-    "message": "Tanggalin ang pangyayari"
+    "message": "Tanggalin ang tularan"
   },
   "instance.settings.tabs.general.delete.button": {
-    "message": "Tanggalin ang pangyayari"
+    "message": "Tanggalin ang tularan"
   },
   "instance.settings.tabs.general.delete.description": {
-    "message": "Lagiang matatanggal ang pangyayari sa iyong pakasam, kasali na ang iyong mga daigdig, pagsasaayos, at lahat ng kinabitang nilalaman. Mag-ingat, hindi na mababawi kapag magtanggal ka ng pangyayari."
+    "message": "Habam buhay na matatanggal ang tularan sa iyong pakasam, kasali na ang iyong mga daigdig, pagsasaayos, at lahat ng kinabitang nilalaman. Mag-ingat, hindi na mababawi kapag nagtanggal ka na ng tularan."
+  },
+  "instance.settings.tabs.general.deleting.button": {
+    "message": "Binubura..."
+  },
+  "instance.settings.tabs.general.duplicate-button": {
+    "message": "Isaduhasipi"
+  },
+  "instance.settings.tabs.general.duplicate-button.tooltip.installing": {
+    "message": "Hindi makakasaduhasipi habang nagkakabit."
+  },
+  "instance.settings.tabs.general.duplicate-instance": {
+    "message": "Isaduhasipi ang tularan"
   },
   "instance.settings.tabs.general.duplicate-instance.description": {
     "message": "Gagawan ng sipi ang pangyayaring ito, kasali na ang mga daigdig, pagsasaaayos, pagbabago, at iba pa."
@@ -113,19 +212,199 @@
   "instance.settings.tabs.general.edit-icon.remove": {
     "message": "Tanggalin ang lambana"
   },
+  "instance.settings.tabs.general.edit-icon.replace": {
+    "message": "Palitan ang lambana"
+  },
+  "instance.settings.tabs.general.edit-icon.select": {
+    "message": "Pumili ng lambana"
+  },
+  "instance.settings.tabs.general.library-groups": {
+    "message": "Mga pangkat ng aklatan"
+  },
+  "instance.settings.tabs.general.library-groups.create": {
+    "message": "Gumawa ng bagong pangkat"
+  },
+  "instance.settings.tabs.general.library-groups.description": {
+    "message": "Binibigyang-daan ng mga pangkat ng aklatan na iyong maayos ang iyong mga tularan sa iba't-ibang tapyas ng iyong aklatan."
+  },
+  "instance.settings.tabs.general.library-groups.enter-name": {
+    "message": "Ilagay ang pangalan ng pangkat"
+  },
+  "instance.settings.tabs.general.name": {
+    "message": "Pangalan"
+  },
+  "instance.settings.tabs.hooks": {
+    "message": "Mga kawit sa paglunsad"
+  },
+  "instance.settings.tabs.hooks.custom-hooks": {
+    "message": "Mga pasadyang kawit sa paglunsad"
+  },
+  "instance.settings.tabs.hooks.description": {
+    "message": "Binibigyan-daan ng mga kawit ang mga madalubhasang gumagamit na makapagtakbo ng mga utos sa kaayusan bago at pagkatapos malunsad ang laro."
+  },
+  "instance.settings.tabs.hooks.post-exit": {
+    "message": "Tapos-mapinid"
+  },
+  "instance.settings.tabs.hooks.post-exit.description": {
+    "message": "Ipapatakbo pagkatapos mapinid ang laro."
+  },
+  "instance.settings.tabs.hooks.post-exit.enter": {
+    "message": "Ilagay ang tapos-mapinid na utos..."
+  },
+  "instance.settings.tabs.hooks.pre-launch": {
+    "message": "Bago-malunsad"
+  },
+  "instance.settings.tabs.hooks.pre-launch.description": {
+    "message": "Ipapatakbo bago mailunsad ang tularan."
+  },
+  "instance.settings.tabs.hooks.pre-launch.enter": {
+    "message": "Ilagay ang bago-malunsad na utos..."
+  },
+  "instance.settings.tabs.hooks.title": {
+    "message": "Mga kawit sa paglunsad ng laro"
+  },
+  "instance.settings.tabs.hooks.wrapper": {
+    "message": "Pambalot"
+  },
+  "instance.settings.tabs.hooks.wrapper.description": {
+    "message": "Pambalot na utos sa paglunsad ng Minecraft."
+  },
+  "instance.settings.tabs.hooks.wrapper.enter": {
+    "message": "Ilagay ang pambalot na utos..."
+  },
+  "instance.settings.tabs.installation": {
+    "message": "Pagkakabit"
+  },
+  "instance.settings.tabs.installation.change-version.already-installed.modded": {
+    "message": "Naka-install naman ang {platform} {version} para sa Minecraft {game_version}"
+  },
+  "instance.settings.tabs.installation.change-version.already-installed.vanilla": {
+    "message": "Nakakabit naman ang Baynilyang {game_version}"
+  },
+  "instance.settings.tabs.installation.change-version.button": {
+    "message": "Palitan ang bersiyon"
+  },
+  "instance.settings.tabs.installation.change-version.button.install": {
+    "message": "Ikabit"
+  },
+  "instance.settings.tabs.installation.change-version.button.installing": {
+    "message": "Kinakabit"
+  },
+  "instance.settings.tabs.installation.change-version.cannot-while-fetching": {
+    "message": "Naghahanap ng mga bersiyon ng mga balot ng pambago"
+  },
+  "instance.settings.tabs.installation.change-version.in-progress": {
+    "message": "Kinakabit ang bagong bersiyon"
+  },
+  "instance.settings.tabs.installation.currently-installed": {
+    "message": "Kasalukuyang nakakabit"
+  },
+  "instance.settings.tabs.installation.debug-information": {
+    "message": "Kaalaman sa pagdalisay:"
+  },
+  "instance.settings.tabs.installation.game-version": {
+    "message": "Bersiyon ng laro"
+  },
+  "instance.settings.tabs.installation.install": {
+    "message": "Ikabit"
+  },
+  "instance.settings.tabs.installation.loader-version": {
+    "message": "Bersiyon ng {loader}"
+  },
+  "instance.settings.tabs.installation.minecraft-version": {
+    "message": "Minecraft {version}"
+  },
+  "instance.settings.tabs.installation.no-loader-versions": {
+    "message": "Hindi magagamit ang {loader} sa Minecraft {version}. Sumubok ng ibang tagapagtala ng pambago."
+  },
+  "instance.settings.tabs.installation.platform": {
+    "message": "Batyawan"
+  },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
-    "message": "Maaaring mababalik sa dati ang lahat ng kinabit o binago na nilalaman sa kung anong ibibigay ng balot ng pambago, tatanggalin ang mga pambago o nilalamang idinagdag mo lalo na ang nangunang balot ng pambago. Maaari nitong masiayos ang mga hindi inaasahang pag-uugali kung may pagbabagong naganap sa pangyayari, ngunit kung nakabatay na ang iyong daigdig sa karagdagang nilalaman, maaari nitong masira ang mga umiiral na daigdig."
+    "message": "Maaaring mababalik sa dati ang lahat ng kinabit o binago na nilalaman sa kung anong ibibigay ng balot ng pambago, tatanggalin ang mga pambago o nilalamang idinagdag mo lalo na ang nangunang balot ng pambago. Maaari nitong masiayos ang mga hindi inaasahang pag-uugali kung may pagbabagong naganap sa tularan, ngunit kung nakabatay na ang iyong daigdig sa karagdagang nilalaman, maaari nitong masira ang mga umiiral na daigdig."
   },
   "instance.settings.tabs.installation.reinstall.description": {
-    "message": "Ibalik ang mga nilalaman ng pangyayari sa pangunahing kalagayan, tatanggalin ang mga pambago o nilalamang idinagdag mo lalo na ang nangunang balot ng pambago."
+    "message": "Ibalik ang mga nilalaman ng tularan sa pangunahing kalagayan, tatanggalin ang mga pambago o nilalamang idinagdag mo lalo na ang nangunang balot ng pambago."
+  },
+  "instance.settings.tabs.installation.repair.button": {
+    "message": "Kumpunihin"
+  },
+  "instance.settings.tabs.installation.repair.button.repairing": {
+    "message": "Kinukumpuni"
+  },
+  "instance.settings.tabs.installation.repair.confirm.description": {
+    "message": "Sa pag-aayos, magkakabit muli ng mga sandalan ng Minecraft at maghahanap ng mga katiwalian. Maaaring malutas nito ang mga isyu kung hindi malulunsad ang laro dahil sa mga kamalian sa tagapaglunsad, ngunit hindi nito malulutas ang mga isyu o pagbagsak na dulot nga mga pambagong nakakabit."
+  },
+  "instance.settings.tabs.installation.repair.confirm.title": {
+    "message": "Kumpunihin ang tularan?"
+  },
+  "instance.settings.tabs.installation.show-all-versions": {
+    "message": "Ipakita ang lahat ng bersiyon"
+  },
+  "instance.settings.tabs.installation.tooltip.action.change-version": {
+    "message": "palitan ang bersiyon"
+  },
+  "instance.settings.tabs.installation.tooltip.action.install": {
+    "message": "ikabit"
+  },
+  "instance.settings.tabs.installation.tooltip.action.reinstall": {
+    "message": "ikabit muli"
+  },
+  "instance.settings.tabs.installation.tooltip.action.repair": {
+    "message": "kumpunihin"
+  },
+  "instance.settings.tabs.installation.tooltip.cannot-while-installing": {
+    "message": "Hindi makaka-{action} habang nagkakabit"
+  },
+  "instance.settings.tabs.installation.tooltip.cannot-while-offline": {
+    "message": "Hindi makaka-{action} habang di-nakakabit"
+  },
+  "instance.settings.tabs.installation.tooltip.cannot-while-repairing": {
+    "message": "Hindi makaka-{action} habang nagkukumpuni"
+  },
+  "instance.settings.tabs.installation.unknown-version": {
+    "message": "(hindi kilalang bersiyon)"
+  },
+  "instance.settings.tabs.installation.unlink.confirm.description": {
+    "message": "Kung ipapatuloy mo, hindi mo na itong maaaring maikawing muli ng hindi lilikha ng panibagong tularan. Hindi ka makatatanggap ng mga pagsasapanahon ng pambalot ng pambago at magiging pangkaraniwan na itong."
+  },
+  "instance.settings.tabs.installation.unlink.description": {
+    "message": "Nakakawing ang tularang ito sa isang pambalot ng pambago, ibig sabihin hindi maisapanahon ang mga pambago at hindi mo mapapalitan ang tagapagdala ng pambago o ang bersiyon ng Minecraft."
+  },
+  "instance.settings.tabs.java.hooks": {
+    "message": "Mga kawit"
+  },
+  "instance.settings.tabs.java.java-installation": {
+    "message": "Kabit ng Java"
+  },
+  "instance.settings.tabs.window": {
+    "message": "Durungawan"
   },
   "instance.settings.tabs.window.custom-window-settings": {
     "message": "Mga kagustuhan sa pasadyang durungawan"
   },
+  "instance.settings.tabs.window.height": {
+    "message": "Tayog"
+  },
+  "instance.settings.tabs.window.width": {
+    "message": "Lapad"
+  },
   "instance.settings.title": {
     "message": "Mga Kagustuhan"
   },
+  "instance.worlds.a_minecraft_server": {
+    "message": "Isang Minecraft na Tagapagsilbi"
+  },
+  "instance.worlds.copy_address": {
+    "message": "Sipiin ang tinitirhan"
+  },
+  "instance.worlds.type.server": {
+    "message": "Tagapagsilbi"
+  },
+  "instance.worlds.type.singleplayer": {
+    "message": "Pang-isahang laro"
+  },
   "instance.worlds.view_instance": {
-    "message": "Tingnan ang pangyayari"
+    "message": "Tingnan ang tularan"
   }
 }
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index 70d21ac3..ec0881c7 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -3,7 +3,7 @@
     "message": "Geliştirici modu açıldı."
   },
   "app.settings.downloading": {
-    "message": "V{version} İndiriliyor"
+    "message": "v{version} indiriliyor"
   },
   "app.settings.tabs.appearance": {
     "message": "Görünüm"
@@ -65,6 +65,69 @@
   "app.update.reload-to-update": {
     "message": "Güncellemeyi yüklemek için yeniden yükleyin"
   },
+  "friends.action.add-friend": {
+    "message": "Bir arkadaş ekle"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} Arkadaşlık {count, plural,one {isteği} other {istekleri}}"
+  },
+  "friends.add-friend.submit": {
+    "message": "Arkadaşlık isteği gönder"
+  },
+  "friends.add-friend.title": {
+    "message": "Bir arkadaş ekleme"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Minecraft kullanıcı adlarından farklı olabilir!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Modrinth kullanıcı adını girin..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Arkadaşının Modrinth kullanıcı adı nedir?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "Arkadaşlarının ne oynadığını görmek için <link>onları ekle</link>!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "İsteği iptal et"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Arkadaşı çıkar"
+  },
+  "friends.friend.request-sent": {
+    "message": "Arkadaşlık isteği gönderildi"
+  },
+  "friends.friend.view-profile": {
+    "message": "Profili gör"
+  },
+  "friends.heading": {
+    "message": "Arkadaşlar"
+  },
+  "friends.heading.active": {
+    "message": "Aktif"
+  },
+  "friends.heading.offline": {
+    "message": "Deaktif"
+  },
+  "friends.heading.online": {
+    "message": "Çevrimiçi"
+  },
+  "friends.heading.pending": {
+    "message": "Bekleniyor"
+  },
+  "friends.no-friends-match": {
+    "message": "''{query}'' ile eşleşen arkadaş yok"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Arkadaşları ara..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "Arkadaş eklemek ve ne oynadıklarını görmek için bir <link>Modrinth hesabına giriş yap</link>!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Ekle ve oyna"
   },
diff --git a/apps/app-frontend/src/locales/tt-RU/index.json b/apps/app-frontend/src/locales/tt-RU/index.json
index 4eb6b716..5b57a8b4 100644
--- a/apps/app-frontend/src/locales/tt-RU/index.json
+++ b/apps/app-frontend/src/locales/tt-RU/index.json
@@ -92,6 +92,9 @@
   "instance.settings.tabs.installation.change-version.button.installing": {
     "message": "Утырту"
   },
+  "instance.settings.tabs.installation.debug-information": {
+    "message": "Төзәтү мәгълүматы:"
+  },
   "instance.settings.tabs.installation.game-version": {
     "message": "Уен версиясе"
   },
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index 49852196..065848ec 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -24,16 +24,16 @@
     "message": "Керування ресурсами"
   },
   "app.update-toast.body": {
-    "message": "Modrinth App v{version} готова до встановлення. Перезапустіть програму, щоб встановити зараз, чи вона оновиться автоматично після закриття."
+    "message": "Modrinth App v{version} готова до встановлення! Перезапустіть, щоб оновити зараз. Або, оновлення буде здійснено автоматично, коли закриєте Modrinth App."
   },
   "app.update-toast.body.download-complete": {
-    "message": "Завантаження Modrinth App v{version} завершене. Перезапустіть програму щоб оновити зараз, чи вона оновиться автоматично після закриття."
+    "message": "Modrinth App v{version} уже завантажилась. Перезапустіть, щоб оновити зараз. Або, оновлення буде здійснено автоматично, коли закриєте Modrinth App."
   },
   "app.update-toast.body.metered": {
-    "message": "Modrinth App v{version} вже доступна до завантаження! Оскільки ви на лімітному підключенні, ми не завантажили його автоматично."
+    "message": "Modrinth App v{version} доступна зараз! Оскільки ви на лімітному з’єднанні, ми не завантажили її автоматично."
   },
   "app.update-toast.changelog": {
-    "message": "Список змін"
+    "message": "Журнал змін"
   },
   "app.update-toast.download": {
     "message": "Завантажити ({size})"
@@ -65,6 +65,69 @@
   "app.update.reload-to-update": {
     "message": "Перезавантажте, щоб установити оновлення"
   },
+  "friends.action.add-friend": {
+    "message": "Додати друга"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} запит{count, plural, one { у} few {и в} many {ів у} other {у в}} друзі"
+  },
+  "friends.add-friend.submit": {
+    "message": "Надіслати запит у друзі"
+  },
+  "friends.add-friend.title": {
+    "message": "Додавання друга"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Може відрізнятися від його або її імені користувача Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Уведіть ім’я користувача Modrinth…"
+  },
+  "friends.add-friend.username.title": {
+    "message": "Яке ім’я користувача Modrinth у вашого друга?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Додайте друзів</link>, щоб бачити, у що вони грають!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Скасувати запит"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Видалити друга"
+  },
+  "friends.friend.request-sent": {
+    "message": "Запит у друзі надіслано"
+  },
+  "friends.friend.view-profile": {
+    "message": "Переглянути профіль"
+  },
+  "friends.heading": {
+    "message": "Друзі"
+  },
+  "friends.heading.active": {
+    "message": "Активний"
+  },
+  "friends.heading.offline": {
+    "message": "Поза мережею"
+  },
+  "friends.heading.online": {
+    "message": "У мережі"
+  },
+  "friends.heading.pending": {
+    "message": "Очікується"
+  },
+  "friends.no-friends-match": {
+    "message": "Немає друзів, котрі збігаються з «{query}»"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Шукати друзів…"
+  },
+  "friends.section.heading": {
+    "message": "{title} — {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Увійдіть в обліковий запис Modrinth</link>, щоб додати друзів і бачити, у що вони грають!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Додати та грати"
   },
@@ -123,7 +186,7 @@
     "message": "Загальні"
   },
   "instance.settings.tabs.general.delete": {
-    "message": "Видалити інсталяцію"
+    "message": "Видалити примірник"
   },
   "instance.settings.tabs.general.delete.button": {
     "message": "Видалити профіль"
@@ -279,7 +342,7 @@
     "message": "Перевстановлення збірки"
   },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
-    "message": "Перевстановлення скине увесь доданий або модифікований вміст до наданого збіркою, прибираючи будь-які, додатково встановлені вами модифікації чи вміст.\nЯкщо ви змінювали профіль, це може виправити непередбачувану поведінку, однак, якщо ваші світи залежать від додаткового вмісту, це може зламати ці світи."
+    "message": "Перевстановлення скине увесь доданий або модифікований вміст до наданого збіркою, прибираючи будь-які, додатково встановлені вами модифікації чи вміст.\nЯкщо ви змінювали інсталяцію, це може виправити непередбачувану поведінку, однак, якщо ваші світи залежать від додаткового вмісту, це може зламати ці світи."
   },
   "instance.settings.tabs.installation.reinstall.confirm.title": {
     "message": "Ви впевнені, що хочете перевстановити цей профіль?"
@@ -303,7 +366,7 @@
     "message": "Відновити профіль?"
   },
   "instance.settings.tabs.installation.repair.in-progress": {
-    "message": "Відновлення в процессі"
+    "message": "Лагодження в процесі"
   },
   "instance.settings.tabs.installation.reset-selections": {
     "message": "Скинути до поточного"
@@ -321,7 +384,7 @@
     "message": "перевстановити"
   },
   "instance.settings.tabs.installation.tooltip.action.repair": {
-    "message": "виправити"
+    "message": "полагодити"
   },
   "instance.settings.tabs.installation.tooltip.cannot-while-installing": {
     "message": "Неможливо {action} під час встановлення"
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index 062969be..06509668 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -65,6 +65,66 @@
   "app.update.reload-to-update": {
     "message": "重新启动以安装更新"
   },
+  "friends.action.add-friend": {
+    "message": "加一好友"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count}好友请求"
+  },
+  "friends.add-friend.submit": {
+    "message": "发送好友请求"
+  },
+  "friends.add-friend.username.description": {
+    "message": "可能和他们的 Minecraft 用户名不一样！"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "输入Modrinth用户名……"
+  },
+  "friends.add-friend.username.title": {
+    "message": "你朋友的 Modrinth 用户名是什么？"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>添加好友</link>查看他们在玩什么！"
+  },
+  "friends.friend.cancel-request": {
+    "message": "取消请求"
+  },
+  "friends.friend.remove-friend": {
+    "message": "删除好友"
+  },
+  "friends.friend.request-sent": {
+    "message": "已发送好友请求"
+  },
+  "friends.friend.view-profile": {
+    "message": "查看个人资料"
+  },
+  "friends.heading": {
+    "message": "好友"
+  },
+  "friends.heading.active": {
+    "message": "活跃的"
+  },
+  "friends.heading.offline": {
+    "message": "离线"
+  },
+  "friends.heading.online": {
+    "message": "在线"
+  },
+  "friends.heading.pending": {
+    "message": "待确认"
+  },
+  "friends.no-friends-match": {
+    "message": "没有匹配“{query}”的朋友"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "搜索好友……"
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "请登录你的 <link>Modrinth账号</link> 添加好友并查看他们在玩什么！"
+  },
   "instance.add-server.add-and-play": {
     "message": "添加并游玩"
   },
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index 4251ed38..45cc1bcf 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -36,7 +36,7 @@
     "message": "變更紀錄"
   },
   "app.update-toast.download": {
-    "message": "下載（{size}）"
+    "message": "下載 ({size})"
   },
   "app.update-toast.downloading": {
     "message": "下載中..."
@@ -60,11 +60,74 @@
     "message": "下載更新"
   },
   "app.update.downloading-update": {
-    "message": "正在下載更新（{percent}%）"
+    "message": "正在下載更新 ({percent}%)"
   },
   "app.update.reload-to-update": {
     "message": "重新載入即可安裝更新"
   },
+  "friends.action.add-friend": {
+    "message": "新增好友"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} 個好友請求"
+  },
+  "friends.add-friend.submit": {
+    "message": "傳送好友請求"
+  },
+  "friends.add-friend.title": {
+    "message": "新增好友"
+  },
+  "friends.add-friend.username.description": {
+    "message": "這可能與對方的 Minecraft 使用者名稱不同！"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "輸入 Modrinth 使用者名稱..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "你好友的 Modrinth 使用者名稱是什麼？"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>新增好友</link>即可查看對方正在玩什麼！"
+  },
+  "friends.friend.cancel-request": {
+    "message": "取消請求"
+  },
+  "friends.friend.remove-friend": {
+    "message": "移除好友"
+  },
+  "friends.friend.request-sent": {
+    "message": "好友請求已送出"
+  },
+  "friends.friend.view-profile": {
+    "message": "查看個人檔案"
+  },
+  "friends.heading": {
+    "message": "好友"
+  },
+  "friends.heading.active": {
+    "message": "活躍中"
+  },
+  "friends.heading.offline": {
+    "message": "離線"
+  },
+  "friends.heading.online": {
+    "message": "線上"
+  },
+  "friends.heading.pending": {
+    "message": "待處理"
+  },
+  "friends.no-friends-match": {
+    "message": "沒有符合「{query}」的好友"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "搜尋好友..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>登入 Modrinth 帳號</link>即可新增好友並查看對方正在玩什麼！"
+  },
   "instance.add-server.add-and-play": {
     "message": "新增並遊玩"
   },
diff --git a/apps/frontend/src/locales/ar-SA/index.json b/apps/frontend/src/locales/ar-SA/index.json
index 0d8439af..cf95829b 100644
--- a/apps/frontend/src/locales/ar-SA/index.json
+++ b/apps/frontend/src/locales/ar-SA/index.json
@@ -1,4 +1,10 @@
 {
+  "action.cancel": {
+    "message": "إلغاء"
+  },
+  "action.continue": {
+    "message": "متابعة"
+  },
   "admin.billing.error.not-found": {
     "message": "المستخدم غير موجود"
   },
@@ -326,6 +332,24 @@
   "auth.verify-email.failed-verification.action": {
     "message": "إعادة إرسال بريد التحقق"
   },
+  "auth.verify-email.failed-verification.description": {
+    "message": "تعذّر علينا التحقّق من بريدك الإلكتروني. حاول إعادة إرسال رسالة التحقّق من خلال لوحة التحكم بعد تسجيل الدخول."
+  },
+  "auth.verify-email.failed-verification.description.logged-in": {
+    "message": "تعذّر علينا التحقّق من بريدك الإلكتروني. حاول إعادة إرسال رسالة التحقّق باستخدام الزر أدناه."
+  },
+  "auth.verify-email.failed-verification.title": {
+    "message": "فشل التحقق من البريد الإلكتروني"
+  },
+  "auth.verify-email.post-verification.description": {
+    "message": "تم التحقّق من عنوان بريدك الإلكتروني بنجاح!"
+  },
+  "auth.verify-email.post-verification.title": {
+    "message": "التحقّق من البريد الإلكتروني"
+  },
+  "auth.verify-email.title": {
+    "message": "تحقّق من البريد الإلكتروني"
+  },
   "auth.welcome.checkbox.subscribe": {
     "message": "اشترك في التحديثات حول مودرنث"
   },
@@ -338,6 +362,21 @@
   "auth.welcome.long-title": {
     "message": "مرحبًا بك في مودرنث!"
   },
+  "auth.welcome.title": {
+    "message": "مرحبًا"
+  },
+  "collection.button.delete-icon": {
+    "message": "حذف الأيقونة"
+  },
+  "collection.button.edit-icon": {
+    "message": "تعديل الأيقونة"
+  },
+  "collection.button.remove-project": {
+    "message": "إزالة المشروع"
+  },
+  "collection.button.unfollow-project": {
+    "message": "إلغاء متابعة المشروع"
+  },
   "collection.delete-modal.description": {
     "message": "سيتم حذف هذه المجموعة نهائيًا. لا يمكن التراجع عن هذا الإجراء."
   },
@@ -347,6 +386,117 @@
   "collection.description": {
     "message": "{description} - عرض المجموعة {name} بواسطة {username} على مودرنث"
   },
+  "collection.description.following": {
+    "message": "مجموعة تم إنشاؤها تلقائيًا تضمّ جميع المشاريع التي تتابعها."
+  },
+  "collection.error.not-found": {
+    "message": "لم يتم العثور على المجموعة"
+  },
+  "collection.label.collection": {
+    "message": "مجموعة"
+  },
+  "collection.label.created-at": {
+    "message": "تم الإنشاء منذ {ago}"
+  },
+  "collection.label.curated-by": {
+    "message": "من إعداد"
+  },
+  "collection.label.no-projects": {
+    "message": "لا تحتوي هذه المجموعة على أي مشاريع!"
+  },
+  "collection.label.no-projects-auth": {
+    "message": "ليس لديك أي مشاريع. هل ترغب في <create-link>إضافة مشروع</create-link>؟"
+  },
+  "collection.label.owner": {
+    "message": "المالك"
+  },
+  "collection.label.projects-count": {
+    "message": "{count, plural,\n  one {<stat>{count}</stat> مشروع}\n  other {<stat>{count}</stat> مشاريع}\n}"
+  },
+  "collection.label.updated-at": {
+    "message": "تم التحديث منذ {ago}"
+  },
+  "collection.title": {
+    "message": "{name} - مجموعة"
+  },
+  "common.no": {
+    "message": "لا"
+  },
+  "common.yes": {
+    "message": "نعم"
+  },
+  "create.collection.cancel": {
+    "message": "إلغاء"
+  },
+  "create.collection.collection-info": {
+    "message": "سيتم إنشاء مجموعتك الجديدة كمجموعة عامة تحتوي على {count, plural,\n  one {# مشروع}\n  other {# مشاريع}\n}."
+  },
+  "create.collection.create-collection": {
+    "message": "إنشاء مجموعة"
+  },
+  "create.collection.error-title": {
+    "message": "حدث خطأ"
+  },
+  "create.collection.name-label": {
+    "message": "الاسم"
+  },
+  "create.collection.name-placeholder": {
+    "message": "أدخل اسم المجموعة..."
+  },
+  "create.collection.summary-description": {
+    "message": "جملة أو جملتان تصف مجموعتك."
+  },
+  "create.collection.summary-label": {
+    "message": "الملخّص"
+  },
+  "create.collection.summary-placeholder": {
+    "message": "هذه مجموعة من..."
+  },
+  "create.collection.title": {
+    "message": "إنشاء مجموعة"
+  },
+  "create.limit-alert.approaching-limit": {
+    "message": "تقترب من حدّ {type} ‏({current}/{max})"
+  },
+  "create.limit-alert.approaching-limit-description": {
+    "message": "أنت على وشك بلوغ حدّ {type}. يُرجى التواصل مع الدعم إذا كنت بحاجة إلى أكثر من {max} {typePlural}."
+  },
+  "create.limit-alert.contact-support": {
+    "message": "تواصل مع الدعم الفني"
+  },
+  "create.limit-alert.limit-reached": {
+    "message": "تم بلوغ حدّ {type}"
+  },
+  "create.limit-alert.limit-reached-description": {
+    "message": "لقد وصلت إلى حدّ {type} الخاص بك وهو {max}. يُرجى التواصل مع الدعم لزيادة الحدّ."
+  },
+  "create.limit-alert.type-collection": {
+    "message": "مجموعة"
+  },
+  "create.limit-alert.type-organization": {
+    "message": "مؤسسة"
+  },
+  "create.limit-alert.type-plural-collection": {
+    "message": "مجموعات"
+  },
+  "create.limit-alert.type-plural-organization": {
+    "message": "مؤسسات"
+  },
+  "create.limit-alert.type-plural-project": {
+    "message": "مشاريع"
+  },
+  "create.limit-alert.type-project": {
+    "message": "مشروع"
+  },
+  "create.organization.cancel": {
+    "message": "إلغاء"
+  },
+  "create.organization.create-organization": {
+    "message": "إنشاء مؤسسة"
+  },
+  "create.organization.error-title": {
+    "message": "حدث خطأ"
+  },
   "error.collection.404.list_item.3": {
     "message": "قد تكون هذه المجموعة قد أزالها فريق مراقبة مودرنث لانتهاك <tou-link>شروط الاستخدام</tou-link> الخاصة بنا."
   },
@@ -356,15 +506,54 @@
   "error.generic.default.list_item.2": {
     "message": "إذا استمر حدوث ذلك، قد ترغب في إعلام فريق مودرنث بالانضمام إلى <discord-link>سيرفر ديسكورد</discord-link> الخاص بنا."
   },
+  "error.organization.404.list_item.1": {
+    "message": "ربما أدخلت عنوان URL الخاص بالمؤسسة بشكل غير صحيح."
+  },
+  "error.organization.404.list_item.2": {
+    "message": "قد يكون مالك المؤسسة قد غيّر عنوان الـURL أو حذفه."
+  },
   "error.organization.404.list_item.3": {
     "message": "قد تكون هذه المنظمة قد أزالها فريق مراقبة مودرنث لانتهاك <tou-link>شروط الاستخدام</tou-link> الخاصة بنا."
   },
+  "error.organization.404.list_title": {
+    "message": "لماذا؟"
+  },
+  "error.organization.404.title": {
+    "message": "لم يتم العثور على المؤسسة"
+  },
+  "error.project.404.list_item.1": {
+    "message": "ربما أدخلت عنوان URL الخاص بالمؤسسة بشكل غير صحيح."
+  },
+  "error.project.404.list_item.2": {
+    "message": "قد يكون مالك المشروع قد غيّر عنوان الـURL، أو جعل المشروع خاصًا، أو حذفه."
+  },
   "error.project.404.list_item.3": {
     "message": "قد يكون هذا المشروع قد أزاله فريق مراقبة مودرنث لانتهاك <tou-link>شروط الاستخدام</tou-link> الخاصة بنا."
   },
+  "error.project.404.list_title": {
+    "message": "لماذا؟"
+  },
+  "error.project.404.title": {
+    "message": "لم يتم العثور على المشروع"
+  },
+  "error.user.404.list_item.1": {
+    "message": "ربما أدخلت اسم مستخدم المستخدم بشكل غير صحيح."
+  },
+  "error.user.404.list_item.2": {
+    "message": "قد يكون المستخدم قد غيّر اسم المستخدم أو حذف حسابه."
+  },
   "error.user.404.list_item.3": {
     "message": "تم تعطيل حساب هذا المستخدم لانتهاكه <tou-link>شروط الاستخدام</tou-link> الخاصة بمودرنث."
   },
+  "error.user.404.list_title": {
+    "message": "لماذا؟"
+  },
+  "error.user.404.title": {
+    "message": "لم يتم العثور على المُستخدم"
+  },
+  "frog": {
+    "message": "لقد تم ضفدعتك! 🐸"
+  },
   "landing.button.discover-mods": {
     "message": "اكتشف المودات"
   },
diff --git a/apps/frontend/src/locales/ceb-PH/index.json b/apps/frontend/src/locales/ceb-PH/index.json
index f5cecab9..15b0d8ed 100644
--- a/apps/frontend/src/locales/ceb-PH/index.json
+++ b/apps/frontend/src/locales/ceb-PH/index.json
@@ -1,6 +1,9 @@
 {
+  "action.cancel": {
+    "message": "Paphai"
+  },
   "app-marketing.download.description": {
-    "message": "Magamit ang among desktop nga aplikasyon sa magkalahi-lahi nga plataporma, pamili sa imong giganahan nga bersiyon."
+    "message": "Magamit ang among desktop nga aplikasyon sa magkalahi-lahi nga pantawan, pamili sa imong giganahan nga bersiyon."
   },
   "app-marketing.download.download-appimage": {
     "message": "Karganugi ang AppImage"
@@ -35,15 +38,54 @@
   "app-marketing.download.windows": {
     "message": "Windows"
   },
+  "app-marketing.features.importing.multimc-alt": {
+    "message": "MultiMC"
+  },
+  "app-marketing.features.mod-management.actions": {
+    "message": "Mga Kalihokan"
+  },
+  "app-marketing.features.mod-management.description": {
+    "message": "Ginapadali sa Modrinth ang pagpamahala sa tanan nimong kausaban sa mausa nga dapit. Makataud, makatangtang, ug makapasibo sa mga kausaban sa usa ra ka tuplok."
+  },
+  "app-marketing.features.mod-management.installed-mods": {
+    "message": "Mga gitaud nga kausaban"
+  },
+  "app-marketing.features.mod-management.name": {
+    "message": "Ngalan"
+  },
+  "app-marketing.features.mod-management.search-mods": {
+    "message": "Mangita og mga kausaban"
+  },
   "app-marketing.features.open-source.title": {
     "message": "Bukas nga tinubdan"
   },
+  "app-marketing.features.performance.cpu-percent": {
+    "message": "% CPU"
+  },
+  "app-marketing.features.performance.infinite-mb": {
+    "message": "∞ MB"
+  },
+  "app-marketing.features.performance.less-than-150mb": {
+    "message": "< 150 MB"
+  },
   "app-marketing.features.performance.modrinth-app": {
     "message": "Modrinth App"
   },
+  "app-marketing.features.performance.one-billion-percent": {
+    "message": "1 ka wakat nga %"
+  },
+  "app-marketing.features.performance.ram": {
+    "message": "RAM"
+  },
+  "app-marketing.features.performance.small": {
+    "message": "Gagmay"
+  },
   "app-marketing.features.play.description": {
     "message": "Gamita ang Modrinth App sa pagkarganug ug pagdula sa imong paborito nga mga kausaban ug putos sa kausaban."
   },
+  "app-marketing.features.sharing.share-button": {
+    "message": "Pag-ambit"
+  },
   "app-marketing.hero.download-button": {
     "message": "Karganugi ang Modrinth App"
   },
@@ -56,11 +98,23 @@
   "app-marketing.hero.more-download-options": {
     "message": "Dugang nga Kapilian sa Pagkarganug"
   },
+  "auth.reset-password.method-choice.email-username.placeholder": {
+    "message": "Dagiwat"
+  },
+  "auth.sign-in.additional-options": {
+    "message": "<forgot-password-link>Nalimtan ang tinago nga pulong?</forgot-password-link> • <create-account-link>Paghimo ug akawnt</create-account-link>"
+  },
+  "auth.sign-up.email.label": {
+    "message": "Dagiwat"
+  },
   "auth.verify-email.action.account-settings": {
-    "message": "Mga gusto sa akawnt"
+    "message": "Mga himutangan sa akawnt"
+  },
+  "auth.verify-email.post-verification.description": {
+    "message": "Malampusong napamatud-an ang padal-anan sa imong dagiwat!"
   },
   "auth.welcome.description": {
-    "message": "Lakip na ka karon sa niining makapahingangha nga dakbalangay sama sa mga magbubuhat ug manunuhid nga gatukod, gakarganug, ug gasunod sa kapanahonan sa mga makapahibulong nga mga kausaban."
+    "message": "Lakip na ka karon sa niining makapahingangha nga dakbalangay sama sa mga magbubuhat ug manunuhid nga pagtukod, pagkarganug, ug pagsunod sa kapanahonan sa mga makapahibulong nga mga kausaban."
   },
   "collection.button.edit-icon": {
     "message": "Usba ang amoy"
@@ -71,6 +125,51 @@
   "collection.delete-modal.description": {
     "message": "Hangtod sa kahangturan nga matangtang kining gitipon. Kini nga aksyon dili mabawi."
   },
+  "collection.error.not-found": {
+    "message": "Dili makit-i ang tinigom"
+  },
+  "collection.label.owner": {
+    "message": "Tag-iya"
+  },
+  "common.no": {
+    "message": "Hindi"
+  },
+  "common.yes": {
+    "message": "Oo"
+  },
+  "create.collection.cancel": {
+    "message": "Paphai"
+  },
+  "create.collection.name-label": {
+    "message": "Ngalan"
+  },
+  "create.organization.cancel": {
+    "message": "Paphai"
+  },
+  "create.organization.name-label": {
+    "message": "Ngalan"
+  },
+  "create.organization.url-label": {
+    "message": "URL"
+  },
+  "create.project.cancel": {
+    "message": "Paphai"
+  },
+  "create.project.name-label": {
+    "message": "Ngalan"
+  },
+  "create.project.url-label": {
+    "message": "URL"
+  },
+  "create.project.visibility-public": {
+    "message": "Publiko"
+  },
+  "create.project.visibility-unlisted": {
+    "message": "Wala malista"
+  },
+  "dashboard.collections.label.search-input": {
+    "message": "Mangita sa imong mga gitigom"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Usa ka entidad sa negosyo ang langyaw nga entidad nga naghan-ay gawas sa Tinipong Bansa (sama sa di-US nga korporasyon, partnership, o LLC)."
   },
@@ -80,17 +179,62 @@
   "dashboard.creator-tax-form-modal.entity.question": {
     "message": "Usa ka ba nga pribado nga indibidwal o uban sa usa ka langyaw nga entidad?"
   },
+  "error.collection.404.list_title": {
+    "message": "Ngano?"
+  },
+  "error.generic.default.title": {
+    "message": "Ayay!"
+  },
+  "error.organization.404.list_title": {
+    "message": "Ngano?"
+  },
+  "error.project.404.list_title": {
+    "message": "Ngano?"
+  },
+  "error.user.404.list_title": {
+    "message": "Ngano?"
+  },
+  "frog.altText": {
+    "message": "Usa ka matinuod nga pamintal sa labirintong palaka"
+  },
+  "frog.title": {
+    "message": "Baki"
+  },
+  "landing.button.discover-mods": {
+    "message": "Pagkaplag og mga kausaban"
+  },
+  "landing.button.go-to-dashboard": {
+    "message": "Adtoan ang talad sa pagsubay"
+  },
   "landing.creator.feature.data-statistics.description": {
     "message": "Makadawat og detalyado nga pagtaho sa mga paglantaw og panid, ihap sa pagkarganug, ug kinitaan"
   },
   "landing.feature.launcher.description": {
     "message": "Ang bukas nga tinubdan nga API sa Modrinth nagtugot sa mga tiglansad nga makadugang sa lawom nga panagsama sa Modrinth. Mahimo nimong magamit ang Modrinth pinaagi sa <link>among aplikasyon</link> ug sa pipila nga labing inila nga mga tiglansad sama sa ATLauncher, MultiMC, ug Prism Launcher."
   },
+  "landing.heading.the-place-for-minecraft": {
+    "message": "Dapit alang sa Minecraft nga {content}"
+  },
+  "landing.heading.the-place-for-minecraft.mods": {
+    "message": "mga kausaban"
+  },
   "landing.heading.the-place-for-minecraft.resource-packs": {
-    "message": "mga putos sa kabtangan"
+    "message": "mga putos sa kahinguhaan"
+  },
+  "landing.notifications.has-been-updated": {
+    "message": "Napasibo ang {title}!"
+  },
+  "landing.search.label": {
+    "message": "Mangita"
+  },
+  "landing.search.placeholder": {
+    "message": "Mangita..."
+  },
+  "landing.section.for-players.label": {
+    "message": "Alang sa mga Magdudula"
   },
   "landing.subheading": {
-    "message": "Pagkaplag, pagdula, ug pagbahin og mga Minecraft nga kontento sa among bukas nga tinubdan nga plataporma nga gihimo alang sa dakbalangay."
+    "message": "Pagkaplag, pagdula, ug pagbahin og mga Minecraft nga kontento sa among bukas nga tinubdan nga pantawan nga gihimo alang sa dakbalangay."
   },
   "layout.action.create-new": {
     "message": "Pagbuhat og bag-o..."
@@ -98,14 +242,23 @@
   "layout.action.reports": {
     "message": "Mga pagtaho"
   },
+  "layout.banner.account-action": {
+    "message": "Gakinahanglan og akawnt"
+  },
   "layout.banner.add-email.button": {
-    "message": "Mga gusto sa akawnt"
+    "message": "Duawi ang mga himutangan sa akawnt"
+  },
+  "layout.banner.add-email.description": {
+    "message": "Tungod sa mga hinungdan sa kahilwasan, manginahanglan ang Modrinth nga morehistro ka og padad-anan sa dagiwat sa imong akawnt."
   },
   "layout.banner.build-fail.description": {
-    "message": "Napakyas sa pagmugna og kahimtang gikan sa API kining pagkatap sa frontend sa Modrinth. Basin tungod sa pagkabalda o sayop sa paghan-ay. Pagtukod pag-usab kon magamit na ang API. Mga kalagdaan sa sayop: {errors}; Ang kasamtangan nga URL sa API: {url}"
+    "message": "Napakyas sa pagmugna og kahimtang gikan sa API kining pagkatap sa frontend sa Modrinth. Basin tungod sa pagkabalda o sayop sa paghan-ay. Paggama pag-usab kon magamit na ang API. Mga kalagdaan sa sayop: {errors}; Ang kasamtangan nga URL sa API: {url}"
   },
   "layout.banner.build-fail.title": {
-    "message": "Naay sayup sa pagmugna sa kahimtang gikan sa API samtang gapatukod."
+    "message": "Naay sayup sa pagmugna sa kahimtang gikan sa API samtang naggama."
+  },
+  "layout.banner.verify-email.description": {
+    "message": "Tungod sa mga hinungdan sa kahilwasan, manginahanglan ang Modrinth nga mapamatud-an ang padad-anan sa dagiwat sa imong akawnt."
   },
   "layout.footer.about": {
     "message": "Mahitungod"
@@ -162,7 +315,7 @@
     "message": "Modrinth Servers"
   },
   "layout.footer.resources": {
-    "message": "Mga Kabtangan"
+    "message": "Mga Kahinguhaan"
   },
   "layout.footer.resources.api-docs": {
     "message": "Dokumentasyon sa API"
@@ -192,7 +345,13 @@
     "message": "X"
   },
   "layout.meta.description": {
-    "message": "Pagkarganug ug mga pagbag-o, pagsukip, putos sa datos, tigpandong, putos sa kabtangan, ug putos sa pagbag-o sa Modrinth. Pagdiskobre ug pagmantala ug mga proyekto sa Modrinth nga adunay moderno, sayon gamiton nga dunggoanan ug API."
+    "message": "Pagkarganug ug mga pagbag-o, pagsukip, putos sa lawsayod, tigpandong, putos sa kahinguhaan, ug putos sa pagbag-o sa Modrinth. Pagdiskobre ug pagmantala ug mga proyekto sa Modrinth nga adunay moderno, sayon gamiton nga dunggoanan ug API."
+  },
+  "layout.nav.home": {
+    "message": "Puloy-anan"
+  },
+  "layout.nav.search": {
+    "message": "Mangita"
   },
   "moderation.page.projects": {
     "message": "Mga Proyekto"
@@ -203,35 +362,80 @@
   "moderation.page.technicalReview": {
     "message": "Teknikal ng Pagsusi"
   },
+  "moderation.search.placeholder": {
+    "message": "Mangita..."
+  },
+  "profile.bio.fallback.creator": {
+    "message": "Usa ka magbubuhat sa Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Usa ka tiggamit sa Modrinth."
+  },
+  "profile.details.label.email": {
+    "message": "Dagiwat"
+  },
+  "profile.label.badges": {
+    "message": "Tsapa"
+  },
+  "profile.label.joined": {
+    "message": "Miapil"
+  },
+  "profile.label.no": {
+    "message": "Hindi"
+  },
+  "profile.label.yes": {
+    "message": "Oo"
+  },
   "profile.meta.description": {
     "message": "Pagkarganug og mga proyekto ni {username} sa Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - Pagkarganug og mga proyekto ni {username} sa Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, other {<stat>{count}</stat> ka karganug sa proyekto}}"
+  "project-member-header.accept": {
+    "message": "Dawati"
+  },
+  "project-member-header.error": {
+    "message": "Kasaypanan"
   },
   "project-type.datapack.plural": {
-    "message": "Mga Putos sa Datos"
+    "message": "Mga Putos sa Lawsayod"
   },
   "project-type.datapack.singular": {
-    "message": "Putos sa Datos"
+    "message": "Putos sa Lawsayod"
+  },
+  "project-type.mod.plural": {
+    "message": "Mga Kausaban"
+  },
+  "project-type.mod.singular": {
+    "message": "Kausaban"
+  },
+  "project-type.plugin.singular": {
+    "message": "Pagsukip"
   },
   "project-type.resourcepack.plural": {
-    "message": "Mga Putos sa Kabtangan"
+    "message": "Mga Putos sa Kahinguhaan"
   },
   "project-type.resourcepack.singular": {
-    "message": "Putos sa Kabtangan"
+    "message": "Putos sa Kahinguhaan"
+  },
+  "project-type.shader.singular": {
+    "message": "Tigpandong"
+  },
+  "project.about.details.updated": {
+    "message": "Nasibo {date}"
   },
   "project.download.game-version": {
     "message": "Bersiyon sa dula: {version}"
   },
+  "project.download.install-with-app": {
+    "message": "Itaud gamit ang Modrint App"
+  },
   "project.download.no-app": {
     "message": "Wala kay Modrinth App?"
   },
   "project.download.platform": {
-    "message": "Plataporma: {platform}"
+    "message": "Pantawan: {platform}"
   },
   "project.download.search-game-versions": {
     "message": "Mangita og mga bersiyon sa dula..."
@@ -239,6 +443,9 @@
   "project.download.select-game-version": {
     "message": "Pilia tanang bersiyon sa dula"
   },
+  "project.download.select-platform": {
+    "message": "Pamili og pantawan"
+  },
   "project.download.show-all-versions": {
     "message": "Ipakita ang tanang bersiyon"
   },
@@ -272,40 +479,112 @@
   "project.settings.environment.notice.review-options.description": {
     "message": "Bag-o ra namo gipalambo ang sistema sa Mga Kalikopan sa Modrinth ug ang mga bag-ong kapilian magamit na karon. Mahimo nga susiha nga husto ang  gipili sa ubos ug tuploka ang 'Pamatud-i' sa imong paghuman!"
   },
+  "project.settings.environment.verification.verify-button": {
+    "message": "Pamatud-i"
+  },
+  "project.settings.general.name.title": {
+    "message": "Ngalan"
+  },
+  "project.settings.general.url.title": {
+    "message": "URL"
+  },
   "project.settings.title": {
     "message": "Mga Gusto"
   },
   "project.stats.downloads-label": {
     "message": "karganug{count, plural, one {} other {}}"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Napakyas ang pag-andam sa karganug"
+  "scopes.performAnalytics.description": {
+    "message": "Buhata ang mga kalihokan sa matukibon"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Andami ang karganug"
+  "servers.backups.item.lock": {
+    "message": "Pagtrangka"
   },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Sulayi pag-usab ang pag-andam"
+  "servers.backups.item.locked": {
+    "message": "Nagtrangka"
   },
-  "servers.backups.item.preparing-download": {
-    "message": "Gaandam sa karganug..."
+  "servers.backups.item.rename": {
+    "message": "Ilisdi ang ngalan"
+  },
+  "servers.backups.item.retry": {
+    "message": "Sulayi pag-usab"
+  },
+  "servers.backups.item.unlock": {
+    "message": "Yabihan"
+  },
+  "servers.notice.actions": {
+    "message": "Mga Kalihokan"
+  },
+  "servers.notice.begins": {
+    "message": "Magsugod"
+  },
+  "servers.notice.id": {
+    "message": "ID"
+  },
+  "servers.notice.level": {
+    "message": "Patag"
+  },
+  "servers.plan.large.name": {
+    "message": "Dagko"
+  },
+  "servers.plan.medium.name": {
+    "message": "Tungatunga"
+  },
+  "servers.plan.small.name": {
+    "message": "Gagmay"
+  },
+  "settings.billing.payment_method_type.eftpos": {
+    "message": "EFTPOS"
+  },
+  "settings.billing.payment_method_type.jcb": {
+    "message": "JCB"
+  },
+  "settings.billing.payment_method_type.paypal": {
+    "message": "PayPal"
+  },
+  "settings.billing.payment_method_type.unknown": {
+    "message": "Diiniliang pamaagi sa pagbayad"
+  },
+  "settings.billing.payment_method_type.visa": {
+    "message": "Visa"
   },
   "settings.display.flags.description": {
-    "message": "Magpagana o di-magpagana og tino nga mga bahin sa imong himan."
+    "message": "Magpagana o di-magpagana og tino nga mga panagway sa imong himan."
   },
   "settings.display.project-list-layouts.datapack": {
-    "message": "Panid sa mga Putos sa Datos"
+    "message": "Panid sa Mga Putos sa Lawsayod"
   },
   "settings.display.project-list-layouts.description": {
-    "message": "Pamili og imong gigusto nga paghan-ay alang sa matag usa nga panid nga mopakita sa mga listahan sa proyekto sa imong himan."
+    "message": "Pamili og imong gigusto nga paghan-ay alang sa matag panid nga mopakita sa mga listahan sa proyekto sa imong himan."
   },
   "settings.display.project-list-layouts.resourcepack": {
-    "message": "Panid sa mga Putos sa Kabtangan"
+    "message": "Panid sa Mga Putos sa Kahinguhaan"
+  },
+  "settings.display.project-list-layouts.title": {
+    "message": "Mga paghan-ay sa listahan sa proyekto"
   },
   "settings.display.theme.description": {
     "message": "Pamili og imong gigusto nga hiligotanong kulay alang sa Modrinth sa kini nga himan."
   },
+  "settings.language.languages.search-field.placeholder": {
+    "message": "Mangita og pinulongan..."
+  },
+  "settings.pats.modal.create.name.label": {
+    "message": "Ngalan"
+  },
+  "settings.profile.bio.title": {
+    "message": "Kagibuhi"
+  },
+  "settings.profile.profile-picture.reset": {
+    "message": "Pag-usab"
+  },
   "settings.sessions.description": {
     "message": "Ania dini tanan ang mga himan nga karon nakalog-in sa imong akawnt sa Modrinth. Mahimo kang maglog-out sa matag usa.\n\nKung makakita ka og usa nga dili nimo mailhan, paglog-out sa maong himan ug usba dayon ang tinago nga pulong sa imong akawnt sa Modrinth."
+  },
+  "settings.sessions.unknown-os": {
+    "message": "Diinilang OS"
+  },
+  "settings.sessions.unknown-platform": {
+    "message": "Diinilang pantawan"
   }
 }
diff --git a/apps/frontend/src/locales/cs-CZ/index.json b/apps/frontend/src/locales/cs-CZ/index.json
index 0a37235e..7a2727cb 100644
--- a/apps/frontend/src/locales/cs-CZ/index.json
+++ b/apps/frontend/src/locales/cs-CZ/index.json
@@ -461,6 +461,12 @@
   "create.organization.name-label": {
     "message": "Název"
   },
+  "create.organization.url-label": {
+    "message": "URL"
+  },
+  "create.project.url-label": {
+    "message": "URL"
+  },
   "create.project.visibility-public": {
     "message": "Veřejné"
   },
@@ -782,9 +788,6 @@
   "profile.error.not-found": {
     "message": "Uživatel nenalezen"
   },
-  "profile.joined-at": {
-    "message": "Připojil/a se <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Odznaky"
   },
@@ -812,12 +815,6 @@
   "profile.meta.description-with-bio": {
     "message": "{bio} - Stáhněte si projekty od {username} na Modrinthu"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural,  other {<stat>{count}</stat> stažení}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> projekt} few {<stat>{count}</stat> projekty} other {<stat>{count}</stat> projektů}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> sledující projektu} few {<stat>{count}</stat> sledující projektu} other {<stat>{count}</stat> sledujících projektu}}"
   },
@@ -959,6 +956,9 @@
   "project.settings.general.name.title": {
     "message": "Název"
   },
+  "project.settings.general.url.title": {
+    "message": "URL"
+  },
   "project.stats.downloads-label": {
     "message": "stažení{count, plural, one {} few {} many {} other {}}"
   },
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index 7e6f8526..27f28dcc 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "Nicht gelistet"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Partnerlink erstellen"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Fehler beim laden von Partnerlinks"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Deine Partnerlinks"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Dies wird permanent den Partbercode `{id}` widerrufen und alle existierenden Links, welche es nutzen, werden nicht mehr gültig sein."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Widerrufen"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "Bist du sicher dass du deinen \"{title}\" Partnerlink widerrufen willst?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Partnerlinks durchsuchen..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "Erstellen"
   },
@@ -578,6 +599,18 @@
   "dashboard.collections.long-title": {
     "message": "Deine Kollektionen"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "{formType} herunterladen"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "Dein {formType} Steuerformular wurde erfolgreich eingereicht!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Du kannst nun frei abheben. Falls du fragen hast oder deine Daten aktualisieren musst <support-link>kontaktiere den Support</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Alles ist bereit! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Eine ausländische Einheit bezeichnet eine ausserhalb der Vereinigten Staaten gegründete Geschäftseinheit (z.B. eine nicht US-amerikanische Kapitalgesellschaft, Personengesellschaft oder LLC)."
   },
@@ -857,6 +890,9 @@
   "layout.action.lookup-by-email": {
     "message": "Über E-Mail ansehen"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Partnerlinks verwalten"
+  },
   "layout.action.manage-server-notices": {
     "message": "Servermitteilungen verwalten"
   },
@@ -912,11 +948,20 @@
     "message": "Steuerformular abschliessen"
   },
   "layout.banner.tax.description": {
-    "message": "Du hast dieses Jahr bereits mehr als $600 von Modrinth abgehoben. Um die Steuervorschriften einzuhalten, musst du ein Steuerformular ausfüllen. Deine Abhebungen werden ausgesetzt, bis dieses Formular eingereicht wurde."
+    "message": "Du hast bereits mehr als $600 von Modrinth für dieses Jahr abgehoben. Um geltende Steuervorschriften einzuhalten, musst du ein Steuerformular ausfüllen. Deine Abhebungen werden ausgesetzt, bis dieses Formular eingereicht wurde."
   },
   "layout.banner.tax.title": {
     "message": "Steuerformular benötigt"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Support kontaktieren"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "Deine Abbuchungen sind vorrübergehend blockiert, da deine TIN oder SSN nicht mit IRS-Aufzeichnungen übereinstimmt. Bitte kontakitiere den Support umd dein Steuerformular zurückzusetzen und erneut zu übermitteln."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Steuerformular fehlgeschlagen"
+  },
   "layout.banner.verify-email.action": {
     "message": "Verifizierungs-E-Mail erneut senden"
   },
@@ -1091,27 +1136,75 @@
   "moderation.technical.search.placeholder": {
     "message": "Technische Rezensionen durchsuchen..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "Ein Modrinth Ersteller."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Ein Modrinth Benutzer."
+  },
   "profile.button.billing": {
     "message": "Nutzer Zahlungen verwalten"
   },
+  "profile.button.edit-role": {
+    "message": "Rolle bearbeiten"
+  },
   "profile.button.info": {
     "message": "Nutzerdetails ansehen"
   },
   "profile.button.manage-projects": {
     "message": "Projekte verwalten"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Als Partner entfernen"
+  },
+  "profile.button.set-affiliate": {
+    "message": "Als Partner setzen"
+  },
+  "profile.details.label.auth-providers": {
+    "message": "Authentifizierungsanbieter"
+  },
+  "profile.details.label.email": {
+    "message": "E-Mail"
+  },
+  "profile.details.label.has-password": {
+    "message": "Hat Passwort"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Hat TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Zahlungsmethoden"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "E-Mail nicht verifiziert"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "E-Mail verifiziert"
+  },
   "profile.error.not-found": {
     "message": "Benutzer nicht gefunden"
   },
-  "profile.joined-at": {
-    "message": "<date>{ago}</date> beigetreten"
+  "profile.label.affiliate": {
+    "message": "Partner"
   },
   "profile.label.badges": {
     "message": "Abzeichen"
   },
+  "profile.label.collection": {
+    "message": "Kollektion"
+  },
   "profile.label.details": {
     "message": "Details"
   },
+  "profile.label.downloads": {
+    "message": "{count} Download{count, plural, one {} other {s}}"
+  },
+  "profile.label.joined": {
+    "message": "Beigetreten"
+  },
+  "profile.label.no": {
+    "message": "Nein"
+  },
   "profile.label.no-collections": {
     "message": "Dieser Nutzer hat keine Kollektionen!"
   },
@@ -1127,18 +1220,21 @@
   "profile.label.organizations": {
     "message": "Organisationen"
   },
+  "profile.label.projects": {
+    "message": "{count} Projekt{count, plural, one {} other {e}}"
+  },
+  "profile.label.saving": {
+    "message": "Speichert..."
+  },
+  "profile.label.yes": {
+    "message": "Ja"
+  },
   "profile.meta.description": {
     "message": "Lade {username}'s Projekte auf Modrinth herunter"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - Lade {username}'s Projekte auf Modrinth herunter"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> Projekt download} other {<stat>{count}</stat> Projekt downloads}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> Projek} other {<stat>{count}</stat> Projekte}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat>} other {<stat>{count}</stat>}} Projekt-Follower"
   },
@@ -1865,21 +1961,21 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Backup-Wiederherstellung im gange"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Bereite bereits Backup zum download vor"
-  },
   "servers.backups.item.automated": {
     "message": "Automatisiert"
   },
   "servers.backups.item.creating-backup": {
     "message": "Erstelle Backup..."
   },
+  "servers.backups.item.downloading": {
+    "message": "Wird Heruntergeladen"
+  },
+  "servers.backups.item.downloading-backup": {
+    "message": "Lade Backup herunter..."
+  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Erstellung eines Backup fehlgeschlagen"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Vorbereitung von download fehlgeschlagen"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Wiederherstellung von Backup fehlgeschlagen"
   },
@@ -1889,15 +1985,6 @@
   "servers.backups.item.locked": {
     "message": "Gesperrt"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Download vorbereiten"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Versuche vorbereitung erneut"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Download vorbereiten..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "Zur sicherung in warteschlange gestellt"
   },
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index e2368a2b..d06f94cf 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -51,7 +51,7 @@
     "message": "Speichere deine Lieblingsinhalte und erhalte Updates mit nur einem Klick."
   },
   "app-marketing.features.follow.title": {
-    "message": "Projekt folgen"
+    "message": "Projekten folgen"
   },
   "app-marketing.features.importing.description": {
     "message": "Importiere alle deine Lieblingsprofile aus dem Launcher, den du bisher verwendet hast, und starte in Sekundenschnelle mit der Modrinth App!"
@@ -63,10 +63,10 @@
     "message": "MultiMC"
   },
   "app-marketing.features.importing.title": {
-    "message": "Profil Importierung"
+    "message": "Profile importieren"
   },
   "app-marketing.features.mod-management.actions": {
-    "message": "Maßnahmen"
+    "message": "Aktionen"
   },
   "app-marketing.features.mod-management.byAuthor": {
     "message": "von {author}"
@@ -84,25 +84,25 @@
     "message": "Mods suchen"
   },
   "app-marketing.features.mod-management.title": {
-    "message": "Mod Verwaltung"
+    "message": "Mod-Verwaltung"
   },
   "app-marketing.features.mod-management.version": {
     "message": "Version"
   },
   "app-marketing.features.offline.description": {
-    "message": "Spiele deine Mods, ganz egal, ob du mit dem Internet verbunden bist oder nicht."
+    "message": "Spiele mit deinen Mods, egal, ob du mit dem Internet verbunden bist oder nicht."
   },
   "app-marketing.features.offline.title": {
-    "message": "Offline Modus"
+    "message": "Offline-Modus"
   },
   "app-marketing.features.open-source.description": {
     "message": "Der Modrinth-Launcher ist vollständig quelloffen. Den Quellcode kannst du auf unserem <github-link>GitHub</github-link> einsehen!"
   },
   "app-marketing.features.open-source.title": {
-    "message": "Quelloffen"
+    "message": "Open Source"
   },
   "app-marketing.features.performance.activity-monitor": {
-    "message": "Aktivitätenmonitor"
+    "message": "Aktivitätsmonitoring"
   },
   "app-marketing.features.performance.cpu-percent": {
     "message": "% CPU"
@@ -578,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "Deine Kollektionen"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Lade {formType} herunter"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "Dein {formType} Steuerformular wurde erfolgreich eingereicht!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Sie können sich jetzt jederzeit abmelden. Wenn Sie Fragen haben oder Ihre Daten aktualisieren möchten, wenden Sie sich an den <support-link>Support</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Sie sind startklar! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Ein ausländisches Unternehmen bezeichnet eine Geschäftseinheit, die außerhalb der Vereinigten Staaten gegründet wurde (z. B. eine nicht-US-amerikanische Kapitalgesellschaft, Personengesellschaft oder LLC)."
   },
@@ -917,6 +929,9 @@
   "layout.banner.tax.title": {
     "message": "Steuerformular erforderlich"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Support Kontaktieren"
+  },
   "layout.banner.verify-email.action": {
     "message": "Bestätigungs-E-Mail erneut senden"
   },
@@ -1091,27 +1106,45 @@
   "moderation.technical.search.placeholder": {
     "message": "Durchsuche Technische Rezensionen..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "Ein Modrinth Ersteller."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Ein Modrinth Nutzer."
+  },
   "profile.button.billing": {
     "message": "Verwalte Nutzer Zahlungen"
   },
+  "profile.button.edit-role": {
+    "message": "Rolle ändern"
+  },
   "profile.button.info": {
     "message": "Schaue Nutzerdetails an"
   },
   "profile.button.manage-projects": {
     "message": "Projekte verwalten"
   },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "E-Mail nicht verifiziert"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "E-Mail verifiziert"
+  },
   "profile.error.not-found": {
     "message": "Benutzer nicht gefunden"
   },
-  "profile.joined-at": {
-    "message": "Am </date>{ago}</date> beigetreten"
-  },
   "profile.label.badges": {
     "message": "Abzeichen"
   },
   "profile.label.details": {
     "message": "Details"
   },
+  "profile.label.joined": {
+    "message": "Beigetreten"
+  },
+  "profile.label.no": {
+    "message": "Nein"
+  },
   "profile.label.no-collections": {
     "message": "Dieser Nutzer hat keine Kollektionen!"
   },
@@ -1127,18 +1160,18 @@
   "profile.label.organizations": {
     "message": "Organisationen"
   },
+  "profile.label.saving": {
+    "message": "Speichern..."
+  },
+  "profile.label.yes": {
+    "message": "Ja"
+  },
   "profile.meta.description": {
     "message": "Lade {username}'s Projekte auf Modrinth herunter"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - Lade {username}'s Projekte auf Modrinth herunter"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> Projektdownload} other {<stat>{count}</stat> Projektdownloads}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> Projekt} other {<stat>{count}</stat> Projekte}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {{count}} other {{count}}} Projekt Follower"
   },
@@ -1865,9 +1898,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Sicherung wird wiederhergestellt"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Backup wird bereits für den Download vorbereitet"
-  },
   "servers.backups.item.automated": {
     "message": "Automatisiert"
   },
@@ -1877,9 +1907,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Erstellung der Sicherung ist fehlgeschlagen"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Vorbereitung des Downloads ist fehlgeschlagen"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Wiederherstellung aus der Sicherung fehlgeschlagen"
   },
@@ -1889,15 +1916,6 @@
   "servers.backups.item.locked": {
     "message": "Gesperrt"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Download wird vorbereitet"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Versuche es noch einmal"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Download vorbereiten..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "Zur Sicherung vorgemerkt"
   },
diff --git a/apps/frontend/src/locales/de-DE/meta.json b/apps/frontend/src/locales/de-DE/meta.json
index ffe7db9e..1cbd86de 100644
--- a/apps/frontend/src/locales/de-DE/meta.json
+++ b/apps/frontend/src/locales/de-DE/meta.json
@@ -5,6 +5,6 @@
 	},
 	"searchTerms": {
 		"description": "Please provide additional search terms associated with the language, if needed, to enhance the search functionality (e.g., American English, Deutschland). Each search term should be entered on a separate line. Translate as a hyphen (-) if no additional terms are needed.",
-		"message": "Deutschland\nDE\nDEU\nGermany\nGerman\nGER"
+		"message": "Deutschland\nDeutsch\nHochdeutsch\nDE\nDEU\nGermany\nGerman\nGER"
 	}
 }
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index 328c6726..6db5cfb2 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -578,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "Tus colecciones"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Descarga {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "¡Tu {formType} formulario de impuestos se ha subido exitosamente!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Puedes retirarte por ahora. Si tiene preguntas o necesita actualizar tus datos <support-link>contacte con soporte</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "¡Está todo listo! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Una entidad extranjera es una entidad comercial constituida fuera de Estados Unidos (como una corporación, sociedad o LLC no estadounidense)."
   },
@@ -912,11 +924,20 @@
     "message": "Completar formulario fiscal"
   },
   "layout.banner.tax.description": {
-    "message": "Ya retiraste más de \\$600 de Modrinth este año. Para cumplir con las regulaciones fiscales, necesitas completar un formulario fiscal. Tus retiros estarán en pausa hasta que envíes este formulario."
+    "message": "Ya ha retirado más de 600 dólares de Modrinth este año. Para cumplir con la normativa fiscal, debes rellenar un formulario de impuestos. Tus retiradas quedarán en suspenso hasta que envíes el formulario."
   },
   "layout.banner.tax.title": {
     "message": "Formulario fiscal requerido"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Contacta con soporte"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "Tus retiradas están bloqueadas temporalmente porque tu TIN o SSN no coinciden con los registros del IRS. Ponte en contacto con el servicio de asistencia para restablecer y volver a enviar tu formulario fiscal."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Error en el formulario fiscal"
+  },
   "layout.banner.verify-email.action": {
     "message": "Reenviar correo de verificación"
   },
@@ -1091,27 +1112,66 @@
   "moderation.technical.search.placeholder": {
     "message": "Buscar revisiones técnicas..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "Creador en Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Usuario de Modrinth."
+  },
   "profile.button.billing": {
     "message": "Gestionar la facturación de usuario"
   },
+  "profile.button.edit-role": {
+    "message": "Editar rol"
+  },
   "profile.button.info": {
     "message": "Ver detalles de usuario"
   },
   "profile.button.manage-projects": {
     "message": "Gestionar proyectos"
   },
+  "profile.details.label.auth-providers": {
+    "message": "Autentificar proveedores"
+  },
+  "profile.details.label.email": {
+    "message": "Correo electrónico"
+  },
+  "profile.details.label.has-password": {
+    "message": "Tiene contraseña"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Tiene autentificación de doble factor"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Métodos de pago"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "Correo electrónico no verificado"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "Correo electrónico verificado"
+  },
   "profile.error.not-found": {
     "message": "Usuario no encontrado"
   },
-  "profile.joined-at": {
-    "message": "Se unió el <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Insignias"
   },
+  "profile.label.collection": {
+    "message": "Colección"
+  },
   "profile.label.details": {
     "message": "Detalles"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, one {descarga} other {descargas}}"
+  },
+  "profile.label.joined": {
+    "message": "Se unió hace"
+  },
+  "profile.label.no": {
+    "message": "No"
+  },
   "profile.label.no-collections": {
     "message": "¡Este usuario no tiene colecciones!"
   },
@@ -1127,18 +1187,21 @@
   "profile.label.organizations": {
     "message": "Organizaciones"
   },
+  "profile.label.projects": {
+    "message": "{count} {count, plural, one {proyecto} other {proyectos}}"
+  },
+  "profile.label.saving": {
+    "message": "Guardando..."
+  },
+  "profile.label.yes": {
+    "message": "Sí"
+  },
   "profile.meta.description": {
     "message": "Descarga proyectos de {username} en Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - Descarga proyectos de {username} en Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> descarga del proyecto} other {<stat>{count}</stat> descargas del proyecto}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> proyecto} other {<stat>{count}</stat> proyectos}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> seguidor del proyecto} other {<stat>{count}</stat> seguidores del proyecto}}"
   },
@@ -1865,9 +1928,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Restauración del respaldo en curso"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Ya se está preparando el respaldo para su descarga"
-  },
   "servers.backups.item.automated": {
     "message": "Automatizado"
   },
@@ -1877,9 +1937,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "No se pudo crear el respaldo"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Error al preparar la descarga"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Error al restaurar desde el respaldo"
   },
@@ -1889,15 +1946,6 @@
   "servers.backups.item.locked": {
     "message": "Bloqueado"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Preparar descarga"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Intenta prepararlo de nuevo"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Preparando descarga..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "En cola para respaldo"
   },
diff --git a/apps/frontend/src/locales/es-ES/index.json b/apps/frontend/src/locales/es-ES/index.json
index 09c0c095..57f4f949 100644
--- a/apps/frontend/src/locales/es-ES/index.json
+++ b/apps/frontend/src/locales/es-ES/index.json
@@ -428,6 +428,9 @@
   "create.collection.cancel": {
     "message": "Cancelar"
   },
+  "create.collection.collection-info": {
+    "message": "Tu nueva colección se creará como colección pública {count, plural, =0 {sin ningún proyecto} one {# proyecto} other {# proyectos}}."
+  },
   "create.collection.create-collection": {
     "message": "Crear colección"
   },
@@ -464,6 +467,9 @@
   "create.limit-alert.limit-reached": {
     "message": "{type} límite alcanzado"
   },
+  "create.limit-alert.limit-reached-description": {
+    "message": "Has alcanzado tu {type} límite de {max}. Contacta con soporte para incrementar tu límite."
+  },
   "create.limit-alert.type-collection": {
     "message": "colección"
   },
@@ -572,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "Tus colecciones"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Descarga {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "¡Tu {formType} formulario de impuestos se ha subido exitosamente!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Puedes retirarte por ahora. Si tiene preguntas o necesita actualizar tus datos <support-link>contacte con soporte</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "¡Está todo listo! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Una entidad extranjera es una entidad comercial constituida fuera de los Estados Unidos (como una sociedad anónima, una sociedad colectiva o una sociedad de responsabilidad limitada no estadounidense)."
   },
@@ -587,6 +605,9 @@
   "dashboard.creator-tax-form-modal.header": {
     "message": "Formulario fiscal"
   },
+  "dashboard.creator-tax-form-modal.security.description": {
+    "message": "Modrinth utiliza el proveedor externo Track1099 para recopilar y almacenar de forma segura tus formularios de impuestos. <security-link>Aprende más aquí.</security-link>"
+  },
   "dashboard.creator-tax-form-modal.security.header": {
     "message": "Prácticas de seguridad"
   },
@@ -875,6 +896,9 @@
   "layout.banner.add-email.description": {
     "message": "Por motivos de seguridad, Modrinth necesita que registres una dirección de correo electrónico en tu cuenta."
   },
+  "layout.banner.build-fail.description": {
+    "message": "Esta implementación del frontend de Modrinth no ha podido generar el estado desde la API. Esto puede deberse a una interrupción del servicio o a un error en la configuración. Vuelve a compilar cuando la API esté disponible. Códigos de error: {errors}; La URL actual de la API es: {url}"
+  },
   "layout.banner.build-fail.title": {
     "message": "Error al generar el estado desde la API durante la compilación."
   },
@@ -897,11 +921,20 @@
     "message": "Rellene el formulario fiscal"
   },
   "layout.banner.tax.description": {
-    "message": "Ya ha retirado más de 600 dólares de Modrinth este año. Para cumplir con la normativa fiscal, debe rellenar un formulario de impuestos. Sus retiradas quedarán en suspenso hasta que envíe este formulario."
+    "message": "Ya ha retirado más de 600 dólares de Modrinth este año. Para cumplir con la normativa fiscal, debes rellenar un formulario de impuestos. Tus retiradas quedarán en suspenso hasta que envíes el formulario."
   },
   "layout.banner.tax.title": {
     "message": "Se requiere formulario fiscal"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Contacta con soporte"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "Tus retiradas están bloqueadas temporalmente porque tu TIN o SSN no coinciden con los registros del IRS. Ponte en contacto con el servicio de asistencia para restablecer y volver a enviar tu formulario fiscal."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Error en el formulario fiscal"
+  },
   "layout.banner.verify-email.action": {
     "message": "Reenviar verificación de correo electrónico"
   },
@@ -1076,27 +1109,66 @@
   "moderation.technical.search.placeholder": {
     "message": "Buscar reseñas tecnológicas..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "Creador en Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Usuario de Modrinth."
+  },
   "profile.button.billing": {
     "message": "Gestionar la facturación de los usuarios"
   },
+  "profile.button.edit-role": {
+    "message": "Editar rol"
+  },
   "profile.button.info": {
     "message": "Ver detalles del usuario"
   },
   "profile.button.manage-projects": {
     "message": "Gestionar proyectos"
   },
+  "profile.details.label.auth-providers": {
+    "message": "Autentificar proveedores"
+  },
+  "profile.details.label.email": {
+    "message": "Correo electrónico"
+  },
+  "profile.details.label.has-password": {
+    "message": "Tiene contraseña"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Tiene autentificación de doble factor"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Métodos de pago"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "Correo electrónico no verificado"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "Correo electrónico verificado"
+  },
   "profile.error.not-found": {
     "message": "Usuario no encontrado"
   },
-  "profile.joined-at": {
-    "message": "Se unió <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Medallas"
   },
+  "profile.label.collection": {
+    "message": "Colección"
+  },
   "profile.label.details": {
     "message": "Detalles"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, one {descarga} other {descargas}}"
+  },
+  "profile.label.joined": {
+    "message": "Se unió hace"
+  },
+  "profile.label.no": {
+    "message": "No"
+  },
   "profile.label.no-collections": {
     "message": "¡Este usuario no tiene colecciones!"
   },
@@ -1112,9 +1184,24 @@
   "profile.label.organizations": {
     "message": "Organizaciones"
   },
+  "profile.label.projects": {
+    "message": "{count} {count, plural, one {proyecto} other {proyectos}}"
+  },
+  "profile.label.saving": {
+    "message": "Guardando..."
+  },
+  "profile.label.yes": {
+    "message": "Sí"
+  },
   "profile.meta.description": {
     "message": "Descargar los proyectos de {username} en Modrinth"
   },
+  "profile.meta.description-with-bio": {
+    "message": "{bio} - Descarga los proyectos en Modrinth de {username}"
+  },
+  "profile.stats.projects-followers": {
+    "message": "{count, plural, one {<stat>{count}</stat> seguidor} other {<stat>{count}</stat> seguidores}}"
+  },
   "profile.user-id": {
     "message": "ID de usuario: {id}"
   },
@@ -1292,6 +1379,9 @@
   "project.download.game-version-tooltip": {
     "message": "{title} solo está disponible para {version}"
   },
+  "project.download.game-version-unsupported-tooltip": {
+    "message": "{title} no está soportado para la versión {gameVersion} de {platform}"
+  },
   "project.download.install-with-app": {
     "message": "Instalar con la aplicación Modrinth"
   },
@@ -1310,6 +1400,9 @@
   "project.download.platform-tooltip": {
     "message": "{title} olo está disponible para {platform}"
   },
+  "project.download.platform-unsupported-tooltip": {
+    "message": "{title} no está soportado para {platform} en la {gameVersion}"
+  },
   "project.download.search-game-versions": {
     "message": "Buscar versiones del juego..."
   },
@@ -1331,9 +1424,15 @@
   "project.environment.migration-no-permission.message": {
     "message": "Acabamos de renovar el sistema de entornos en Modrinth y ahora hay nuevas opciones disponibles. No tienes permiso para modificar estos ajustes, pero avisa a otro miembro del proyecto de que hay que verificar los metadatos del entorno."
   },
+  "project.environment.migration-no-permission.title": {
+    "message": "Los metadatos del entorno necesitan ser revisados"
+  },
   "project.environment.migration.learn-more": {
     "message": "Más información sobre este cambio"
   },
+  "project.environment.migration.message": {
+    "message": "Acabamos de renovar el sistema de entornos en Modrinth y ahora hay nuevas opciones disponibles. Visita la configuración de tu proyecto y comprueba que los metadatos sean correctos."
+  },
   "project.environment.migration.review-button": {
     "message": "Revisar la configuración del entorno"
   },
@@ -1580,6 +1679,9 @@
   "scopes.organizationWrite.label": {
     "message": "Escribir organizaciones"
   },
+  "scopes.patCreate.description": {
+    "message": "Crear tokens de API personales"
+  },
   "scopes.patCreate.label": {
     "message": "Crear PATs"
   },
@@ -1589,12 +1691,18 @@
   "scopes.patDelete.label": {
     "message": "Eliminar PATs"
   },
+  "scopes.patRead.description": {
+    "message": "Ver tokens de API creados"
+  },
   "scopes.patRead.label": {
     "message": "Leer PATs"
   },
   "scopes.patWrite.description": {
     "message": "Editar tokens de API personales"
   },
+  "scopes.patWrite.label": {
+    "message": "Escribir PATs"
+  },
   "scopes.payoutsRead.description": {
     "message": "Lea sus datos de pagos"
   },
@@ -1763,9 +1871,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Restauración de copia de seguridad en curso"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Ya se está preparando la copia de seguridad para su descarga"
-  },
   "servers.backups.item.automated": {
     "message": "Automatizado"
   },
@@ -1775,9 +1880,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Error al crear la copia de seguridad"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Error al preparar la descarga"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Error al restaurar desde la copia de seguridad"
   },
@@ -1787,15 +1889,6 @@
   "servers.backups.item.locked": {
     "message": "Bloqueado"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Preparando descarga"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Intenta prepararlo de nuevo"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Preparando descarga..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "En cola para la copia de seguridad"
   },
@@ -1904,12 +1997,54 @@
   "settings.billing.payment_method_type.amazon_pay": {
     "message": "Amazon Pay"
   },
+  "settings.billing.payment_method_type.amex": {
+    "message": "American Express"
+  },
+  "settings.billing.payment_method_type.cashapp": {
+    "message": "Cash App"
+  },
+  "settings.billing.payment_method_type.diners": {
+    "message": "Diners Club"
+  },
   "settings.billing.payment_method_type.discover": {
     "message": "Descubrir"
   },
+  "settings.billing.payment_method_type.eftpos": {
+    "message": "EFTPOS"
+  },
+  "settings.billing.payment_method_type.jcb": {
+    "message": "JCB"
+  },
   "settings.billing.payment_method_type.mastercard": {
     "message": "MasterCard"
   },
+  "settings.billing.payment_method_type.paypal": {
+    "message": "PayPal"
+  },
+  "settings.billing.payment_method_type.unionpay": {
+    "message": "UnionPay"
+  },
+  "settings.billing.payment_method_type.unknown": {
+    "message": "Método de pago desconocido"
+  },
+  "settings.billing.payment_method_type.visa": {
+    "message": "Visa"
+  },
+  "settings.billing.pyro_subscription.description": {
+    "message": "Gestiona tus suscripciones a servidores de Modrinth."
+  },
+  "settings.billing.pyro_subscription.title": {
+    "message": "Suscripciones a servidores de Modrinth"
+  },
+  "settings.billing.subscription.description": {
+    "message": "Gestiona tus suscripciones de Modrinth."
+  },
+  "settings.billing.subscription.title": {
+    "message": "Suscripciones"
+  },
+  "settings.display.banner.developer-mode.button": {
+    "message": "Desactivar modo desarrollador"
+  },
   "settings.display.flags.description": {
     "message": "Activar o desactivar determinadas funciones de este dispositivo."
   },
@@ -2012,6 +2147,9 @@
   "settings.language.languages.search-field.placeholder": {
     "message": "Buscar un idioma..."
   },
+  "settings.language.languages.search-results-announcement": {
+    "message": "{matches, plural, =0 {Sin coincidencias} one {# coincidencias} other {# coincidencias}} en tu búsqueda."
+  },
   "settings.language.languages.search.no-results": {
     "message": "No hay idiomas que coincidan con tu búsqueda."
   },
diff --git a/apps/frontend/src/locales/fil-PH/index.json b/apps/frontend/src/locales/fil-PH/index.json
index 5808a199..8bed3e89 100644
--- a/apps/frontend/src/locales/fil-PH/index.json
+++ b/apps/frontend/src/locales/fil-PH/index.json
@@ -1,4 +1,7 @@
 {
+  "action.cancel": {
+    "message": "Kanselahin"
+  },
   "app-marketing.download.description": {
     "message": "Magagamit ang aming desktop app sa iba’t-ibang plataporma, piliin ang iyong gugustohing bersiyon."
   },
@@ -35,15 +38,54 @@
   "app-marketing.download.windows": {
     "message": "Windows"
   },
+  "app-marketing.features.importing.multimc-alt": {
+    "message": "MultiMC"
+  },
+  "app-marketing.features.mod-management.actions": {
+    "message": "Mga Aksiyon"
+  },
+  "app-marketing.features.mod-management.description": {
+    "message": "Pinapadali ng Modrinth na ma-manage ang lahat ng iyong mod sa iisang lugar. Makaka-install, uninstall, at update ng mga mod sa iisang pindot lang."
+  },
+  "app-marketing.features.mod-management.installed-mods": {
+    "message": "Mga na-install na mod"
+  },
+  "app-marketing.features.mod-management.name": {
+    "message": "Pangalan"
+  },
+  "app-marketing.features.mod-management.search-mods": {
+    "message": "Maghanap ng mga mod"
+  },
   "app-marketing.features.open-source.title": {
     "message": "Open source"
   },
+  "app-marketing.features.performance.cpu-percent": {
+    "message": "% CPU"
+  },
+  "app-marketing.features.performance.infinite-mb": {
+    "message": "∞ MB"
+  },
+  "app-marketing.features.performance.less-than-150mb": {
+    "message": "< 150 MB"
+  },
   "app-marketing.features.performance.modrinth-app": {
     "message": "Modrinth App"
   },
+  "app-marketing.features.performance.one-billion-percent": {
+    "message": "1 bilyong %"
+  },
+  "app-marketing.features.performance.ram": {
+    "message": "RAM"
+  },
+  "app-marketing.features.performance.small": {
+    "message": "Maliit"
+  },
   "app-marketing.features.play.description": {
     "message": "Gamitin ang Modrinth App sa pagdownload at paglaro ng iyong mga paboritong mods at modpacks."
   },
+  "app-marketing.features.sharing.share-button": {
+    "message": "Ibahagi"
+  },
   "app-marketing.hero.download-button": {
     "message": "I-download ang Modrinth App"
   },
@@ -56,9 +98,21 @@
   "app-marketing.hero.more-download-options": {
     "message": "Higit na Pagpipilian sa Pagdownload"
   },
+  "auth.reset-password.method-choice.email-username.placeholder": {
+    "message": "Email"
+  },
+  "auth.sign-in.additional-options": {
+    "message": "<forgot-password-link>Nalimutan ang password?</forgot-password-link> • <create-account-link>Gumawa ng akawnt</create-account-link>"
+  },
+  "auth.sign-up.email.label": {
+    "message": "Email"
+  },
   "auth.verify-email.action.account-settings": {
     "message": "Mga setting sa account"
   },
+  "auth.verify-email.post-verification.description": {
+    "message": "Tagumpay na napatunayan ang adres ng iyong email!"
+  },
   "auth.welcome.description": {
     "message": "Ikaw ay parte na ngayon ng kahanga-hangang komunidad na ito ng mga tagagawa at manlalalakbay na nagtataguyod, nagda-download, at nananatiling napapanahon sa mga nakamamanghang na mga mod."
   },
@@ -71,6 +125,51 @@
   "collection.delete-modal.description": {
     "message": "Habambuhay na matatanggal ang koleksiyong ito. Hindi mababawi ang pagkilos na ito."
   },
+  "collection.error.not-found": {
+    "message": "Hindi mahanap ang koleksiyon"
+  },
+  "collection.label.owner": {
+    "message": "May-ari"
+  },
+  "common.no": {
+    "message": "Hindi"
+  },
+  "common.yes": {
+    "message": "Oo"
+  },
+  "create.collection.cancel": {
+    "message": "Kanselahin"
+  },
+  "create.collection.name-label": {
+    "message": "Pangalan"
+  },
+  "create.organization.cancel": {
+    "message": "Kanselahin"
+  },
+  "create.organization.name-label": {
+    "message": "Pangalan"
+  },
+  "create.organization.url-label": {
+    "message": "URL"
+  },
+  "create.project.cancel": {
+    "message": "Kanselahin"
+  },
+  "create.project.name-label": {
+    "message": "Pangalan"
+  },
+  "create.project.url-label": {
+    "message": "URL"
+  },
+  "create.project.visibility-public": {
+    "message": "Publiko"
+  },
+  "create.project.visibility-unlisted": {
+    "message": "Unlisted"
+  },
+  "dashboard.collections.label.search-input": {
+    "message": "Maghanap sa iyong mga koleksiyon"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Ang banyagang entidad ay isang kalakalang entidad na nakaayos sa labas ng Estados Unidos (tulod ng di-US na korporasyon, partnership, o LLC)."
   },
@@ -80,15 +179,60 @@
   "dashboard.creator-tax-form-modal.entity.question": {
     "message": "Isa ka bang pribadong indibidwal o parte ng isang banyagang entidad?"
   },
+  "error.collection.404.list_title": {
+    "message": "Bakit?"
+  },
+  "error.generic.default.title": {
+    "message": "Hala!"
+  },
+  "error.organization.404.list_title": {
+    "message": "Bakit?"
+  },
+  "error.project.404.list_title": {
+    "message": "Bakit?"
+  },
+  "error.user.404.list_title": {
+    "message": "Bakit?"
+  },
+  "frog.altText": {
+    "message": "Isang photorealistic na pagpipinta ng frog labyrinth"
+  },
+  "frog.title": {
+    "message": "Palaka"
+  },
+  "landing.button.discover-mods": {
+    "message": "Magtuklas ng mga mod"
+  },
+  "landing.button.go-to-dashboard": {
+    "message": "Pumunta sa dashboard"
+  },
   "landing.creator.feature.data-statistics.description": {
     "message": "Makatanggap ng detalyadong reporta ng mga pagtingin ng pahina, bilang ng pagdownload, at revenue"
   },
   "landing.feature.launcher.description": {
     "message": "Binibigyang-daan ng open-source API ng Modrinth ang mga launcher na makadagdag ng malalimang pagsasama sa Modrinth. Maaari mong gamitin ang Modrinth sa <link>aming app</link> at sa iilang pinakasikat na mga launcher gaya ng ATLauncher, MultiMC, at Prism Launcher."
   },
+  "landing.heading.the-place-for-minecraft": {
+    "message": "Ang lugar para sa Minecraft na {content}"
+  },
+  "landing.heading.the-place-for-minecraft.mods": {
+    "message": "mga mod"
+  },
   "landing.heading.the-place-for-minecraft.resource-packs": {
     "message": "mga resource pack"
   },
+  "landing.notifications.has-been-updated": {
+    "message": "Na-update ang {title}!"
+  },
+  "landing.search.label": {
+    "message": "Maghanap"
+  },
+  "landing.search.placeholder": {
+    "message": "Maghanap..."
+  },
+  "landing.section.for-players.label": {
+    "message": "Para sa mga Manlalaro"
+  },
   "landing.subheading": {
     "message": "Magtuklas, maglaro, at magbahagi ng mga Minecraft content sa aming open-source na platapormang ginawa para sa komunidad."
   },
@@ -98,8 +242,14 @@
   "layout.action.reports": {
     "message": "Mga reporta"
   },
+  "layout.banner.account-action": {
+    "message": "Nangangailangan ng akawnt"
+  },
   "layout.banner.add-email.button": {
-    "message": "Mga setting sa account"
+    "message": "Bisitahin ang mga setting sa account"
+  },
+  "layout.banner.add-email.description": {
+    "message": "Dahil sa mga kadahilang pangseguridad, kailangan ng Modrinth na makapag-register ka ng email address sa iyong akawnt."
   },
   "layout.banner.build-fail.description": {
     "message": "Itong pinakalat na frontend ng Modrinth ay bigong makabuo ng estato galing sa API. Maaaring dahil ito sa isang outage o error sa konpigurasyon. Muling itayo kapag magagamit na ang API. Error codes: {errors}; Kasalukuyang URL ng API ay: {url}"
@@ -107,6 +257,9 @@
   "layout.banner.build-fail.title": {
     "message": "May error sa pagbuo ng estado galing sa API habang nagpapatayo."
   },
+  "layout.banner.verify-email.description": {
+    "message": "Dahil sa mga kadahilang pangseguridad, kailangan ng Modrinth na mapatunayan ang email address sa iyong akawnt."
+  },
   "layout.footer.about": {
     "message": "Tungkol"
   },
@@ -194,6 +347,12 @@
   "layout.meta.description": {
     "message": "Mag-download ng mga Minecraft mod, plugin, datapack, shader, resourcepack, at modpack sa Modrinth. Tumuklas at mag-publish ng mga proyekto sa Modrinth na may modernong, madaling gamitin na interface at API."
   },
+  "layout.nav.home": {
+    "message": "Home"
+  },
+  "layout.nav.search": {
+    "message": "Maghanap"
+  },
   "moderation.page.projects": {
     "message": "Mga Proyekto"
   },
@@ -203,14 +362,41 @@
   "moderation.page.technicalReview": {
     "message": "Teknikal na Pagsusuri"
   },
+  "moderation.search.placeholder": {
+    "message": "Maghanap..."
+  },
+  "profile.bio.fallback.creator": {
+    "message": "Isang tagagawa sa Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Isang Modrinth user."
+  },
+  "profile.details.label.email": {
+    "message": "Email"
+  },
+  "profile.label.badges": {
+    "message": "Tsapa"
+  },
+  "profile.label.joined": {
+    "message": "Sumali"
+  },
+  "profile.label.no": {
+    "message": "Hindi"
+  },
+  "profile.label.yes": {
+    "message": "Oo"
+  },
   "profile.meta.description": {
     "message": "Magdownload ng mga proyekto ni {username} sa Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - Magdownload ng mga proyekto ni {username} sa Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> download ng proyekto} other {<stat>{count}</stat> na download ng proyekto}}"
+  "project-member-header.accept": {
+    "message": "Tanggapin"
+  },
+  "project-member-header.error": {
+    "message": "Error"
   },
   "project-type.datapack.plural": {
     "message": "Mga Data Pack"
@@ -218,15 +404,33 @@
   "project-type.datapack.singular": {
     "message": "Data Pack"
   },
+  "project-type.mod.plural": {
+    "message": "Mga Mod"
+  },
+  "project-type.mod.singular": {
+    "message": "Mod"
+  },
+  "project-type.plugin.singular": {
+    "message": "Plugin"
+  },
   "project-type.resourcepack.plural": {
     "message": "Mga Resource Pack"
   },
   "project-type.resourcepack.singular": {
     "message": "Resource Pack"
   },
+  "project-type.shader.singular": {
+    "message": "Shader"
+  },
+  "project.about.details.updated": {
+    "message": "In-update {date}"
+  },
   "project.download.game-version": {
     "message": "Bersiyon ng laro: {version}"
   },
+  "project.download.install-with-app": {
+    "message": "I-install gamit ang Modrinth App"
+  },
   "project.download.no-app": {
     "message": "Wala kang Modrinth App?"
   },
@@ -239,6 +443,9 @@
   "project.download.select-game-version": {
     "message": "Piliin ang lahat ng bersiyon ng laro"
   },
+  "project.download.select-platform": {
+    "message": "Pumili ng plataporma"
+  },
   "project.download.show-all-versions": {
     "message": "Ipakita ang lahat ng bersiyon"
   },
@@ -272,40 +479,112 @@
   "project.settings.environment.notice.review-options.description": {
     "message": "Kakaunlad lang ng aming sistema sa Mga Environment sa Modrinth at magagamit na ngayon ang mga bagong pagpipilian. Mangyaring suriin na tama ang napili sa ibaba at pindutin ang 'Patunayan' kapag tapos ka na!"
   },
+  "project.settings.environment.verification.verify-button": {
+    "message": "Patunayan"
+  },
+  "project.settings.general.name.title": {
+    "message": "Pangalan"
+  },
+  "project.settings.general.url.title": {
+    "message": "URL"
+  },
   "project.settings.title": {
     "message": "Mga Setting"
   },
   "project.stats.downloads-label": {
     "message": "download {count, plural, one {} other {}}"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Hindi mahanda ang download"
+  "scopes.performAnalytics.description": {
+    "message": "Gawin ang mga aksiyon sa analitika"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Ihanda ang download"
+  "servers.backups.item.lock": {
+    "message": "I-lock"
   },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Subukang muli ang paghahanda"
+  "servers.backups.item.locked": {
+    "message": "Ni-lock"
   },
-  "servers.backups.item.preparing-download": {
-    "message": "Hinahanda ang download..."
+  "servers.backups.item.rename": {
+    "message": "I-rename"
+  },
+  "servers.backups.item.retry": {
+    "message": "Retry"
+  },
+  "servers.backups.item.unlock": {
+    "message": "I-unlock"
+  },
+  "servers.notice.actions": {
+    "message": "Mga Aksiyon"
+  },
+  "servers.notice.begins": {
+    "message": "Magsisimula"
+  },
+  "servers.notice.id": {
+    "message": "ID"
+  },
+  "servers.notice.level": {
+    "message": "Level"
+  },
+  "servers.plan.large.name": {
+    "message": "Large"
+  },
+  "servers.plan.medium.name": {
+    "message": "Medium"
+  },
+  "servers.plan.small.name": {
+    "message": "Small"
+  },
+  "settings.billing.payment_method_type.eftpos": {
+    "message": "EFTPOS"
+  },
+  "settings.billing.payment_method_type.jcb": {
+    "message": "JCB"
+  },
+  "settings.billing.payment_method_type.paypal": {
+    "message": "PayPal"
+  },
+  "settings.billing.payment_method_type.unknown": {
+    "message": "Hindi kilalang payment method"
+  },
+  "settings.billing.payment_method_type.visa": {
+    "message": "Visa"
   },
   "settings.display.flags.description": {
     "message": "Magpagana o huwag magpagana ng mga tiyak na feature sa iyong device."
   },
   "settings.display.project-list-layouts.datapack": {
-    "message": "Pahina ng mga Data Pack"
+    "message": "Pahina ng Mga Data Pack"
   },
   "settings.display.project-list-layouts.description": {
-    "message": "Pumili ng iyong gugustohing pag-aayos ng bawat pahinang magpapakita sa mga listahan ng proyekto sa iyong device."
+    "message": "Pumili ng iyong gugustohing ayos ng bawat pahinang magpapakita sa mga listahan ng proyekto sa iyong device."
   },
   "settings.display.project-list-layouts.resourcepack": {
-    "message": "Pahina ng mga Resource Pack"
+    "message": "Pahina ng Mga Resource Pack"
+  },
+  "settings.display.project-list-layouts.title": {
+    "message": "Mga ayos ng listahan ng proyekto"
   },
   "settings.display.theme.description": {
     "message": "Pumili ng iyong gugustohing paksang-kulay para sa Modrinth ng nitong device."
   },
+  "settings.language.languages.search-field.placeholder": {
+    "message": "Maghanap ng lengguwahe..."
+  },
+  "settings.pats.modal.create.name.label": {
+    "message": "Pangalan"
+  },
+  "settings.profile.bio.title": {
+    "message": "Biyograpiya"
+  },
+  "settings.profile.profile-picture.reset": {
+    "message": "I-reset"
+  },
   "settings.sessions.description": {
     "message": "Narito ang lahat ng mga device na kasalukuyang nakalog-in sa iyong Modrinth account. Maaari mong maisaisang malog-out ang bawat isa.\n\nKung makakita ka ng isang hindi mo nakikilala, maglog-out sa device na iyon at agarang palitan ang password ng iyong Modrinth account."
+  },
+  "settings.sessions.unknown-os": {
+    "message": "Hindi kilalang OS"
+  },
+  "settings.sessions.unknown-platform": {
+    "message": "Hindi kilalang plataforma"
   }
 }
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index f55e78f3..8eef4386 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -437,6 +437,9 @@
   "create.collection.name-label": {
     "message": "Nom"
   },
+  "create.collection.name-placeholder": {
+    "message": "Entrez le nom de la collection..."
+  },
   "create.collection.summary-description": {
     "message": "Une ou deux phrases qui décrivent vôtre collection."
   },
@@ -446,6 +449,9 @@
   "create.collection.summary-placeholder": {
     "message": "C'est une collection de..."
   },
+  "create.collection.title": {
+    "message": "Création de la collection"
+  },
   "create.limit-alert.contact-support": {
     "message": "Contacter le support"
   },
@@ -479,6 +485,63 @@
   "create.organization.name-label": {
     "message": "Nom"
   },
+  "create.organization.name-placeholder": {
+    "message": "Entrez le nom de l'organisation..."
+  },
+  "create.organization.url-label": {
+    "message": "URL"
+  },
+  "create.project.cancel": {
+    "message": "Annuler"
+  },
+  "create.project.create-project": {
+    "message": "Créer un projet"
+  },
+  "create.project.error-title": {
+    "message": "Une erreur est survenue"
+  },
+  "create.project.name-label": {
+    "message": "Nom"
+  },
+  "create.project.name-placeholder": {
+    "message": "Entrez le nom du projet..."
+  },
+  "create.project.summary-description": {
+    "message": "Une phrase ou deux qui décrivent votre projet."
+  },
+  "create.project.summary-label": {
+    "message": "Sommaire"
+  },
+  "create.project.summary-placeholder": {
+    "message": "Ce projet ajoute..."
+  },
+  "create.project.title": {
+    "message": "Création d'un projet"
+  },
+  "create.project.url-label": {
+    "message": "URL"
+  },
+  "create.project.visibility-label": {
+    "message": "Visibilité"
+  },
+  "create.project.visibility-private": {
+    "message": "Privé"
+  },
+  "create.project.visibility-public": {
+    "message": "Publique"
+  },
+  "create.project.visibility-unlisted": {
+    "message": "Non répertorié"
+  },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Créer un lien affilié"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Vos liens affiliés"
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Révoquer"
+  },
   "dashboard.collections.button.create-new": {
     "message": "Créer un nouveau"
   },
@@ -491,6 +554,12 @@
   "dashboard.collections.long-title": {
     "message": "Vos collections"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Télécharger {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Tout est prêt ! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Une entité étrangère correspond à toute entreprise située en dehors des États-Unis d'Amérique (par exemple, une entreprise non américaine, une entreprise partenaire ou LLC)."
   },
@@ -536,6 +605,9 @@
   "error.generic.404.title": {
     "message": "Page introuvable"
   },
+  "error.generic.451.title": {
+    "message": "Contenu indisponible pour des raisons légal"
+  },
   "error.generic.default.list_item.1": {
     "message": "Vérifiez si Modrinth est hors ligne sur notre <status-link>page de statut</status-link>."
   },
@@ -764,6 +836,9 @@
   "layout.action.lookup-by-email": {
     "message": "Recherche par email"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Gérer les liens affiliés"
+  },
   "layout.action.manage-server-notices": {
     "message": "Gérer les notifications du serveur"
   },
@@ -818,12 +893,12 @@
   "layout.banner.tax.action": {
     "message": "Remplir la déclaration de revenus"
   },
-  "layout.banner.tax.description": {
-    "message": "Vous avez désormais retiré plus de 600 $ depuis Modrinth cette année. Pour être en règle avec la législation, vous devez remplir une déclaration de revenus. Vos demandes de retrait sont en attente tant que le formulaire n'a pas été rempli."
-  },
   "layout.banner.tax.title": {
     "message": "Déclaration de revenus nécessaire"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Contacter le support"
+  },
   "layout.banner.verify-email.action": {
     "message": "Renvoyer un e-mail de vérification"
   },
@@ -998,27 +1073,48 @@
   "moderation.technical.search.placeholder": {
     "message": "Rechercher des revues techniques…"
   },
+  "profile.bio.fallback.creator": {
+    "message": "Un créateur Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Un utilisateur Modrinth."
+  },
   "profile.button.billing": {
     "message": "Gérer la facturation de l’utilisateur"
   },
+  "profile.button.edit-role": {
+    "message": "Modifier le rôle"
+  },
   "profile.button.info": {
     "message": "Afficher les détails de l’utilisateur"
   },
   "profile.button.manage-projects": {
     "message": "Gérer les projets"
   },
+  "profile.details.tooltip.email-verified": {
+    "message": "Email vérifié"
+  },
   "profile.error.not-found": {
     "message": "Utilisateur introuvable"
   },
-  "profile.joined-at": {
-    "message": "Inscrit le <date>{ago}</date>"
+  "profile.label.affiliate": {
+    "message": "Affilié"
   },
   "profile.label.badges": {
     "message": "Badges"
   },
+  "profile.label.collection": {
+    "message": "Collection"
+  },
   "profile.label.details": {
     "message": "Détails"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, one {téléchargement} other {téléchargements}}"
+  },
+  "profile.label.no": {
+    "message": "Non"
+  },
   "profile.label.no-collections": {
     "message": "Cet utilisateur n'a aucune collection !"
   },
@@ -1034,18 +1130,21 @@
   "profile.label.organizations": {
     "message": "Organisations"
   },
+  "profile.label.projects": {
+    "message": "{count} {count, plural, one {projet} other {projets}}"
+  },
+  "profile.label.saving": {
+    "message": "Sauvegarde en cours..."
+  },
+  "profile.label.yes": {
+    "message": "Oui"
+  },
   "profile.meta.description": {
     "message": "Téléchargez les projets de {username} sur Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - Téléchargez les projets de {username} sur Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> téléchargement} other {<stat>{count}</stat> téléchargements}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> projet} other {<stat>{count}</stat> projets}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> abonné} other {<stat>{count}</stat> abonnés}} aux projets"
   },
@@ -1073,6 +1172,9 @@
   "project-member-header.invitation-title": {
     "message": "Invitation à rejoindre un projet"
   },
+  "project-member-header.invitation-with-role": {
+    "message": "Vous avez été invité à être membre de ce projet sous le rôle de '{role}''."
+  },
   "project-member-header.success": {
     "message": "Succès"
   },
@@ -1100,6 +1202,9 @@
   "project-moderation-nags.submit-for-review": {
     "message": "Soumettre pour examen"
   },
+  "project-moderation-nags.submit-for-review-button": {
+    "message": "Soumettre pour examen"
+  },
   "project-moderation-nags.submit-for-review-desc": {
     "message": "Votre projet n’est visible que par les membres du projet. Il doit être examiné par des modérateurs avant d’être publié."
   },
@@ -1766,21 +1871,21 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Restauration de sauvegarde en cours"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Préparation de la sauvegarde pour le téléchargement déjà en cours "
-  },
   "servers.backups.item.automated": {
     "message": "Automatisé"
   },
   "servers.backups.item.creating-backup": {
     "message": "Création de sauvegarde..."
   },
+  "servers.backups.item.downloading": {
+    "message": "Téléchargement"
+  },
+  "servers.backups.item.downloading-backup": {
+    "message": "Téléchargement de la backup..."
+  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Échec de la création de la sauvegarde"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Échec de la préparation du téléchargement"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Échec de la restauration à partir de la sauvegarde"
   },
@@ -1790,15 +1895,6 @@
   "servers.backups.item.locked": {
     "message": "Verrouillé"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Préparer le téléchargement"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Réessayer la préparation"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Préparation du téléchargement…"
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "En file pour sauvegarde"
   },
diff --git a/apps/frontend/src/locales/he-IL/index.json b/apps/frontend/src/locales/he-IL/index.json
index 386527ce..d4595418 100644
--- a/apps/frontend/src/locales/he-IL/index.json
+++ b/apps/frontend/src/locales/he-IL/index.json
@@ -24,28 +24,28 @@
     "message": "הורד את קובץ ה-RPM"
   },
   "app-marketing.download.linux": {
-    "message": "Linux"
+    "message": "לינוקס"
   },
   "app-marketing.download.linux-disclaimer": {
-    "message": "ידוע שלגרסאות Linux של Modrinth App יש <issues-link>בעיות</issues-link> במערכות ובתצורות מסוימות. אם Modrinth App אינו יציב במערכת שלך, אנו ממליצים לך לנסות יישומים אחרים כמו <prism-link>Prism Launcher</prism-link> כדי להתקין בקלות תוכן מ-Modrinth."
+    "message": "ידוע שלגרסאות לינוקס של אפליקציית מודרינת' יש <issues-link>בעיות</issues-link> במערכות ובתצורות מסוימות. אם אפליקציית מודרינת' אינה יציבה במערכת שלך, אנו ממליצים לך לנסות יישומים אחרים כמו <prism-link>Prism Launcher</prism-link> כדי להתקין בקלות תוכן ממודרינת'."
   },
   "app-marketing.download.mac": {
-    "message": "Mac"
+    "message": "מאק"
   },
   "app-marketing.download.options-title": {
     "message": "אפשרויות הורדה"
   },
   "app-marketing.download.terms": {
-    "message": "בהורדת Modrinth App אתה מסכים ל<terms-link>תנאים</terms-link> ול<privacy-link>מדיניות הפרטיות</privacy-link> שלנו."
+    "message": "בהורדת אפליקציית מודרינת' אתה מסכים ל<terms-link>תנאים</terms-link> ול<privacy-link>מדיניות הפרטיות</privacy-link> שלנו."
   },
   "app-marketing.download.third-party-packages": {
     "message": "חבילות צד שלישי"
   },
   "app-marketing.download.title": {
-    "message": "הורד את Modrinth App (בטא)"
+    "message": "הורד את אפליקציית מודרינת' (בטא)"
   },
   "app-marketing.download.windows": {
-    "message": "Windows"
+    "message": "ווינדוס"
   },
   "app-marketing.features.follow.description": {
     "message": "שמור תוכן שאתה אוהב וקבל עדכונים בלחיצה אחת."
@@ -54,7 +54,7 @@
     "message": "עקוב אחר פרויקטים"
   },
   "app-marketing.features.importing.description": {
-    "message": "ייבא את כל הפרופילים המועדפים עליך מהמפעיל שבו השתמשת לפני כן, והתחל להשתמש ב-Modrinth App תוך שניות!"
+    "message": "ייבא את כל הפרופילים המועדפים עליך מהמפעיל שבו השתמשת לפני כן, והתחל להשתמש באפליקציית מודרינת' תוך שניות!"
   },
   "app-marketing.features.importing.gdlauncher-alt": {
     "message": "GDLauncher"
@@ -72,7 +72,7 @@
     "message": "מאת {author}"
   },
   "app-marketing.features.mod-management.description": {
-    "message": "Modrinth הופך את ניהול כל המודים שלך לפשוט ונוח במקום אחד. באפשרותך להתקין, להסיר ולעדכן מודים בלחיצה אחת."
+    "message": "מודרינת' הופך את ניהול כל המודים שלך לפשוט ונוח במקום אחד. באפשרותך להתקין, להסיר ולעדכן מודים בלחיצה אחת."
   },
   "app-marketing.features.mod-management.installed-mods": {
     "message": "מודים מותקנים"
@@ -96,7 +96,7 @@
     "message": "מצב לא מקוון"
   },
   "app-marketing.features.open-source.description": {
-    "message": "המפעיל של Modrinth הוא קוד פתוח לחלוטין. באפשרותך לצפות בקוד המקור ב<github-link>GitHub</github-link>!"
+    "message": "המפעיל של מודרינת' הוא קוד פתוח לחלוטין. באפשרותך לצפות בקוד המקור ב<github-link>GitHub</github-link>!"
   },
   "app-marketing.features.open-source.title": {
     "message": "קוד פתוח"
@@ -108,7 +108,7 @@
     "message": "% מעבד"
   },
   "app-marketing.features.performance.description": {
-    "message": "Modrinth App פועל עם ביצועים טובים יותר ממנהלי מודים מובילים רבים, תוך שימוש ב-150 מגה-בייט RAM בלבד!"
+    "message": "אפליקציית מודרינת' פועל עם ביצועים טובים יותר ממנהלי מודים מובילים רבים, תוך שימוש בכ-150 מגה בייט זיכרון (RAM) בלבד!"
   },
   "app-marketing.features.performance.discord": {
     "message": "דיסקורד"
@@ -129,7 +129,7 @@
     "message": "פחות מ-150 מגה-בייט"
   },
   "app-marketing.features.performance.modrinth-app": {
-    "message": "אפליקציית Modrinth"
+    "message": "Modrinth App"
   },
   "app-marketing.features.performance.one-billion-percent": {
     "message": "1 מיליארד %"
@@ -153,7 +153,7 @@
     "message": "שחק עם המודים האהובים עליך"
   },
   "app-marketing.features.sharing.description": {
-    "message": "בנה, שתף ושחק בחבילות מודים עם כל אחד מאלפי המודים וחבילות המודים שיש כאן ב-Modrinth."
+    "message": "בנה, שתף ושחק בחבילות מודים עם כל אחד מאלפי המודים וחבילות המודים שיש כאן במודרינת'."
   },
   "app-marketing.features.sharing.modpack": {
     "message": "מודפק"
@@ -168,7 +168,7 @@
     "message": "לא כמו שום מפעיל"
   },
   "app-marketing.features.website.description": {
-    "message": "יישומון מודרינף נתמך במלואו עם האתר, כך שניתן לגשת לכל הפרויקטים האהובים עליכם מהיישומון!"
+    "message": "אפליקציית מודרינת' נתמכת במלואה עם האתר, כך שניתן לגשת לכל הפרויקטים האהובים עליכם מהאפליקציה!"
   },
   "app-marketing.features.website.title": {
     "message": "אינטגרציה עם האתר"
@@ -177,19 +177,25 @@
     "message": "השתמשת בעבר"
   },
   "app-marketing.hero.app-screenshot-alt": {
-    "message": "תמונה של יישומון מודרינף עם התקנה של קובלמון שנפתחת בעמוד \"התוכן\"."
+    "message": "תמונה של אפליקציית מודרינת' עם התקנה של Cobblemon שנפתחת בעמוד ה\"תוכן\"."
   },
   "app-marketing.hero.description": {
-    "message": "יישומון מודרינף הוא launcher מיוחד, בקוד פתוח, שמאפשר לכם לשחק עם המודים שאתם אוהבים, ושומר עליהם מעודכנים. הכל בחבילה אחת, קומפקטית ומסודרת."
+    "message": "אפליקציית מודרינת' היא משגר (launcher) מיוחד, קוד פתוח, שמאפשר לכם לשחק עם המודים שאתם אוהבים, ושומר עליהם מעודכנים. הכל בחבילה אחת, קומפקטית ומסודרת."
   },
   "app-marketing.hero.download-button": {
-    "message": "יישומון מודרינף - לחץ להורדה"
+    "message": "הורד את Modrinth App"
   },
   "app-marketing.hero.download-modrinth-app": {
-    "message": "הורד את יישומון מודרינף"
+    "message": "הורד את אפליקציית מודרינת'"
   },
   "app-marketing.hero.download-modrinth-app-for-os": {
-    "message": "הורד את יישומון מודרינף עבור {os}"
+    "message": "הורד את Modrinth App עבור {os}"
+  },
+  "app-marketing.hero.minecraft-screenshot-alt": {
+    "message": "תמונה ראשית מהפנורמה של המודפק cobblemon."
+  },
+  "app-marketing.hero.more-download-options": {
+    "message": "אפשרויות הורדה נוספות"
   },
   "auth.authorize.action.authorize": {
     "message": "אימות"
@@ -347,6 +353,12 @@
   "auth.welcome.checkbox.subscribe": {
     "message": "הירשם לעדכונים על Modrinth"
   },
+  "auth.welcome.description": {
+    "message": "אתה עכשיו חלק מהקהילה המדהימה של יוצרים ומשתמשים שכבר בונים, מורידים ומתעדכנים עם מודים מגניבים."
+  },
+  "auth.welcome.label.tos": {
+    "message": "ע\"י יצירת חשבון, אתה הסכמת ל<terms-link>תנאים</terms-link> של מודרינפ ו<privacy-policy-link>מדיניות הפרטיות</privacy-policy-link>."
+  },
   "auth.welcome.long-title": {
     "message": "ברוכים הבאים ל-Modrinth!"
   },
@@ -365,6 +377,18 @@
   "collection.button.unfollow-project": {
     "message": "הסר מעקב מפרוייקט"
   },
+  "collection.delete-modal.description": {
+    "message": "זה יגרום להסרה של הקולנוע הזאת לתמיד. אין אפשרות לבטל."
+  },
+  "collection.delete-modal.title": {
+    "message": "אתה בטוח שאתה רוצה למחוק את הקולקציה?"
+  },
+  "collection.description": {
+    "message": "{description} צפה באוסף {name} מ{username} במודרינת'"
+  },
+  "collection.description.following": {
+    "message": "אוסף שנוצר אוטומטית של כל הפרויקטים שאתה עוקב אחריו."
+  },
   "collection.error.not-found": {
     "message": "אוסף לא נמצא"
   },
@@ -374,6 +398,9 @@
   "collection.label.created-at": {
     "message": "נוצר {ago}"
   },
+  "collection.label.curated-by": {
+    "message": "נוצר על ידי"
+  },
   "collection.label.no-projects": {
     "message": "אין לאוסף זה פרוייקטים!"
   },
@@ -392,6 +419,153 @@
   "collection.title": {
     "message": "{name} - אוסף"
   },
+  "common.no": {
+    "message": "לא"
+  },
+  "common.yes": {
+    "message": "כן"
+  },
+  "create.collection.cancel": {
+    "message": "בטל"
+  },
+  "create.collection.collection-info": {
+    "message": "האוסף החדש שלך יווצר עכשיו כאוסף ציבורי עם {count, plural, =0 {no projects} one {# project} other {# projects}}."
+  },
+  "create.collection.create-collection": {
+    "message": "צור אוסף"
+  },
+  "create.collection.error-title": {
+    "message": "אירעה שגיאה"
+  },
+  "create.collection.name-label": {
+    "message": "שם"
+  },
+  "create.collection.name-placeholder": {
+    "message": "הכנס שם לאוסף..."
+  },
+  "create.collection.summary-description": {
+    "message": "משפט או שניים שמתאים בקצרה את האוסף שלך."
+  },
+  "create.collection.summary-label": {
+    "message": "תקציר"
+  },
+  "create.collection.summary-placeholder": {
+    "message": "זה האוסף של..."
+  },
+  "create.collection.title": {
+    "message": "צור אוסף"
+  },
+  "create.limit-alert.approaching-limit": {
+    "message": "מתקרב למגבלה של {type} ({current}/{max})"
+  },
+  "create.limit-alert.approaching-limit-description": {
+    "message": "הינך עומד/ת להגיע למגבלת ה{type}, אנה צרו קשר עם שירות לקוחות במידה וצריך יותר מ{max}{typePlural}."
+  },
+  "create.limit-alert.contact-support": {
+    "message": "צור קשר עם תמיכה"
+  },
+  "create.limit-alert.limit-reached": {
+    "message": "הגעת לגבול של {type}"
+  },
+  "create.limit-alert.limit-reached-description": {
+    "message": "הגעת להגבלת ה{type} מתוך {max}. אנה צרו קשר עם שרות לקוחות על מנת להעלות את ההגבלה."
+  },
+  "create.limit-alert.type-collection": {
+    "message": "אוסף"
+  },
+  "create.limit-alert.type-organization": {
+    "message": "ארגון"
+  },
+  "create.limit-alert.type-plural-collection": {
+    "message": "אוספים"
+  },
+  "create.limit-alert.type-plural-organization": {
+    "message": "ארגונים"
+  },
+  "create.limit-alert.type-plural-project": {
+    "message": "פרויקטים"
+  },
+  "create.limit-alert.type-project": {
+    "message": "פרויקט"
+  },
+  "create.organization.cancel": {
+    "message": "בטל"
+  },
+  "create.organization.create-organization": {
+    "message": "צור ארגון"
+  },
+  "create.organization.error-title": {
+    "message": "התרחשה תקלה"
+  },
+  "create.organization.name-label": {
+    "message": "שם"
+  },
+  "create.organization.name-placeholder": {
+    "message": "הכנס שם ארגון..."
+  },
+  "create.organization.ownership-info": {
+    "message": "אתה תהיה הבעלים של ארגון זה, אבל אתה יכול להזמין חברים אחרים ולהעביר את הבעלות אליהם בכל זמן."
+  },
+  "create.organization.summary-description": {
+    "message": "משפט או שניים שמפרטים על הארגון שלך."
+  },
+  "create.organization.summary-label": {
+    "message": "סיכום"
+  },
+  "create.organization.summary-placeholder": {
+    "message": "ארגון ל..."
+  },
+  "create.organization.title": {
+    "message": "יוצר ארגון"
+  },
+  "create.organization.url-label": {
+    "message": "URL"
+  },
+  "create.project.cancel": {
+    "message": "בטל"
+  },
+  "create.project.create-project": {
+    "message": "צור פרויקט"
+  },
+  "create.project.error-title": {
+    "message": "התרחשה תקלה"
+  },
+  "create.project.name-label": {
+    "message": "שם"
+  },
+  "create.project.name-placeholder": {
+    "message": "הכנס שם פרויקט..."
+  },
+  "create.project.summary-description": {
+    "message": "משפט או שניים שמפרטים על הפרויקט שלך."
+  },
+  "create.project.summary-label": {
+    "message": "סיכום"
+  },
+  "create.project.summary-placeholder": {
+    "message": "הפרויקט מוסיף..."
+  },
+  "create.project.title": {
+    "message": "יוצר פרויקט"
+  },
+  "create.project.url-label": {
+    "message": "URL"
+  },
+  "create.project.visibility-description": {
+    "message": "מצב נראות הפרויקט שלך אחרי שאושר."
+  },
+  "create.project.visibility-label": {
+    "message": "מצב נראות"
+  },
+  "create.project.visibility-private": {
+    "message": "פרויקט פרטי"
+  },
+  "create.project.visibility-public": {
+    "message": "פרויקט פומבי"
+  },
+  "create.project.visibility-unlisted": {
+    "message": "לא מוגדר"
+  },
   "dashboard.collections.button.create-new": {
     "message": "צור חדש"
   },
@@ -404,18 +578,78 @@
   "dashboard.collections.long-title": {
     "message": "האוספים שלך"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "הורדת {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "מס {formType} שלך נשלח בהצלחה!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "ברשותך לצאת עכשיו. אם יש שאלות או צורך לעדכן את פרטיך <support-link>צרו קשר עם שירות לקוחות</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "הכל מוכן!🎉"
+  },
+  "dashboard.creator-tax-form-modal.entity.description": {
+    "message": "ארגון חיצוני הוא עסק ממוסד מחוץ לארצות הברית (כמו חברה לא-ארה״בית, שותפות, או LLC)."
+  },
+  "dashboard.creator-tax-form-modal.entity.foreign-entity": {
+    "message": "ארגון חיצוני"
+  },
+  "dashboard.creator-tax-form-modal.entity.private-individual": {
+    "message": "אדם פרטי"
+  },
+  "dashboard.creator-tax-form-modal.entity.question": {
+    "message": "הינך גוף פרטי או חלק מארגון חיצוני?"
+  },
+  "dashboard.creator-tax-form-modal.header": {
+    "message": "קובץ מס"
+  },
+  "dashboard.creator-tax-form-modal.security.description": {
+    "message": "Modrinth משתמשים בגוף החיצוני Track1099 על מנת לאסוף ולשמור בבטיחות את קבצי המס שלך.\n<security-link>עוד מידע כאן.</security-link>"
+  },
+  "dashboard.creator-tax-form-modal.security.header": {
+    "message": "הליכים בטחונים"
+  },
+  "dashboard.creator-tax-form-modal.us-citizen.question": {
+    "message": "הינך אזרח מארה״ב?"
+  },
   "error.collection.404.list_item.1": {
     "message": "ייתכן שהקלדת כתובת URL שגויה של האוסף."
   },
   "error.collection.404.list_item.2": {
     "message": "ייתכן שהאוסף פרטי."
   },
+  "error.collection.404.list_item.3": {
+    "message": "יכול להיות שהקובץ שלך נסתר על ידי צוות Modrinth משום שפגע ב<tou-link>תנאי השימוש</tou-link>."
+  },
+  "error.collection.404.list_title": {
+    "message": "למה?"
+  },
+  "error.collection.404.title": {
+    "message": "קובץ לא נמצא"
+  },
+  "error.generic.404.subtitle": {
+    "message": "העמוד שחיפשת לא קיים."
+  },
   "error.generic.404.title": {
     "message": "עמוד לא קיים"
   },
+  "error.generic.451.subtitle": {
+    "message": "עמוד זה נחסם מסיבות משפטיות, כגון צנזורה ממשלתית או הליכים משפטיים מתמשכים."
+  },
+  "error.generic.451.title": {
+    "message": "תוכן לא נגיש מסיבות משפטיות"
+  },
   "error.generic.default.list_item.1": {
     "message": "בדוק אם Modrinth אינו זמין ב<status-link>דף הסטטוס</status-link> שלנו."
   },
+  "error.generic.default.list_item.2": {
+    "message": "אם זה ממשיך לקרות, אנא ידע/י את צוות Modrinth דרך <discord-server>שרת הדיסקורד</discord-link>."
+  },
+  "error.generic.default.list_title": {
+    "message": "נסו שוב בעוד מספר דקות."
+  },
   "error.generic.default.subtitle": {
     "message": "משהו השתבש."
   },
@@ -527,15 +761,81 @@
   "landing.error.failedToLoadRandomProjects": {
     "message": "נכשל בניסיון טעינת פרויקטים אקראיים :("
   },
+  "landing.feature.follow.description": {
+    "message": "התעדכן/י כל פעם הפקרויקטים האהובים עליך מתעדכנים."
+  },
   "landing.feature.follow.heading": {
     "message": "עקבו אחר פרויקטים שאתם אוהבים"
   },
   "landing.feature.launcher.description": {
-    "message": "ה-API הפתוח של Modrinth מאפשר למשגרים (Launchers) להוסיף אינטגרציה עמוקה עם הפלטפורמה. אתם יכולים להשתמש ב-Modrinth דרך האפליקציה שלנו, וגם דרך כמה מהמשגרים הפופולריים ביותר כמו ATLauncher, MultiMC ו-Prism Launcher."
+    "message": "ה-API הפתוח של Modrinth מאפשר למפעילים לשלב אינטגרציה עמוקה עם Modrinth. ניתן להשתמש ב-Modrinth דרך <link>האפליקציה שלנו</link>, וגם באמצעות כמה מהמפעילים הפופולריים ביותר, כמו ATLauncher, MultiMC ו-Prism Launcher."
   },
   "landing.feature.launcher.heading": {
     "message": "שחק עם המפעיל האהוב עליך"
   },
+  "landing.feature.search.description": {
+    "message": "מערכת החיפוש הזריזה והפילטרים העוצמתיים של Modrinth מאפשרים למצוא את מה שמחפשים בזמן כתיבה."
+  },
+  "landing.feature.search.heading": {
+    "message": "מצא/י מה שתרצה/י, במהירות וקלות"
+  },
+  "landing.heading.the-place-for-minecraft": {
+    "message": "המקום ל{content} מיינקראפט"
+  },
+  "landing.heading.the-place-for-minecraft.data-packs": {
+    "message": "חבילות תוכן / Data Packs"
+  },
+  "landing.heading.the-place-for-minecraft.modpacks": {
+    "message": "חבילות מודים / Modpacks"
+  },
+  "landing.heading.the-place-for-minecraft.mods": {
+    "message": "מודים"
+  },
+  "landing.heading.the-place-for-minecraft.plugins": {
+    "message": "פלאגינים"
+  },
+  "landing.heading.the-place-for-minecraft.resource-packs": {
+    "message": "טקסטורות"
+  },
+  "landing.heading.the-place-for-minecraft.servers": {
+    "message": "שרתים"
+  },
+  "landing.heading.the-place-for-minecraft.shaders": {
+    "message": "הצללות / שיידרים"
+  },
+  "landing.launcher.atlauncher-label": {
+    "message": "ATLauncher"
+  },
+  "landing.launcher.graphic-alt": {
+    "message": "הצגה של חלון מיינקראפט מופשט, עם לוגו Mojang בצבע ירוק Modrinth."
+  },
+  "landing.launcher.modrinth-app-label": {
+    "message": "Modrinth App"
+  },
+  "landing.launcher.prism-launcher-label": {
+    "message": "Prism Launcher"
+  },
+  "landing.notifications.has-been-updated": {
+    "message": "{title} עודכן!"
+  },
+  "landing.notifications.heading": {
+    "message": "עדכונים"
+  },
+  "landing.notifications.received-time": {
+    "message": "זמן קבלה: {time}"
+  },
+  "landing.notifications.version-released": {
+    "message": "גרסא {version} יצאה לגרסאת המשחק {gameVersion}"
+  },
+  "landing.search.label": {
+    "message": "חיפוש"
+  },
+  "landing.search.placeholder": {
+    "message": "חיפוש..."
+  },
+  "landing.search.sort-by.label": {
+    "message": "מיון לפי"
+  },
   "landing.section.for-players.label": {
     "message": "בשביל שחקנים"
   },
@@ -621,7 +921,7 @@
     "message": "מוצרים"
   },
   "layout.footer.products.app": {
-    "message": "אפליקציית Modrinth"
+    "message": "Modrinth App"
   },
   "layout.footer.products.plus": {
     "message": "Modrinth+"
@@ -646,5 +946,68 @@
   },
   "layout.footer.social.bluesky": {
     "message": "Bluesky"
+  },
+  "layout.footer.social.discord": {
+    "message": "דיסקורד"
+  },
+  "layout.footer.social.github": {
+    "message": "GitHub"
+  },
+  "layout.footer.social.mastodon": {
+    "message": "מסטודון"
+  },
+  "layout.footer.social.x": {
+    "message": "X"
+  },
+  "layout.nav.modrinth-app": {
+    "message": "Modrinth App"
+  },
+  "moderation.page.projects": {
+    "message": "פרויקטים"
+  },
+  "profile.label.no": {
+    "message": "לא"
+  },
+  "profile.label.yes": {
+    "message": "כן"
+  },
+  "project-member-header.error": {
+    "message": "שגיאה"
+  },
+  "project-type.datapack.plural": {
+    "message": "חבילות נתונים"
+  },
+  "project-type.datapack.singular": {
+    "message": "חבילת נתונים"
+  },
+  "project-type.mod.plural": {
+    "message": "מודים"
+  },
+  "project-type.mod.singular": {
+    "message": "מוד"
+  },
+  "project.actions.dont-show-again": {
+    "message": "אל תציג שוב"
+  },
+  "project.description.title": {
+    "message": "תיאור"
+  },
+  "project.download.install-with-app": {
+    "message": "התקן באמצעות Modrinth App"
+  },
+  "project.settings.general.name.title": {
+    "message": "שם"
+  },
+  "project.settings.title": {
+    "message": "הגדרות"
+  },
+  "settings.language.languages.language-label-error": {
+    "message": "{label}. שגיאה"
+  },
+  "settings.pats.modal.create.name.label": {
+    "message": "שם"
+  },
+  "settings.profile.profile-picture.title": {
+    "message": "תמונת פרופיל"
   }
 }
diff --git a/apps/frontend/src/locales/hr-HR/index.json b/apps/frontend/src/locales/hr-HR/index.json
index 6ce49a12..252ad92b 100644
--- a/apps/frontend/src/locales/hr-HR/index.json
+++ b/apps/frontend/src/locales/hr-HR/index.json
@@ -2,6 +2,12 @@
   "admin.billing.error.not-found": {
     "message": "Korisnik nije pronađen"
   },
+  "app-marketing.features.follow.title": {
+    "message": "Zasljedi projekte"
+  },
+  "app-marketing.features.importing.description": {
+    "message": "!"
+  },
   "auth.authorize.action.authorize": {
     "message": "Ovlasti"
   },
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index a67695aa..289340c7 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -167,12 +167,21 @@
   "app-marketing.features.unlike-any-launcher": {
     "message": "Olyan Minecraft inditóprogram"
   },
+  "app-marketing.features.website.description": {
+    "message": "A Modrinth alkalmazás teljes mértékben integrálva van a weboldallal, így az alkalmazásból elérheted az összes kedvenc projektedet!"
+  },
   "app-marketing.features.website.title": {
     "message": "Weboldal integráció"
   },
   "app-marketing.features.youve-used-before": {
     "message": "ami eltérő"
   },
+  "app-marketing.hero.app-screenshot-alt": {
+    "message": "A Modrinth alkalmazás képernyőképe, amelyen a Cobblemon példány a „Tartalom” oldalon van megnyitva."
+  },
+  "app-marketing.hero.description": {
+    "message": "A Modrinth App egy egyedülálló, nyílt forráskódú kliens, amely lehetővé teszi, hogy kedvenc modjaidat játssz, és naprakészen tartsd őket, mindezt egy kis, praktikus csomagban."
+  },
   "app-marketing.hero.download-button": {
     "message": "Modrinth App letöltése"
   },
@@ -182,6 +191,9 @@
   "app-marketing.hero.download-modrinth-app-for-os": {
     "message": "Modrinth App letöltése {os} re/ra"
   },
+  "app-marketing.hero.minecraft-screenshot-alt": {
+    "message": "A Cobblemon példány főmenüjének képernyőképe."
+  },
   "app-marketing.hero.more-download-options": {
     "message": "Több letöltési lehetőség"
   },
@@ -197,21 +209,45 @@
   "auth.authorize.authorize-app-name": {
     "message": "{appName} Engedélyezése"
   },
+  "auth.authorize.error.no-redirect-url": {
+    "message": "Átirányítási útvonal nem találhatóa válaszban"
+  },
+  "auth.authorize.redirect-url": {
+    "message": "Át leszel irányítva ide <redirect-url>{url}</redirect-url>"
+  },
+  "auth.reset-password.method-choice.action": {
+    "message": "Visszaállítási email küldése"
+  },
+  "auth.reset-password.method-choice.description": {
+    "message": "Írja be az email-címét az alábbi mezőbe, és küldünk Önnek egy hivatkozást, amivel vissza tudja állítani a fiókját."
+  },
   "auth.reset-password.method-choice.email-username.label": {
     "message": "Email vagy felhasználónév"
   },
   "auth.reset-password.method-choice.email-username.placeholder": {
     "message": "Email"
   },
+  "auth.reset-password.notification.email-sent.text": {
+    "message": "Egy email el lett küldve önnek az email-címére amennyiben az email-cím el volt mente a fiókjában."
+  },
   "auth.reset-password.notification.email-sent.title": {
     "message": "Email küldve"
   },
+  "auth.reset-password.notification.password-reset.text": {
+    "message": "Mostmár be tudd lépni a fiókjába az új jelszavával."
+  },
+  "auth.reset-password.notification.password-reset.title": {
+    "message": "A jelszavad sikeresen visszaállítva"
+  },
   "auth.reset-password.post-challenge.action": {
     "message": "Jelszó visszaállítása"
   },
   "auth.reset-password.post-challenge.confirm-password.label": {
     "message": "Jelszó megerősítése"
   },
+  "auth.reset-password.post-challenge.description": {
+    "message": "Írja be az új jelszavát az alábbi mezőbe, hogy hozzáférjen a fiókjához."
+  },
   "auth.reset-password.title": {
     "message": "Jelszó visszaállítása"
   },
@@ -257,6 +293,9 @@
   "auth.sign-up.label.username": {
     "message": "Felhasználónév"
   },
+  "auth.sign-up.legal-dislaimer": {
+    "message": "Fiók létrehozásával Ön elfogadja a Modrinth <terms-link>Felhasználási feltételeit</terms-link> és <privacy-policy-link>Adatvédelmi irányelveit</privacy-policy-link>."
+  },
   "auth.sign-up.notification.password-mismatch.text": {
     "message": "A jelszavak nem jegyeznek!"
   },
@@ -266,6 +305,9 @@
   "auth.sign-up.sign-in-option.title": {
     "message": "Már van fiókod?"
   },
+  "auth.sign-up.subscribe.label": {
+    "message": "Iratkozzon fel a Modrinth frissítéseiről szóló értesítésekre"
+  },
   "auth.sign-up.title": {
     "message": "Regisztráció"
   },
@@ -290,15 +332,33 @@
   "auth.verify-email.failed-verification.action": {
     "message": "Hítelesítő email újraküldése"
   },
+  "auth.verify-email.failed-verification.description": {
+    "message": "Nem tudtuk ellenőrizni az e-mail címét. Próbálja meg újra elküldeni az ellenőrző e-mailt a bejelentkezés után a vezérlőpulton keresztül."
+  },
+  "auth.verify-email.failed-verification.description.logged-in": {
+    "message": "Nem tudtuk ellenőrizni az e-mail címét. Kérjük, próbálja meg újra elküldeni az ellenőrző e-mailt az alábbi gombra kattintva."
+  },
   "auth.verify-email.failed-verification.title": {
     "message": "Email hítelesítés sikertelen"
   },
+  "auth.verify-email.post-verification.description": {
+    "message": "Email cím sikeresen meglett erősítve!"
+  },
   "auth.verify-email.post-verification.title": {
     "message": "Email megerősítés"
   },
   "auth.verify-email.title": {
     "message": "Email-cím megerősítése"
   },
+  "auth.welcome.checkbox.subscribe": {
+    "message": "Iratkozzon fel a Modrinth frissítéseiről szóló értesítésekre"
+  },
+  "auth.welcome.description": {
+    "message": "Most már része vagy annak a fantasztikus alkotók és felfedezők közösségének, akik már építenek, letöltenek és naprakészek maradnak a csodálatos modokkal kapcsolatban."
+  },
+  "auth.welcome.label.tos": {
+    "message": "Fiók létrehozásával Ön elfogadja a Modrinth <terms-link>Felhasználási feltételeit</terms-link> és <privacy-policy-link>Adatvédelmi irányelveit</privacy-policy-link>."
+  },
   "auth.welcome.long-title": {
     "message": "Üdvözlünk a Modrinth-onl!"
   },
@@ -317,39 +377,531 @@
   "collection.button.unfollow-project": {
     "message": "Projektek kikövetése"
   },
+  "collection.delete-modal.description": {
+    "message": "Ezzel a gyűjtemény véglegesen törlődik. Ez a művelet nem vonható vissza."
+  },
+  "collection.delete-modal.title": {
+    "message": "Biztos vagy hogy törölni akarod ezt a gyűjteményt?"
+  },
+  "collection.description": {
+    "message": "{description}- Nézd meg a {name} nevű gyűjtemény {username} által Modrinth-on"
+  },
+  "collection.description.following": {
+    "message": "Az összes követett projekt automatikusan generált gyűjteménye."
+  },
+  "collection.error.not-found": {
+    "message": "Nncs ilyen gyűjtemény"
+  },
+  "collection.label.collection": {
+    "message": "Gyűjtemény"
+  },
   "collection.label.created-at": {
     "message": "Létrehozva {ago}"
   },
+  "collection.label.curated-by": {
+    "message": "Kurátor"
+  },
+  "collection.label.no-projects": {
+    "message": "Ez a gyűjtemény egy projektet sem tartalmaz!"
+  },
+  "collection.label.no-projects-auth": {
+    "message": "Nincs egyetlen projekted sem.\nSzeretnél <create-link>hozzáadni egyet</create-link>?"
+  },
+  "collection.label.owner": {
+    "message": "Tulajdonos"
+  },
+  "collection.label.projects-count": {
+    "message": "{count, plural, one {<stat>{count}</stat> projekt} other {<stat>{count}</stat> projekt}}"
+  },
   "collection.label.updated-at": {
     "message": "Frissítve {ago}"
   },
+  "collection.title": {
+    "message": "{name} - Gyűjtemény"
+  },
+  "common.no": {
+    "message": "Nem"
+  },
+  "common.yes": {
+    "message": "Igen"
+  },
+  "create.collection.cancel": {
+    "message": "Mégsem"
+  },
+  "create.collection.collection-info": {
+    "message": "Az új gyűjteményed nyilvános gyűjteményként jön létre, {count, plural, =0 {nincs projekt} one {# projekt} other {# projekt}}."
+  },
+  "create.collection.create-collection": {
+    "message": "Gyűjtemény létrehozása"
+  },
+  "create.collection.error-title": {
+    "message": "Hiba történt"
+  },
+  "create.collection.name-label": {
+    "message": "Név"
+  },
+  "create.collection.name-placeholder": {
+    "message": "Adj meg egy nevet a gyűjteményednek..."
+  },
+  "create.collection.summary-description": {
+    "message": "Egy mondat vagy kettő ami leírja a lényegét a gyűjteményedet."
+  },
+  "create.collection.summary-label": {
+    "message": "Összegzés"
+  },
+  "create.collection.summary-placeholder": {
+    "message": "Ez egy gyűjtemény..."
+  },
+  "create.collection.title": {
+    "message": "Gyűjtemény lérehozása"
+  },
+  "create.limit-alert.approaching-limit": {
+    "message": "Közeledsz a {type} limithez ({current}/{max})"
+  },
+  "create.limit-alert.approaching-limit-description": {
+    "message": "Már majdnem eléred a {type} határt, kérjük, lépj kapcsolatba a támogatással, ha több mint {max} {typePlural}-ra van szükséged."
+  },
+  "create.limit-alert.contact-support": {
+    "message": "Támogatással való kapcsolatba lépés"
+  },
+  "create.limit-alert.limit-reached": {
+    "message": "{type} limit elérve"
+  },
+  "create.limit-alert.limit-reached-description": {
+    "message": "Elérte a {max} {type} korlátot. Kérjük, vegye fel a kapcsolatot az ügyfélszolgálattal a korlát növelése érdekében."
+  },
+  "create.limit-alert.type-collection": {
+    "message": "gyűjtemény"
+  },
+  "create.limit-alert.type-organization": {
+    "message": "szervezet"
+  },
+  "create.limit-alert.type-plural-collection": {
+    "message": "gyűjtemények"
+  },
+  "create.limit-alert.type-plural-organization": {
+    "message": "szervezetek"
+  },
+  "create.limit-alert.type-plural-project": {
+    "message": "projektek"
+  },
+  "create.limit-alert.type-project": {
+    "message": "projekt"
+  },
+  "create.organization.cancel": {
+    "message": "Mégsem"
+  },
+  "create.organization.create-organization": {
+    "message": "Szervezet létrehozása"
+  },
+  "create.organization.error-title": {
+    "message": "Hiba történt"
+  },
+  "create.organization.name-label": {
+    "message": "Név"
+  },
+  "create.organization.name-placeholder": {
+    "message": "Adj meg a szerverzetednek egy nevet..."
+  },
+  "create.organization.ownership-info": {
+    "message": "Átfogod ruház a tulajdon jogod erre a szervervezetre, de már meghívhatsz másokat és átruházhatod a tulajdon jogot bármikor."
+  },
+  "create.organization.summary-description": {
+    "message": "Egy vagy több mondat ami leírja a szervezetedet."
+  },
+  "create.organization.summary-label": {
+    "message": "Összegzés"
+  },
+  "create.organization.summary-placeholder": {
+    "message": "Egy szervezet neki..."
+  },
+  "create.organization.title": {
+    "message": "Hozz létre egy szervezetet"
+  },
+  "create.organization.url-label": {
+    "message": "URL"
+  },
+  "create.project.cancel": {
+    "message": "Mégsem"
+  },
+  "create.project.create-project": {
+    "message": "Projekt létrehozása"
+  },
+  "create.project.error-title": {
+    "message": "Hiba történt"
+  },
+  "create.project.name-label": {
+    "message": "Név"
+  },
+  "create.project.name-placeholder": {
+    "message": "Adj meg egy projekt nevet..."
+  },
+  "create.project.summary-description": {
+    "message": "Egy vagy kettő mondat ami leírja a projektedet."
+  },
+  "create.project.summary-label": {
+    "message": "Összegzés"
+  },
+  "create.project.summary-placeholder": {
+    "message": "Ez a projekt hozzá add..."
+  },
+  "create.project.title": {
+    "message": "Projekt létrehozása"
+  },
+  "create.project.url-label": {
+    "message": "URL"
+  },
+  "create.project.visibility-description": {
+    "message": "A projekt láthatósága jóváhagyása után."
+  },
+  "create.project.visibility-label": {
+    "message": "Láthatóság"
+  },
+  "create.project.visibility-private": {
+    "message": "Privát"
+  },
+  "create.project.visibility-public": {
+    "message": "Nyílvános"
+  },
+  "create.project.visibility-unlisted": {
+    "message": "Nem nyílvános"
+  },
+  "dashboard.collections.button.create-new": {
+    "message": "Új létrehozása"
+  },
+  "dashboard.collections.label.projects-count": {
+    "message": "{count, plural, one {{count} projekt} other {{count} projekt}}"
+  },
+  "dashboard.collections.label.search-input": {
+    "message": "Keresd meg a gyűjteményeidet"
+  },
+  "dashboard.collections.long-title": {
+    "message": "Gyűjteményeid"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Letöltés {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "A/Az {formType} adóbevallásodat sikeresen elküldtük!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Mostantól szabadon kivehetsz a fiókodról. Amennyiben kérdésed van, vagy frissítenéd az adataidat <support-link>vedd fel velünk a kapcsolatot</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Készen állsz!🎉"
+  },
+  "dashboard.creator-tax-form-modal.entity.description": {
+    "message": "A külföldi jogi személy olyan üzleti egységet jelent, amelyet az Egyesült Államokon kívül hoztak létre (például nem amerikai részvénytársaság, társulás vagy korlátolt felelősségű társaság – LLC)."
+  },
+  "dashboard.creator-tax-form-modal.entity.foreign-entity": {
+    "message": "Idegen entitáns"
+  },
+  "dashboard.creator-tax-form-modal.entity.private-individual": {
+    "message": "Magánszemély"
+  },
+  "dashboard.creator-tax-form-modal.entity.question": {
+    "message": "Te magánszemély vagy, vagy egy külföldi céghez tartozol?"
+  },
+  "dashboard.creator-tax-form-modal.header": {
+    "message": "Adóűrlap"
+  },
+  "dashboard.creator-tax-form-modal.security.description": {
+    "message": "A Modrinth a Track1099 nevű harmadik fél szolgáltatót használja az adóűrlapjaid biztonságos begyűjtésére és tárolására. <security-link>További információk itt.</security-link>"
+  },
+  "dashboard.creator-tax-form-modal.security.header": {
+    "message": "Biztonsági gyakorlatok"
+  },
+  "dashboard.creator-tax-form-modal.us-citizen.question": {
+    "message": "Amerikai állampolgár vagy?"
+  },
+  "error.collection.404.list_item.1": {
+    "message": "Elírhatad a gyűjtemémyed URL-ét."
+  },
+  "error.collection.404.list_item.2": {
+    "message": "Ez a gyűjtemény lehet hogy privát."
+  },
+  "error.collection.404.list_item.3": {
+    "message": "Gyűjteményt a Modrinth moderációs csapata eltávolíthatta, mert megsértette a <tou-link>Felhasználási feltételeinket</tou-link>."
+  },
+  "error.collection.404.list_title": {
+    "message": "Miért?"
+  },
+  "error.collection.404.title": {
+    "message": "Nem található gyűjtemény"
+  },
+  "error.generic.404.subtitle": {
+    "message": "Ez az oldal ami iránt érdeklődsz úgy látszik hogy nem létezik."
+  },
+  "error.generic.404.title": {
+    "message": "Nem taláható oldal"
+  },
+  "error.generic.451.subtitle": {
+    "message": "Ez az oldal le lett tiltva legális okok miatt mint például, kormányzati cenzúra vagy folyamatban lévő jogi eljárások miatt."
+  },
+  "error.generic.451.title": {
+    "message": "Tartalom nem elérhető legális okok miatt"
+  },
+  "error.generic.default.list_item.1": {
+    "message": "Ellenőrizd, hogy a Modrinth elérhető-e a <status-link>Állapotoldalon</status-link>."
+  },
+  "error.generic.default.list_item.2": {
+    "message": "Ha ez továbbra is történik, valószínűleg tudatni szeretnéd a Modrinth csapatával. Ezt úgy tehetet meg, hogy csatlakozol a <discord-link>Discord szerverünkre</discord-link>."
+  },
+  "error.generic.default.list_title": {
+    "message": "Kerjük próbáld újra pár perc múlva."
+  },
+  "error.generic.default.subtitle": {
+    "message": "A manóba, valami rosszul sült el!"
+  },
+  "error.generic.default.title": {
+    "message": "Ajjaj!"
+  },
+  "error.organization.404.list_item.1": {
+    "message": "Rosszul írhattad a szervezet URL címét."
+  },
+  "error.organization.404.list_item.2": {
+    "message": "A szervezet készítője megváltoztathatta, vagy törölhette az URL-t."
+  },
+  "error.organization.404.list_item.3": {
+    "message": "A szervezet törölve lehetett a Modrinth moderációs csapata által, amiért megsértette a <tou-link>Terms of Use</tou-link>-t."
+  },
+  "error.organization.404.list_title": {
+    "message": "Miért?"
+  },
+  "error.organization.404.title": {
+    "message": "Szervezet nem található"
+  },
+  "error.project.404.list_item.1": {
+    "message": "Rosszul írhattad a projekt URL címét."
+  },
+  "error.project.404.list_item.2": {
+    "message": "A projekt lészítője megváltoztathatta az URL címet, vagy a projektet privátta tette, esetleg ki is törölte."
+  },
+  "error.project.404.list_item.3": {
+    "message": "A projekt valószínűleg le lett törölve a Modrinth moderációs csapat által, amiért megsértette a <tou-link>Terms of Use</tou-link>-t."
+  },
+  "error.project.404.list_title": {
+    "message": "Miért?"
+  },
+  "error.project.404.title": {
+    "message": "Projekt nem található"
+  },
+  "error.user.404.list_item.1": {
+    "message": "Rosszul írhattad a felhasználó nevét."
+  },
+  "error.user.404.list_item.2": {
+    "message": "A felhasználó megváltoztathatta a nevét, vagy törölhette fiókját."
+  },
+  "error.user.404.list_item.3": {
+    "message": "A felhasználó fiókja fel lehet függesztve, amiért megsértette a Modrinth <tou-link>Terms of Use</tou-link>-t."
+  },
+  "error.user.404.list_title": {
+    "message": "Miért?"
+  },
+  "error.user.404.title": {
+    "message": "Felhasználó nem található"
+  },
+  "frog": {
+    "message": "Békázva lettél!🐸🐸"
+  },
+  "frog.altText": {
+    "message": "Egy fotórealisztikus festmény egy béka labirintusról"
+  },
+  "frog.froggedPeople": {
+    "message": "{count, plural, one {{count} more person} other {{count} more people}} is békázva lett!🐸🐸"
+  },
+  "frog.sinceOpened": {
+    "message": "Ez a lap {ago} lett megnyitva"
+  },
+  "frog.title": {
+    "message": "Béka"
+  },
+  "landing.button.discover-mods": {
+    "message": "Modok felfedezése"
+  },
+  "landing.button.go-to-dashboard": {
+    "message": "Vissza a főoldalra"
+  },
+  "landing.creator.feature.constantly-evolving.description": {
+    "message": "Kapd meg a legjobb modolási élményt folyamatos frissítésekkel a Modrinth csapattól"
+  },
+  "landing.creator.feature.constantly-evolving.title": {
+    "message": "Folyamatos Változás"
+  },
+  "landing.creator.feature.discovery.title": {
+    "message": "Felfedezés"
+  },
+  "landing.heading.the-place-for-minecraft.plugins": {
+    "message": "pluginok"
+  },
+  "landing.heading.the-place-for-minecraft.resource-packs": {
+    "message": "forráscsomagok"
+  },
+  "landing.heading.the-place-for-minecraft.servers": {
+    "message": "szerverek"
+  },
+  "landing.launcher.atlauncher-label": {
+    "message": "ATLauncher"
+  },
+  "landing.launcher.modrinth-app-label": {
+    "message": "Modrinth App"
+  },
+  "landing.launcher.prism-launcher-label": {
+    "message": "Prism Launcher"
+  },
+  "landing.notifications.has-been-updated": {
+    "message": "{title} frissítve lett!"
+  },
+  "landing.notifications.heading": {
+    "message": "Értesítések"
+  },
+  "landing.notifications.received-time": {
+    "message": "Kaptad {time} óta"
+  },
+  "landing.notifications.version-released": {
+    "message": "Egy új verzió {version} kijött erre: {gameVersion}"
+  },
+  "landing.search.label": {
+    "message": "Keresés"
+  },
+  "landing.search.placeholder": {
+    "message": "Keresés..."
+  },
+  "landing.search.sort-by.label": {
+    "message": "Rendezés"
+  },
+  "landing.section.for-creators.label": {
+    "message": "Készítőknek"
+  },
+  "landing.section.for-players.label": {
+    "message": "Játékosoknak"
+  },
   "layout.action.change-theme": {
     "message": "Kinézet"
   },
+  "layout.action.create-new": {
+    "message": "Új létrehozása..."
+  },
+  "layout.action.file-lookup": {
+    "message": "Fájl keresés"
+  },
+  "layout.action.lookup-by-email": {
+    "message": "Email alapján keresés"
+  },
+  "layout.action.manage-server-notices": {
+    "message": "Szerver megjegyzések kezelése"
+  },
+  "layout.action.new-collection": {
+    "message": "Új gyűjtemény"
+  },
+  "layout.action.new-organization": {
+    "message": "Új Szervezet"
+  },
+  "layout.action.new-project": {
+    "message": "Új projekt"
+  },
+  "layout.action.reports": {
+    "message": "Jelentések"
+  },
+  "layout.action.review-projects": {
+    "message": "Projektek átnézése"
+  },
+  "layout.avatar.alt": {
+    "message": "Avatárod"
+  },
+  "layout.banner.account-action": {
+    "message": "Fiók akció szükséges"
+  },
+  "layout.banner.add-email.button": {
+    "message": "Nézze meg fiókbeállításait"
+  },
+  "layout.banner.add-email.description": {
+    "message": "Biztonsági okok miatt, Modrinthen kell egy email cím a fiókodhoz."
+  },
+  "layout.banner.staging.title": {
+    "message": "A Modrinth színreviteli környezetét nézed"
+  },
+  "layout.banner.subscription-payment-failed.button": {
+    "message": "Számlázási információ frissítése"
+  },
+  "layout.banner.subscription-payment-failed.title": {
+    "message": "Számlázási akció szükséges."
+  },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Támogatással való kapcsolatba lépés"
+  },
   "layout.footer.about": {
     "message": "Rólunk"
   },
+  "layout.footer.about.careers": {
+    "message": "Karrierek"
+  },
   "layout.footer.about.changelog": {
     "message": "Változtatások"
   },
+  "layout.footer.about.news": {
+    "message": "Hírek"
+  },
+  "layout.footer.about.rewards-program": {
+    "message": "Jutalom program"
+  },
+  "layout.footer.about.status": {
+    "message": "Státusz"
+  },
   "layout.footer.legal": {
     "message": "Jogi megjegyzések"
   },
+  "layout.footer.legal-disclaimer": {
+    "message": "NEM HIVATALOS MINECRAFT SZOLGÁLTATÁS. A MOJANG VAGY MICROSOFT NEM HAGYTA JÓVÁ, ÉS NEM PARTNERÜK."
+  },
+  "layout.footer.products.app": {
+    "message": "Modrinth App"
+  },
+  "layout.footer.products.plus": {
+    "message": "Modrinth+"
+  },
+  "layout.footer.products.servers": {
+    "message": "Modrinth Servers"
+  },
   "layout.footer.resources": {
     "message": "Források"
   },
+  "layout.footer.resources.api-docs": {
+    "message": "API dokumentáció"
+  },
   "layout.footer.social.discord": {
     "message": "Discord"
   },
   "layout.footer.social.github": {
     "message": "GitHub"
   },
+  "layout.footer.social.mastodon": {
+    "message": "Mastodon"
+  },
+  "layout.footer.social.x": {
+    "message": "X"
+  },
+  "layout.menu-toggle.action": {
+    "message": "Menü ki-be"
+  },
   "moderation.page.reports": {
     "message": "Jelentések"
   },
   "moderation.sort.by": {
     "message": "Rendezés"
   },
+  "profile.details.label.email": {
+    "message": "Email"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Kifizetési módok"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "Nem hitelesített email"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "Hitelesített email"
+  },
   "profile.user-id": {
     "message": "Felhasználói ID: {id}"
   },
diff --git a/apps/frontend/src/locales/id-ID/index.json b/apps/frontend/src/locales/id-ID/index.json
index 2b3f840a..355ce69e 100644
--- a/apps/frontend/src/locales/id-ID/index.json
+++ b/apps/frontend/src/locales/id-ID/index.json
@@ -1,4 +1,244 @@
 {
+  "action.cancel": {
+    "message": "Batal"
+  },
+  "action.continue": {
+    "message": "Lanjutkan"
+  },
+  "admin.billing.error.not-found": {
+    "message": "Pengguna tidak ditemukan"
+  },
+  "app-marketing.download.description": {
+    "message": "Aplikasi destop kami tersedia pada semua platform, pilih versi yang Anda inginkan."
+  },
+  "app-marketing.download.download-appimage": {
+    "message": "Unduh Applmage"
+  },
+  "app-marketing.download.download-beta": {
+    "message": "Unduh versi beta"
+  },
+  "app-marketing.download.download-deb": {
+    "message": "Unduh DEB"
+  },
+  "app-marketing.download.download-rpm": {
+    "message": "Unduh RPM"
+  },
+  "app-marketing.download.linux": {
+    "message": "Linux"
+  },
+  "app-marketing.download.linux-disclaimer": {
+    "message": "Modrinth App untuk Linux <issues-link>memiliki isu</issues-link> pada sistem dan konfigurasi tertentu. Bila Modrinth App tidak stabil pada sistem Anda, kami menyarankan Anda untuk mencoba aplikasi lain seperti <prism-link>Prism Launcher</prism-link> untuk mengunduh konten Modrinth dengan mudah."
+  },
+  "app-marketing.download.mac": {
+    "message": "Mac"
+  },
+  "app-marketing.download.options-title": {
+    "message": "Pilihan pengunduhan"
+  },
+  "app-marketing.download.terms": {
+    "message": "Dengan mengunduh Modrinth App, Anda menyetujui <terms-link>Syarat</terms-link> dan <privacy-link>Kebijakan Privasi</privacy-link> kami."
+  },
+  "app-marketing.download.third-party-packages": {
+    "message": "Paket pihak ketiga"
+  },
+  "app-marketing.download.title": {
+    "message": "Unduh Modrinth App (Beta)"
+  },
+  "app-marketing.download.windows": {
+    "message": "Windows"
+  },
+  "app-marketing.features.follow.description": {
+    "message": "Simpan konten yang Anda suka dan dapatkan pembaruan dengan satu klik saja."
+  },
+  "app-marketing.features.follow.title": {
+    "message": "Ikuti proyek"
+  },
+  "app-marketing.features.importing.description": {
+    "message": "Impor semua profil favorit Anda dari peluncur yang telah Anda gunakan sebelumnya, dan mulai penggunaan Modrinth App dalam beberapa saat!"
+  },
+  "app-marketing.features.importing.gdlauncher-alt": {
+    "message": "GDLauncher"
+  },
+  "app-marketing.features.importing.multimc-alt": {
+    "message": "MultiMC"
+  },
+  "app-marketing.features.importing.title": {
+    "message": "Pengimporan profil"
+  },
+  "app-marketing.features.mod-management.actions": {
+    "message": "Tindakan"
+  },
+  "app-marketing.features.mod-management.byAuthor": {
+    "message": "oleh {author}"
+  },
+  "app-marketing.features.mod-management.description": {
+    "message": "Modrinth mempermudah pengurusan seluruh mod Anda dalam satu tempat. Anda dapat memasang, menghapus, dan memperbarui mod dalam satu klik."
+  },
+  "app-marketing.features.mod-management.installed-mods": {
+    "message": "Mod terpasang"
+  },
+  "app-marketing.features.mod-management.name": {
+    "message": "Nama"
+  },
+  "app-marketing.features.mod-management.search-mods": {
+    "message": "Cari mod"
+  },
+  "app-marketing.features.mod-management.title": {
+    "message": "Pengelolaan mod"
+  },
+  "app-marketing.features.mod-management.version": {
+    "message": "Versi"
+  },
+  "app-marketing.features.offline.description": {
+    "message": "Mainkan mod Anda, baik saat daring maupun luring."
+  },
+  "app-marketing.features.offline.title": {
+    "message": "Mode luring"
+  },
+  "app-marketing.features.open-source.description": {
+    "message": "Peluncur Modrinth sepenuhnya bersumber terbuka. Anda dapat melihat kode sumber pada <github-link>GitHub</github-link> kami!"
+  },
+  "app-marketing.features.open-source.title": {
+    "message": "Sumber terbuka"
+  },
+  "app-marketing.features.performance.activity-monitor": {
+    "message": "Pemantauan aktivitas"
+  },
+  "app-marketing.features.performance.cpu-percent": {
+    "message": "% CPU"
+  },
+  "app-marketing.features.performance.description": {
+    "message": "Modrinth App bekerja lebih baik daripada pengurus mod ternama lainnya, dengan menggunakan hanya 150 MB RAM!"
+  },
+  "app-marketing.features.performance.discord": {
+    "message": "Discord"
+  },
+  "app-marketing.features.performance.good-performance": {
+    "message": "Kinerja baik"
+  },
+  "app-marketing.features.performance.google-chrome": {
+    "message": "Google Chrome"
+  },
+  "app-marketing.features.performance.infinite-mb": {
+    "message": "∞ MB"
+  },
+  "app-marketing.features.performance.infinite-times-infinite-mb": {
+    "message": "∞ * ∞ MB"
+  },
+  "app-marketing.features.performance.less-than-150mb": {
+    "message": "< 150 MB"
+  },
+  "app-marketing.features.performance.modrinth-app": {
+    "message": "Modrinth App"
+  },
+  "app-marketing.features.performance.one-billion-percent": {
+    "message": "1 miliar %"
+  },
+  "app-marketing.features.performance.process-name": {
+    "message": "Nama proses"
+  },
+  "app-marketing.features.performance.ram": {
+    "message": "RAM"
+  },
+  "app-marketing.features.performance.small": {
+    "message": "Kecil"
+  },
+  "app-marketing.features.performance.title": {
+    "message": "Berkinerja"
+  },
+  "app-marketing.features.play.description": {
+    "message": "Gunakan Modrinth App untuk mengunduh dan memainkan mod dan paket mod favorit Anda."
+  },
+  "app-marketing.features.play.title": {
+    "message": "Mainkan mod favorit Anda"
+  },
+  "app-marketing.features.sharing.description": {
+    "message": "Buat, bagikan, dan mainkan paket mod dengan berbagai pilihan mod dan paket mod yang dibagikan di Modrinth."
+  },
+  "app-marketing.features.sharing.modpack": {
+    "message": "Paket Mod"
+  },
+  "app-marketing.features.sharing.share-button": {
+    "message": "Bagikan"
+  },
+  "app-marketing.features.sharing.title": {
+    "message": "Bagikan paket mod"
+  },
+  "app-marketing.features.unlike-any-launcher": {
+    "message": "Tidak seperti peluncur lain"
+  },
+  "app-marketing.features.website.description": {
+    "message": "Modrinth App berintegrasi penuh dengan situs web, sehingga Anda dapat mengakses semua proyek favorit Anda dari aplikasi!"
+  },
+  "app-marketing.features.website.title": {
+    "message": "Integrasi situs web"
+  },
+  "app-marketing.features.youve-used-before": {
+    "message": "yang pernah Anda gunakan"
+  },
+  "app-marketing.hero.app-screenshot-alt": {
+    "message": "Tangkapan layar dari Modrinth App dengan pemasangan Cobblemon dibuka pada halaman 'Konten'."
+  },
+  "app-marketing.hero.description": {
+    "message": "Modrinth App adalah peluncur unik dan bersumber terbuka yang memperbolehkan Anda untuk memainkan mod-mod favorit Anda dan memastikannya diperbarui, semuanya dalam satu kemasan ringkas."
+  },
+  "app-marketing.hero.download-button": {
+    "message": "Unduh Modrinth App"
+  },
+  "app-marketing.hero.download-modrinth-app": {
+    "message": "Unduh Modrinth App"
+  },
+  "app-marketing.hero.download-modrinth-app-for-os": {
+    "message": "Unduh Modrinth App untuk {os}"
+  },
+  "app-marketing.hero.minecraft-screenshot-alt": {
+    "message": "Tangkapan layar menu utama pemasangan Cobblemon."
+  },
+  "app-marketing.hero.more-download-options": {
+    "message": "Pilihan Pengunduhan Lainnya"
+  },
+  "auth.authorize.action.authorize": {
+    "message": "Sahkan"
+  },
+  "auth.authorize.action.decline": {
+    "message": "Tolak"
+  },
+  "auth.authorize.app-info": {
+    "message": "<strong>{appName}</strong> oleh <creator-link>{creator}</creator-link> akan dapat:"
+  },
+  "auth.authorize.authorize-app-name": {
+    "message": "Mengesahkan {appName}"
+  },
+  "auth.reset-password.method-choice.email-username.placeholder": {
+    "message": "Sur-el"
+  },
+  "auth.reset-password.notification.email-sent.title": {
+    "message": "Sur-el terkirim"
+  },
+  "auth.reset-password.post-challenge.action": {
+    "message": "Atur ulang kata sandi"
+  },
+  "auth.reset-password.post-challenge.confirm-password.label": {
+    "message": "Konfirmasi kata sandi"
+  },
+  "auth.reset-password.title": {
+    "message": "Atur Ulang Kata Sandi"
+  },
+  "auth.reset-password.title.long": {
+    "message": "Atur ulang kata sandi Anda"
+  },
+  "auth.sign-in.email-username.label": {
+    "message": "Sur-el atau nama pengguna"
+  },
+  "auth.sign-in.password.label": {
+    "message": "Kata sandi"
+  },
+  "auth.sign-up.email.label": {
+    "message": "Sur-el"
+  },
+  "auth.sign-up.label.username": {
+    "message": "Nama pengguna"
+  },
   "frog": {
     "message": "Anda terkodok-kodok!🐸"
   }
diff --git a/apps/frontend/src/locales/id-ID/meta.json b/apps/frontend/src/locales/id-ID/meta.json
index 8f8735b1..16e77dc8 100644
--- a/apps/frontend/src/locales/id-ID/meta.json
+++ b/apps/frontend/src/locales/id-ID/meta.json
@@ -5,6 +5,6 @@
 	},
 	"searchTerms": {
 		"description": "Please provide additional search terms associated with the language, if needed, to enhance the search functionality (e.g., American English, Deutschland). Each search term should be entered on a separate line. Translate as a hyphen (-) if no additional terms are needed.",
-		"message": "Indonesia\nBahasa Indonesia"
+		"message": "Indonesia\nBahasa Indonesia\nIndonesian\nIND\nID"
 	}
 }
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index 9e6c225a..7f9cad96 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -578,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "Le tue raccolte"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Scarica {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "Il tuo modulo fiscale {formType} è stato inviato con successo!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Ora puoi nuovamente ritirare denaro. Se hai altre domande o devi aggiornare le tue informazioni <support-link>contatta l'assistenza</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Tutto fatto! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Entità estera fa riferimento a un'entità commerciale stabilita fuori dagli Stati Uniti (per esempio società, partenariati, o LLC non statunitensi)."
   },
@@ -912,11 +924,20 @@
     "message": "Completa il modulo fiscale"
   },
   "layout.banner.tax.description": {
-    "message": "Hai già ritirato oltre $600 da Modrinth quest'ano. Per essere in regola con le norme fiscali devi completare un modulo fiscale. I tuoi prelievi saranno sospesi finché questo modulo sarà inviato."
+    "message": "Hai già ritirato oltre $600 da Modrinth quest'anno. Per essere in regola con le norme fiscali devi completare un modulo fiscale. I tuoi prelievi saranno sospesi finché questo modulo sarà inviato."
   },
   "layout.banner.tax.title": {
     "message": "Modulo fiscale obbligatorio"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Contatta assistenza"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "I tuoi prelievi sono temporaneamente bloccati perché il tuo TIN o SSN non corrispondono ai registri dell'IRS. Si prega di contattare l'assistenza per resettare e reinviare il tuo modulo fiscale."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Modulo fiscale fallito"
+  },
   "layout.banner.verify-email.action": {
     "message": "Reinvia email di verifica"
   },
@@ -1091,27 +1112,66 @@
   "moderation.technical.search.placeholder": {
     "message": "Cerca revisioni tecniche..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "Un creatore su Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Un utente di Modrinth."
+  },
   "profile.button.billing": {
     "message": "Gestisci pagamento utente"
   },
+  "profile.button.edit-role": {
+    "message": "Modifica ruolo"
+  },
   "profile.button.info": {
     "message": "Mostra dettagli utente"
   },
   "profile.button.manage-projects": {
     "message": "Gestisci progetti"
   },
+  "profile.details.label.auth-providers": {
+    "message": "Fornitori autenticazione"
+  },
+  "profile.details.label.email": {
+    "message": "Email"
+  },
+  "profile.details.label.has-password": {
+    "message": "Usa una password"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Usa TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Metodi di pagamento"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "Email non verificata"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "Email verificata"
+  },
   "profile.error.not-found": {
     "message": "Utente non trovato"
   },
-  "profile.joined-at": {
-    "message": "Registrato <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Badge"
   },
+  "profile.label.collection": {
+    "message": "Raccolta"
+  },
   "profile.label.details": {
     "message": "Dettagli"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, one {download} other {download}}"
+  },
+  "profile.label.joined": {
+    "message": "Registrazione"
+  },
+  "profile.label.no": {
+    "message": "No"
+  },
   "profile.label.no-collections": {
     "message": "Questo utente non ha raccolte!"
   },
@@ -1127,18 +1187,21 @@
   "profile.label.organizations": {
     "message": "Organizzazioni"
   },
+  "profile.label.projects": {
+    "message": "{count} {count, plural, one {progetto} other {progetti}}"
+  },
+  "profile.label.saving": {
+    "message": "Salvando..."
+  },
+  "profile.label.yes": {
+    "message": "Sì"
+  },
   "profile.meta.description": {
     "message": "Scarica i progetti di {username} su Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - Scarica i progetti di {username} su Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> download del progetto} other {<stat>{count}</stat> download del progetto}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> progetto} other {<stat>{count}</stat> progetti}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> follower del progetto} other {<stat>{count}</stat> follower del progetto}}"
   },
@@ -1865,9 +1928,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Ripristino backup in corso"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Preparando backup per il download"
-  },
   "servers.backups.item.automated": {
     "message": "Automatizzato"
   },
@@ -1877,9 +1937,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Errore nella creazione del backup"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Errore nella preparazione download"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Errore nel ripristino da backup"
   },
@@ -1889,15 +1946,6 @@
   "servers.backups.item.locked": {
     "message": "Bloccato"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Prepara download"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Prova a preparare di nuovo"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Preparando download..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "In coda per backup"
   },
diff --git a/apps/frontend/src/locales/ja-JP/index.json b/apps/frontend/src/locales/ja-JP/index.json
index 7dc85ad5..7f104553 100644
--- a/apps/frontend/src/locales/ja-JP/index.json
+++ b/apps/frontend/src/locales/ja-JP/index.json
@@ -167,12 +167,24 @@
   "app-marketing.features.unlike-any-launcher": {
     "message": "他のランチャーと異なる点"
   },
+  "app-marketing.features.website.description": {
+    "message": "Modrinth Appはウェブサイトと完全に統合されているため、あなたはお気に入りのプロジェクトにアプリからアクセスできます！"
+  },
+  "app-marketing.features.website.title": {
+    "message": "ウェブサイトとの統合"
+  },
   "app-marketing.hero.download-button": {
     "message": "Modrinth アプリをダウンロードする"
   },
   "app-marketing.hero.download-modrinth-app": {
     "message": "Modrinth アプリをダウンロードする"
   },
+  "app-marketing.hero.download-modrinth-app-for-os": {
+    "message": "{os}向けのModrinth Appをダウンロード"
+  },
+  "app-marketing.hero.more-download-options": {
+    "message": "詳細なダウンロード設定"
+  },
   "auth.authorize.action.authorize": {
     "message": "認証"
   },
@@ -398,6 +410,111 @@
   "common.yes": {
     "message": "はい"
   },
+  "create.collection.cancel": {
+    "message": "キャンセル"
+  },
+  "create.collection.create-collection": {
+    "message": "コレクションを作成"
+  },
+  "create.collection.error-title": {
+    "message": "エラーが発生しました"
+  },
+  "create.collection.name-label": {
+    "message": "名前"
+  },
+  "create.collection.name-placeholder": {
+    "message": "コレクション名を入力…"
+  },
+  "create.collection.summary-description": {
+    "message": "1~2文程度のコレクションの説明。"
+  },
+  "create.collection.summary-label": {
+    "message": "概要"
+  },
+  "create.collection.title": {
+    "message": "コレクションを作成中"
+  },
+  "create.limit-alert.contact-support": {
+    "message": "サポートに連絡"
+  },
+  "create.limit-alert.type-organization": {
+    "message": "組織"
+  },
+  "create.limit-alert.type-plural-collection": {
+    "message": "コレクション"
+  },
+  "create.limit-alert.type-plural-organization": {
+    "message": "組織"
+  },
+  "create.limit-alert.type-plural-project": {
+    "message": "プロジェクト"
+  },
+  "create.limit-alert.type-project": {
+    "message": "プロジェクト"
+  },
+  "create.organization.cancel": {
+    "message": "キャンセル"
+  },
+  "create.organization.create-organization": {
+    "message": "組織を作成"
+  },
+  "create.organization.error-title": {
+    "message": "エラーが発生しました"
+  },
+  "create.organization.name-label": {
+    "message": "名前"
+  },
+  "create.organization.name-placeholder": {
+    "message": "組織名を入力…"
+  },
+  "create.organization.summary-label": {
+    "message": "概要"
+  },
+  "create.organization.title": {
+    "message": "組織を作成"
+  },
+  "create.organization.url-label": {
+    "message": "URL"
+  },
+  "create.project.cancel": {
+    "message": "キャンセル"
+  },
+  "create.project.create-project": {
+    "message": "プロジェクトを作成"
+  },
+  "create.project.error-title": {
+    "message": "エラーが発生しました"
+  },
+  "create.project.name-label": {
+    "message": "名前"
+  },
+  "create.project.name-placeholder": {
+    "message": "プロジェクト名を入力…"
+  },
+  "create.project.summary-description": {
+    "message": "1~2文程度のプロジェクトの説明。"
+  },
+  "create.project.summary-label": {
+    "message": "概要"
+  },
+  "create.project.title": {
+    "message": "プロジェクトを作成中"
+  },
+  "create.project.url-label": {
+    "message": "URL"
+  },
+  "create.project.visibility-label": {
+    "message": "公開範囲"
+  },
+  "create.project.visibility-private": {
+    "message": "非公開"
+  },
+  "create.project.visibility-public": {
+    "message": "公開"
+  },
+  "create.project.visibility-unlisted": {
+    "message": "限定公開"
+  },
   "dashboard.collections.button.create-new": {
     "message": "新規作成"
   },
@@ -410,6 +527,12 @@
   "dashboard.collections.long-title": {
     "message": "コレクション"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "ダウンロード {formType}"
+  },
+  "dashboard.creator-tax-form-modal.us-citizen.question": {
+    "message": "あなたはアメリカ国民ですか？"
+  },
   "error.collection.404.list_item.1": {
     "message": "コレクションの URL を誤って入力した可能性があります。"
   },
@@ -482,6 +605,9 @@
   "landing.creator.feature.monetization.title": {
     "message": "収益化"
   },
+  "landing.creator.feature.team-management.description": {
+    "message": "チームメンバーを招待し、役割と権限を簡単に管理しましょう"
+  },
   "landing.creator.feature.team-management.title": {
     "message": "チーム管理"
   },
@@ -521,18 +647,27 @@
   "landing.launcher.atlauncher-label": {
     "message": "ATLauncher"
   },
+  "landing.launcher.modrinth-app-label": {
+    "message": "Modrinth App"
+  },
   "landing.launcher.prism-launcher-label": {
     "message": "Prism Launcher"
   },
   "landing.notifications.heading": {
     "message": "通知"
   },
+  "landing.search.label": {
+    "message": "検索"
+  },
   "landing.search.placeholder": {
     "message": "検索…"
   },
   "landing.search.sort-by.label": {
     "message": "並び替え"
   },
+  "landing.section.for-creators.label": {
+    "message": "クリエーター"
+  },
   "landing.section.for-players.label": {
     "message": "プレイヤー向け"
   },
@@ -554,6 +689,15 @@
   "layout.action.lookup-by-email": {
     "message": "メールで探す"
   },
+  "layout.action.new-collection": {
+    "message": "新規コレクション"
+  },
+  "layout.action.new-organization": {
+    "message": "新規組織"
+  },
+  "layout.action.new-project": {
+    "message": "新規プロジェクト"
+  },
   "layout.avatar.alt": {
     "message": "あなたのアバター"
   },
@@ -641,6 +785,9 @@
   "layout.meta.description": {
     "message": "ModrinthでMinecraftのMOD、プラグイン、データパック、シェーダー、リソースパック、そしてModパックをダウンロードしましょう。Modrinthでは、モダンで使いやすいインターフェースとAPIを使って、プロジェクトを発見したり公開したりできます。"
   },
+  "layout.nav.analytics": {
+    "message": "統計"
+  },
   "layout.nav.home": {
     "message": "ホーム"
   },
diff --git a/apps/frontend/src/locales/ko-KR/index.json b/apps/frontend/src/locales/ko-KR/index.json
index 8bd870bd..f9a1800c 100644
--- a/apps/frontend/src/locales/ko-KR/index.json
+++ b/apps/frontend/src/locales/ko-KR/index.json
@@ -29,6 +29,9 @@
   "app-marketing.download.options-title": {
     "message": "다운로드 옵션"
   },
+  "app-marketing.download.terms": {
+    "message": "Modrinth App을 다운로드하면 <terms-link> 이용 약관</terms-link>과 <privacy-link>개인정보 처리방침</privacy-link>에 동의하는 것으로 간주합니다."
+  },
   "app-marketing.download.third-party-packages": {
     "message": "제3자 패키지"
   },
@@ -38,6 +41,9 @@
   "app-marketing.download.windows": {
     "message": "Windows"
   },
+  "app-marketing.features.importing.description": {
+    "message": "이전에 사용하던 런처의 즐겨찾기 프로필을 불러와, Modrinth App에서 바로 시작해보세요!"
+  },
   "app-marketing.features.importing.multimc-alt": {
     "message": "MultiMC"
   },
@@ -89,6 +95,9 @@
   "app-marketing.features.performance.small": {
     "message": "적음"
   },
+  "app-marketing.features.play.description": {
+    "message": "Modrinth App을 통해 여러분이 좋아하는 모드와 모드팩을 다운로드하고 바로 플레이하세요."
+  },
   "app-marketing.features.sharing.modpack": {
     "message": "모드팩"
   },
@@ -98,6 +107,12 @@
   "app-marketing.features.sharing.title": {
     "message": "모드팩 공유"
   },
+  "app-marketing.features.website.title": {
+    "message": ""
+  },
+  "app-marketing.features.youve-used-before": {
+    "message": "이전에 사용"
+  },
   "auth.authorize.action.authorize": {
     "message": "승인"
   },
@@ -317,6 +332,18 @@
   "collection.title": {
     "message": "{name} - 컬렉션"
   },
+  "create.collection.error-title": {
+    "message": "오류 발생"
+  },
+  "create.collection.summary-description": {
+    "message": "당신의 collection을 문장으로 설명해주세요."
+  },
+  "create.limit-alert.limit-reached": {
+    "message": ""
+  },
+  "create.limit-alert.limit-reached-description": {
+    "message": "{type} 한도 {max}에 도달했습니다. 한도를 늘리려면 고객 지원팀에 문의하세요."
+  },
   "create.limit-alert.type-collection": {
     "message": "컬렉션"
   },
@@ -341,9 +368,15 @@
   "create.organization.create-organization": {
     "message": "조직 만들기"
   },
+  "create.organization.error-title": {
+    "message": "오류 발생"
+  },
   "create.organization.name-label": {
     "message": "이름"
   },
+  "create.organization.ownership-info": {
+    "message": "당신은 이 Organization의 관리자이며, 필요시 다른 멤버를 초대하거나 권한을 이전할 수 있습니다."
+  },
   "create.organization.summary-label": {
     "message": "개요"
   },
@@ -362,9 +395,18 @@
   "create.project.summary-label": {
     "message": "개요"
   },
+  "create.project.summary-placeholder": {
+    "message": "이 프로젝트는 ...을 추가합니다"
+  },
+  "create.project.title": {
+    "message": "프로젝트 생성"
+  },
   "create.project.url-label": {
     "message": "URL"
   },
+  "create.project.visibility-description": {
+    "message": ""
+  },
   "dashboard.collections.button.create-new": {
     "message": "새로 만들기"
   },
@@ -506,6 +548,9 @@
   "landing.search.placeholder": {
     "message": "검색..."
   },
+  "landing.section.for-creators.description": {
+    "message": ""
+  },
   "layout.action.change-theme": {
     "message": "테마 변경"
   },
@@ -683,9 +728,6 @@
   "profile.error.not-found": {
     "message": "사용자를 찾을 수 없습니다"
   },
-  "profile.joined-at": {
-    "message": "<date>{ago}</date> 전에 가입함"
-  },
   "profile.label.badges": {
     "message": "배지"
   },
@@ -713,12 +755,6 @@
   "profile.meta.description-with-bio": {
     "message": "{bio} - Modrinth에서 {username}의 프로젝트 다운로드"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, other {<stat>{count}</stat> 프로젝트 다운로드}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, other {<stat>{count}</stat> 프로젝트}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, other {<stat>{count}</stat> 프로젝트 팔로워}}"
   },
@@ -1208,9 +1244,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "백업 생성에 실패했습니다"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "다운로드 준비를 실패했습니다"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "백업을 복구하는데 실패했습니다"
   },
@@ -1220,15 +1253,6 @@
   "servers.backups.item.locked": {
     "message": "잠김"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "다운로드 준비중"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "다시 시도하기"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "다운로드를 준비하는 중..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "백업 대기열에 추가됨"
   },
diff --git a/apps/frontend/src/locales/ms-Arab/index.json b/apps/frontend/src/locales/ms-Arab/index.json
index 8c49a8fb..840ecfbb 100644
--- a/apps/frontend/src/locales/ms-Arab/index.json
+++ b/apps/frontend/src/locales/ms-Arab/index.json
@@ -578,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "کوليکسي اندا"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "موات تورون {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "بورڠ چوکاي {formType} اندا تله برجاي دهانتر!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "اندا بوليه مڠلوارکن واڠ دڠن بيبس سکارڠ. جک اندا ممڤوڽاءي سوءالن اتاو ڤرلو مڠمس کيني بوتيرن اندا <support-link>هوبوڠي سوکوڠن</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "سلساي! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "اينتيتي اسيڠ برمقصود اينتيتي ڤرنياݢاءن يڠ دأنجورکن دلوار اميريکا شريکت (سڤرتي ڤربادنن⹁ ڤرکوڠسين اتاو LLC بوکن ا.س.)."
   },
@@ -917,6 +929,15 @@
   "layout.banner.tax.title": {
     "message": "بورڠ چوکاي دڤرلوکن"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "هوبوڠي سوکوڠن"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "ڤڠلوارن اندا تله دکونچي بوات سمنتارا وقتو کران TIN اتاو SSN اندا تيدق سڤادن دڠن ريکود IRS. سيلا هوبوڠي سوکوڠن اونتوق منتڤکن سمولا دان مڠهانتر سمولا بورڠ چوکاي اندا."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "بورڠ چوکاي ݢاݢل"
+  },
   "layout.banner.verify-email.action": {
     "message": "هانتر سمولا إي-ميل ڤڠصحن"
   },
@@ -1091,27 +1112,66 @@
   "moderation.technical.search.placeholder": {
     "message": "چاري ڤنيلاين تيکنيکل..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "سأورڠ ڤنچيڤتا Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "سأورڠ ڤڠݢونا Modrinth."
+  },
   "profile.button.billing": {
     "message": "اوروس ڤڠبيلن ڤڠݢونا"
   },
+  "profile.button.edit-role": {
+    "message": "سونتيڠ ڤرانن"
+  },
   "profile.button.info": {
     "message": "ليهت بوتيرن ڤڠݢونا"
   },
   "profile.button.manage-projects": {
     "message": "اوروس ڤروجيک"
   },
+  "profile.details.label.auth-providers": {
+    "message": "ڤڽديا ڤڠصحن"
+  },
+  "profile.details.label.email": {
+    "message": "إي-ميل"
+  },
+  "profile.details.label.has-password": {
+    "message": "ممڤوڽاءي کات لالوان"
+  },
+  "profile.details.label.has-totp": {
+    "message": "ممڤوڽاءي TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "قاعده ڤمبايرن"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "إي-ميل تيدق دصحکن"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "إي-ميل دصحکن"
+  },
   "profile.error.not-found": {
     "message": "ڤڠݢونا تيدق دجومڤاءي"
   },
-  "profile.joined-at": {
-    "message": "تله مڽرتاءي <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "لنچان"
   },
+  "profile.label.collection": {
+    "message": "کوليکسي"
+  },
   "profile.label.details": {
     "message": "بوتيرن"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, other {موات تورون}}"
+  },
+  "profile.label.joined": {
+    "message": "تله مڽرتاءي ڤد"
+  },
+  "profile.label.no": {
+    "message": "تيدق"
+  },
   "profile.label.no-collections": {
     "message": "ڤڠݢونا اين تيدق مميليقي سبارڠ کوليکسي!"
   },
@@ -1127,18 +1187,21 @@
   "profile.label.organizations": {
     "message": "اورݢانيساسي"
   },
+  "profile.label.projects": {
+    "message": "{count} {count, plural, other {ڤروجيک}}"
+  },
+  "profile.label.saving": {
+    "message": "سدڠ مڽيمڤن..."
+  },
+  "profile.label.yes": {
+    "message": "يا"
+  },
   "profile.meta.description": {
     "message": "موات تورون ڤروجيک ميليق {username} دModrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - موات تورون ڤروجيک ميليق {username} دModrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, other {<stat>{count}</stat> موات تورون}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, other {<stat>{count}</stat> ڤروجيک}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, other {<stat>{count}</stat> ڤڠيکوت ڤروجيک}}"
   },
@@ -1865,9 +1928,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "ڤموليهن ساندرن سدڠ دجالنکن"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "سوده مڽدياکن ساندرن اونتوق موات تورون"
-  },
   "servers.backups.item.automated": {
     "message": "داءوتوماتيککن"
   },
@@ -1877,9 +1937,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "ݢاݢل منچيڤتا ساندرن"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "ݢاݢل مڽدياکن موات تورون"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "ݢاݢل مموليهکن درڤد ساندرن"
   },
@@ -1889,15 +1946,6 @@
   "servers.backups.item.locked": {
     "message": "دکونچي"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "سدياکن موات تورون"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "چوبا سدياکن لاݢي"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "سدڠ مڽدياکن موات تورون..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "دالم باريسن اونتوق دساندر"
   },
diff --git a/apps/frontend/src/locales/ms-MY/index.json b/apps/frontend/src/locales/ms-MY/index.json
index bf65dda7..a639277e 100644
--- a/apps/frontend/src/locales/ms-MY/index.json
+++ b/apps/frontend/src/locales/ms-MY/index.json
@@ -578,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "Koleksi anda"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Muat turun {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "Borang cukai {formType} anda telah berjaya dihantar!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Anda boleh mengeluarkan wang dengan bebas sekarang. Jika anda mempunyai soalan atau perlu mengemas kini butiran anda <support-link>hubungi sokongan</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Selesai! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Entiti asing bermaksud entiti perniagaan yang dianjurkan di luar Amerika Syarikat (seperti perbadanan, perkongsian atau LLC bukan AS)."
   },
@@ -917,6 +929,15 @@
   "layout.banner.tax.title": {
     "message": "Borang cukai diperlukan"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Hubungi sokongan"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "Pengeluaran anda telah dikunci buat sementara waktu kerana TIN atau SSN anda tidak sepadan dengan rekod IRS. Sila hubungi sokongan untuk menetapkan semula dan menghantar semula borang cukai anda."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Borang cukai gagal"
+  },
   "layout.banner.verify-email.action": {
     "message": "Hantar semula e-mel pengesahan"
   },
@@ -1091,27 +1112,66 @@
   "moderation.technical.search.placeholder": {
     "message": "Cari penilaian teknikal..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "Seorang pencipta Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Seorang pengguna Modrinth."
+  },
   "profile.button.billing": {
     "message": "Urus pengebilan pengguna"
   },
+  "profile.button.edit-role": {
+    "message": "Sunting peranan"
+  },
   "profile.button.info": {
     "message": "Lihat butiran pengguna"
   },
   "profile.button.manage-projects": {
     "message": "Urus projek"
   },
+  "profile.details.label.auth-providers": {
+    "message": "Penyedia pengesahan"
+  },
+  "profile.details.label.email": {
+    "message": "E-mel"
+  },
+  "profile.details.label.has-password": {
+    "message": "Mempunyai kata laluan"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Mempunyai TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Kaedah pembayaran"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "E-mel tidak disahkan"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "E-mel disahkan"
+  },
   "profile.error.not-found": {
     "message": "Pengguna tidak dijumpai"
   },
-  "profile.joined-at": {
-    "message": "Telah menyertai <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Lencana"
   },
+  "profile.label.collection": {
+    "message": "Koleksi"
+  },
   "profile.label.details": {
     "message": "Butiran"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, other {muat turun}}"
+  },
+  "profile.label.joined": {
+    "message": "Telah menyertai pada"
+  },
+  "profile.label.no": {
+    "message": "Tidak"
+  },
   "profile.label.no-collections": {
     "message": "Pengguna ini tidak memiliki sebarang koleksi!"
   },
@@ -1127,18 +1187,21 @@
   "profile.label.organizations": {
     "message": "Organisasi"
   },
+  "profile.label.projects": {
+    "message": "{count} {count, plural, other {projek}}"
+  },
+  "profile.label.saving": {
+    "message": "Sedang menyimpan..."
+  },
+  "profile.label.yes": {
+    "message": "Ya"
+  },
   "profile.meta.description": {
     "message": "Muat turun projek milik {username} di Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - Muat turun projek milik {username} di Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, other {<stat>{count}</stat> muat turun}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, other {<stat>{count}</stat> projek}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, other {<stat>{count}</stat> pengikut projek}}"
   },
@@ -1865,9 +1928,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Pemulihan sandaran sedang dijalankan"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Sudah menyediakan sandaran untuk muat turun"
-  },
   "servers.backups.item.automated": {
     "message": "Diautomatikkan"
   },
@@ -1877,9 +1937,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Gagal mencipta sandaran"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Gagal menyediakan muat turun"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Gagal memulihkan daripada sandaran"
   },
@@ -1889,15 +1946,6 @@
   "servers.backups.item.locked": {
     "message": "Dikunci"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Sediakan muat turun"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Cuba sediakan lagi"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Sedang menyediakan muat turun..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "Dalam barisan untuk disandar"
   },
diff --git a/apps/frontend/src/locales/nl-NL/index.json b/apps/frontend/src/locales/nl-NL/index.json
index 1ea0b6f0..b2669a3a 100644
--- a/apps/frontend/src/locales/nl-NL/index.json
+++ b/apps/frontend/src/locales/nl-NL/index.json
@@ -1,4 +1,10 @@
 {
+  "action.cancel": {
+    "message": "Annuleren"
+  },
+  "action.continue": {
+    "message": "Doorgaan"
+  },
   "admin.billing.error.not-found": {
     "message": "Gebruiker niet gevonden"
   },
@@ -170,6 +176,9 @@
   "app-marketing.features.youve-used-before": {
     "message": "je hebt het al gezien"
   },
+  "app-marketing.hero.app-screenshot-alt": {
+    "message": "Screenshot van de Modrinth App met een Cobblemon installatie geopend op de 'Content' pagina."
+  },
   "app-marketing.hero.description": {
     "message": "De Modrinth App is een unieke, openbare launcher waarmee je je favoriete mods kunt spelen en up-to-date houden, allemaal in één handig app."
   },
@@ -410,6 +419,153 @@
   "collection.title": {
     "message": "{name} - Collectie"
   },
+  "common.no": {
+    "message": "Nee"
+  },
+  "common.yes": {
+    "message": "Ja"
+  },
+  "create.collection.cancel": {
+    "message": "Annuleren"
+  },
+  "create.collection.collection-info": {
+    "message": "Je nieuwe collectie wordt gemaakt als een publieke collectie met {{count, plural,=0 {geen projecten}one {# project}other {# projecten}}."
+  },
+  "create.collection.create-collection": {
+    "message": "Collectie aanmaken"
+  },
+  "create.collection.error-title": {
+    "message": "Er is een fout opgetreden"
+  },
+  "create.collection.name-label": {
+    "message": "Naam"
+  },
+  "create.collection.name-placeholder": {
+    "message": "Vul collectienaam in"
+  },
+  "create.collection.summary-description": {
+    "message": "Eén of twee zinnen die je collectie beschrijven."
+  },
+  "create.collection.summary-label": {
+    "message": "Samenvatting"
+  },
+  "create.collection.summary-placeholder": {
+    "message": "Dit is een collectie van..."
+  },
+  "create.collection.title": {
+    "message": "Een collectie aanmaken"
+  },
+  "create.limit-alert.approaching-limit": {
+    "message": "{type} limiet is naderend ({current}/{max})"
+  },
+  "create.limit-alert.approaching-limit-description": {
+    "message": "Je staat op het punt het {type} limiet te bereiken, neem contact op met support als je meer dan {max} {typePlural} nodig hebt."
+  },
+  "create.limit-alert.contact-support": {
+    "message": "Neem contact op met support"
+  },
+  "create.limit-alert.limit-reached": {
+    "message": "{type} limiet bereikt"
+  },
+  "create.limit-alert.limit-reached-description": {
+    "message": "Je hebt het {type} limiet bereikt. Neem contact op met support om je limiet te verhogen."
+  },
+  "create.limit-alert.type-collection": {
+    "message": "Collectie"
+  },
+  "create.limit-alert.type-organization": {
+    "message": "Organisatie"
+  },
+  "create.limit-alert.type-plural-collection": {
+    "message": "Collecties"
+  },
+  "create.limit-alert.type-plural-organization": {
+    "message": "Organisaties"
+  },
+  "create.limit-alert.type-plural-project": {
+    "message": "Projecten"
+  },
+  "create.limit-alert.type-project": {
+    "message": "Project"
+  },
+  "create.organization.cancel": {
+    "message": "Annuleren"
+  },
+  "create.organization.create-organization": {
+    "message": "Organisatie aanmaken"
+  },
+  "create.organization.error-title": {
+    "message": "Er is een fout opgetreden"
+  },
+  "create.organization.name-label": {
+    "message": "Naam"
+  },
+  "create.organization.name-placeholder": {
+    "message": "Vul organisatienaam in"
+  },
+  "create.organization.ownership-info": {
+    "message": "Jij wordt de eigenaar van deze organisatie, maar je kan andere leden uitnodigen en het beheer altijd overdragen."
+  },
+  "create.organization.summary-description": {
+    "message": "Eén of twee zinnen die je organisatie beschrijven."
+  },
+  "create.organization.summary-label": {
+    "message": "Samenvatting"
+  },
+  "create.organization.summary-placeholder": {
+    "message": "Een organisatie voor..."
+  },
+  "create.organization.title": {
+    "message": "Een organisatie aanmaken"
+  },
+  "create.organization.url-label": {
+    "message": "URL"
+  },
+  "create.project.cancel": {
+    "message": "Annuleren"
+  },
+  "create.project.create-project": {
+    "message": "Project aanmaken"
+  },
+  "create.project.error-title": {
+    "message": "Er is een fout opgetreden"
+  },
+  "create.project.name-label": {
+    "message": "Naam"
+  },
+  "create.project.name-placeholder": {
+    "message": "Voer projectnaam in..."
+  },
+  "create.project.summary-description": {
+    "message": "Eén of twee zinnen die je project beschrijven."
+  },
+  "create.project.summary-label": {
+    "message": "Samenvatting"
+  },
+  "create.project.summary-placeholder": {
+    "message": "Dit project..."
+  },
+  "create.project.title": {
+    "message": "Een project aanmaken"
+  },
+  "create.project.url-label": {
+    "message": "URL"
+  },
+  "create.project.visibility-description": {
+    "message": "De zichtbaarheid van je project nadat het is goedgekeurd."
+  },
+  "create.project.visibility-label": {
+    "message": "Zichtbaarheid"
+  },
+  "create.project.visibility-private": {
+    "message": "Privé"
+  },
+  "create.project.visibility-public": {
+    "message": "Publiek"
+  },
+  "create.project.visibility-unlisted": {
+    "message": "Niet vermeld"
+  },
   "dashboard.collections.button.create-new": {
     "message": "Maak nieuwe"
   },
@@ -422,6 +578,42 @@
   "dashboard.collections.long-title": {
     "message": "Je collecties"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Download {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "Je {formType} belastingformulier is succesvol verstuurd!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Je bent nu vrij om je geld over te boeken. Als je vragen hebt of je details wilt updaten, neem dan <support-link>contact op met support</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Je bent helemaal klaar! 🎉"
+  },
+  "dashboard.creator-tax-form-modal.entity.description": {
+    "message": "Een buitenlandse entiteit is een bedrijf dat opgericht is buiten de Verenigde Staten (zoals een niet-Amerikaanse onderneming, partnerschap of LLC)"
+  },
+  "dashboard.creator-tax-form-modal.entity.foreign-entity": {
+    "message": "Buitenlandse entiteit"
+  },
+  "dashboard.creator-tax-form-modal.entity.private-individual": {
+    "message": "Particulier"
+  },
+  "dashboard.creator-tax-form-modal.entity.question": {
+    "message": "Ben je een particulier of maak je deel uit van een buitenlandse entiteit?"
+  },
+  "dashboard.creator-tax-form-modal.header": {
+    "message": "Belastingformulier"
+  },
+  "dashboard.creator-tax-form-modal.security.description": {
+    "message": "Modrinth maakt gebruik van de externe leverancier Track1099 om je belastingformulieren veilig te verzamelen en op te slaan. <security-link>Leer hier meer.</security-link>"
+  },
+  "dashboard.creator-tax-form-modal.security.header": {
+    "message": "Veiligheidsmaatregelen"
+  },
+  "dashboard.creator-tax-form-modal.us-citizen.question": {
+    "message": "Ben je een inwoner van de VS?"
+  },
   "error.collection.404.list_item.1": {
     "message": "U heeft mogelijk de URL van de collectie fout ingetypt."
   },
@@ -443,6 +635,12 @@
   "error.generic.404.title": {
     "message": "Pagina niet gevonden"
   },
+  "error.generic.451.subtitle": {
+    "message": "Deze pagina is geblokkeerd om juridische redenen, zoals censuur door de overheid of lopende juridische procedures."
+  },
+  "error.generic.451.title": {
+    "message": "Content niet beschikbaar om juridische redenen"
+  },
   "error.generic.default.list_item.1": {
     "message": "Controleer of Modrinth een storing heeft op onze <status-link>Status pagina</status-link>."
   },
@@ -536,9 +734,15 @@
   "landing.creator.feature.data-statistics.title": {
     "message": "Cijfers en Statistieken "
   },
+  "landing.creator.feature.discovery.description": {
+    "message": "Word ontdekt door duizenden gebruikers door middel van zoekresultaten, onze startpagina, Discord server, en nog veel meer mogelijkheden in de toekomst!"
+  },
   "landing.creator.feature.discovery.title": {
     "message": "Ontdekken"
   },
+  "landing.creator.feature.diverse-ecosystem.description": {
+    "message": "Integreer je build-tools met behulp van Minotaur voor automatische uploads meteen wanneer je een nieuwe versie releaset. "
+  },
   "landing.creator.feature.diverse-ecosystem.title": {
     "message": "Een Diverse Ecosysteem "
   },
@@ -548,15 +752,96 @@
   "landing.creator.feature.monetization.title": {
     "message": "Maak jouw projecten te gelden"
   },
+  "landing.creator.feature.team-management.description": {
+    "message": "Nodig je teamleden uit en beheer rollen en machtigingen eenvoudig"
+  },
   "landing.creator.feature.team-management.title": {
     "message": "Team Beheer"
   },
+  "landing.error.failedToLoadRandomProjects": {
+    "message": "Het is niet gelukt om willekeurige projecten te laden :("
+  },
+  "landing.feature.follow.description": {
+    "message": "Krijg een melding wanneer je favoriete projecten worden bijgewerkt en blijf op de hoogte."
+  },
+  "landing.feature.follow.heading": {
+    "message": "Volg je favoriete projecten"
+  },
+  "landing.feature.launcher.description": {
+    "message": "Modrinth's open-source API biedt launchers diepe integratie met Modrinth. Je kan Modrinth gebruikern via onze <link>eigen app</link> en populaire launchers als ATLauncher, MultiMC, en Prism Launcher."
+  },
+  "landing.feature.launcher.heading": {
+    "message": "Speel via je favoriete launcher"
+  },
+  "landing.feature.search.description": {
+    "message": "Dankzij Modrinth's razendsnelle zoekfunctie en filters vindt je wat je zoekt terwijl je typt."
+  },
+  "landing.feature.search.heading": {
+    "message": "Vind wat je zoekt, snel en eenvoudig"
+  },
+  "landing.heading.the-place-for-minecraft": {
+    "message": "Dé plek voor Minecraft {content}"
+  },
+  "landing.heading.the-place-for-minecraft.data-packs": {
+    "message": "data packs"
+  },
+  "landing.heading.the-place-for-minecraft.modpacks": {
+    "message": "modpacks"
+  },
+  "landing.heading.the-place-for-minecraft.mods": {
+    "message": "mods"
+  },
   "landing.heading.the-place-for-minecraft.plugins": {
     "message": "plugins"
   },
   "landing.heading.the-place-for-minecraft.resource-packs": {
     "message": "bronpakketten"
   },
+  "landing.heading.the-place-for-minecraft.servers": {
+    "message": "servers"
+  },
+  "landing.heading.the-place-for-minecraft.shaders": {
+    "message": "shaders"
+  },
+  "landing.launcher.atlauncher-label": {
+    "message": "ATLauncher"
+  },
+  "landing.launcher.graphic-alt": {
+    "message": "Een vereenvoudigde weergave van een Minecraft venster, met het Mojang Studios logo in Modrinth groen."
+  },
+  "landing.launcher.modrinth-app-label": {
+    "message": "Modrinth App"
+  },
+  "landing.launcher.prism-launcher-label": {
+    "message": "Prism Launcher"
+  },
+  "landing.notifications.heading": {
+    "message": "Meldingen"
+  },
+  "landing.notifications.received-time": {
+    "message": "Ontvangen {time}"
+  },
+  "landing.notifications.version-released": {
+    "message": "Versie {version} is gereleased voor {gameVersion}"
+  },
+  "landing.search.label": {
+    "message": "Zoeken"
+  },
+  "landing.search.placeholder": {
+    "message": "Zoeken..."
+  },
+  "landing.search.sort-by.label": {
+    "message": "Sorteer op"
+  },
+  "landing.section.for-creators.description": {
+    "message": "Geef je creaties een online thuis en bereik een groot publiek met toegewijde spelers."
+  },
+  "landing.section.for-creators.label": {
+    "message": "Voor Creators"
+  },
+  "landing.section.for-creators.tagline": {
+    "message": "Deel je content met de wereld"
+  },
   "layout.action.change-theme": {
     "message": "Thema aanpassen"
   },
@@ -854,9 +1139,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Backup creatie in de werken"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Al aan het voorbereiden van backup voor het downloaden"
-  },
   "servers.backups.item.automated": {
     "message": "Geautomatiseerd"
   },
@@ -866,21 +1148,9 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Maken van back-up mislukt"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Voorbereiden van download mislukt"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Terugzetten van back-up mislukt"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Download voorbereiden"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Voorbereiden opnieuw proberen"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Download voorbereiden..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "Backup in de wachtrij"
   },
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index 8ed852f3..16cd7770 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -578,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "Twoje kolekcje"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Pobierz {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "Twój formularz podatkowy {formType} został pomyślnie przesłany!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Możesz teraz wypłacać bez ograniczeń. Jeżeli masz pytania lub chcesz zaktualizować swoje dane, <support-link>skontaktuj się z obsługą</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Gotowe! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Podmiot zagraniczny oznacza podmiot gospodarczy zorganizowany poza Stanami Zjednoczonymi (na przykład korporacja spoza Stanów Zjednoczonych, spółka osobowa bądź sp. z o.o.)."
   },
@@ -722,9 +734,15 @@
   "landing.creator.feature.data-statistics.title": {
     "message": "Dane i statystyki"
   },
+  "landing.creator.feature.discovery.description": {
+    "message": "Spraw, by tysiące użytkowników mogło znaleźć Twój projekt przez wyszukiwarkę, naszą stronę główną, serwer Discord, i nie tylko!"
+  },
   "landing.creator.feature.discovery.title": {
     "message": "Odkrycie"
   },
+  "landing.creator.feature.diverse-ecosystem.description": {
+    "message": "Integruj swoje narzędzia budowania poprzez Minotaur, by automatycznie aktualizować swoje projekty gdy tylko wydasz nową wersję"
+  },
   "landing.creator.feature.diverse-ecosystem.title": {
     "message": "Zróżnicowany ekosystem"
   },
@@ -836,6 +854,9 @@
   "landing.section.for-players.tagline": {
     "message": "Odkryj ponad {count} kreacji"
   },
+  "landing.subheading": {
+    "message": "Odkrywaj, graj i udostępniaj treści Minecraft poprzez naszą otwartoźródłową platformę, stworzoną dla społeczności."
+  },
   "layout.action.change-theme": {
     "message": "Zmień motyw"
   },
@@ -899,9 +920,24 @@
   "layout.banner.subscription-payment-failed.title": {
     "message": "Wymagana akcja w sprawie płatności."
   },
+  "layout.banner.tax.action": {
+    "message": "Wypełnij formularz podatkowy"
+  },
+  "layout.banner.tax.description": {
+    "message": "Wypłaciłeś/aś ponad 600$ z Modrinth w tym roku. Aby spełnić wymogi podatkowe, musisz wypełnić formularz podatkowy. Twoje wypłaty są spauzowane, aż nie wypełnisz formularza podatkowego."
+  },
   "layout.banner.tax.title": {
     "message": "Wymagany jest formularz podatkowy"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Skontaktuj się z obsługą"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "Twoje wypłaty są tymczasowo zablokowane, ponieważ Twój TIN lub SSN nie pasował do zapisów IRS. Skontaktuj się z obsługą, by resetować i ponownie wysłać Twój formularz podatkowy."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Formularz podatkowy został odrzucony"
+  },
   "layout.banner.verify-email.action": {
     "message": "Wyślij ponownie e-mail weryfikacyjny"
   },
@@ -1076,27 +1112,66 @@
   "moderation.technical.search.placeholder": {
     "message": "Wyszukaj recenzje technologiczne..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "Twórca Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Użytkownik Modrinth."
+  },
   "profile.button.billing": {
     "message": "Zarządzaj rozliczaniem użytkownika"
   },
+  "profile.button.edit-role": {
+    "message": "Edytuj rolę"
+  },
   "profile.button.info": {
     "message": "Otwórz szczegóły użytkownika"
   },
   "profile.button.manage-projects": {
     "message": "Zarządzaj projektami"
   },
+  "profile.details.label.auth-providers": {
+    "message": "Dostawcy uwierzytelniania"
+  },
+  "profile.details.label.email": {
+    "message": "E-mail"
+  },
+  "profile.details.label.has-password": {
+    "message": "Ma hasło"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Ma TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Metody płatności"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "E-mail nie jest zweryfikowany"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "E-mail jest zweryfikowany"
+  },
   "profile.error.not-found": {
     "message": "Nie znaleziono użytkownika"
   },
-  "profile.joined-at": {
-    "message": "Dołączono <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Odznaki"
   },
+  "profile.label.collection": {
+    "message": "Kolekcja"
+  },
   "profile.label.details": {
     "message": "Szczegóły"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, one {pobranie} few {pobrania} other {pobrań}}"
+  },
+  "profile.label.joined": {
+    "message": "Dołączył/a"
+  },
+  "profile.label.no": {
+    "message": "Nie"
+  },
   "profile.label.no-collections": {
     "message": "Ten użytkownik nie ma żadnych kolekcji!"
   },
@@ -1112,18 +1187,21 @@
   "profile.label.organizations": {
     "message": "Organizacje"
   },
+  "profile.label.projects": {
+    "message": "{count} {count, plural, one {projekt} few {projekty} other {projektów}}"
+  },
+  "profile.label.saving": {
+    "message": "Zapisywanie..."
+  },
+  "profile.label.yes": {
+    "message": "Tak"
+  },
   "profile.meta.description": {
     "message": "Pobieraj projekty {username} na Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - Pobieraj projekty {username} na Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> pobranie projektu} few {<stat>{count}</stat> pobrania projektu} other {<stat>{count}</stat> pobrań projektu}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> projekt} other {<stat>{count}</stat> projekty}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> obserwujący projekt} other {<stat>{count}</stat> obserwujących projekt}}"
   },
@@ -1850,9 +1928,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Trwa przywracanie kopii zapasowej"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Już przygotowuję kopię zapasową do pobrania"
-  },
   "servers.backups.item.automated": {
     "message": "Zautomatyzowane"
   },
@@ -1862,9 +1937,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Nie udało się utworzyć kopii zapasowej"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Nie udało się przygotować pliku do pobrania"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Nie udało się przywrócić danych z kopii zapasowej"
   },
@@ -1874,15 +1946,6 @@
   "servers.backups.item.locked": {
     "message": "Zablokowane"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Przygotuj do pobrania"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Spróbuj przygotować ponownie"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Przygotowywanie do pobrania..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "W kolejce do tworzenia kopii zapasowej"
   },
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index 9af35f78..d56e337d 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -273,7 +273,7 @@
     "message": "Senha"
   },
   "auth.sign-in.sign-in-with": {
-    "message": "Entrar com"
+    "message": "Iniciar sessão com"
   },
   "auth.sign-in.title": {
     "message": "Iniciar sessão"
@@ -354,13 +354,13 @@
     "message": "Inscreva-se para receber atualizações sobre o Modrinth"
   },
   "auth.welcome.description": {
-    "message": "Agora você faz parte de uma comunidade incrível de criadores e exploradores que já criam, baixam e se mantêm atualizados com mods incríveis."
+    "message": "Agora você faz parte da incrível comunidade de criadores e exploradores que já estão criando, baixando e acompanhando mods incríveis."
   },
   "auth.welcome.label.tos": {
     "message": "Ao criar uma conta, você concorda com os <terms-link>Termos</terms-link> e a <privacy-policy-link>Política de Privacidade</privacy-policy-link> do Modrinth."
   },
   "auth.welcome.long-title": {
-    "message": "Bem-vindo ao Modrinth!"
+    "message": "Bem-vindo(a) ao Modrinth!"
   },
   "auth.welcome.title": {
     "message": "Bem-vindo"
@@ -578,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "Suas coleções"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Baixar {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "Seu formulário de imposto {formType} foi enviado com sucesso!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Você já pode sacar livremente. Se tiver dúvidas ou precisar atualizar suas informações, <support-link>entre em contato com o suporte</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Tudo pronto! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Uma entidade estrangeira significa uma entidade comercial organizada fora dos Estados Unidos (como uma corporação, parceria ou LLC não americana)."
   },
@@ -723,7 +735,7 @@
     "message": "Dados e estatísticas"
   },
   "landing.creator.feature.discovery.description": {
-    "message": "Faça com que seu projeto seja descoberto por milhares de usuários nas buscas, em nossa página inicial, no servidor de Discord e muitas outras formas que virão no futuro!"
+    "message": "Faça com que seu projeto seja descoberto por milhares de usuários nas buscas, em nossa página inicial, no servidor de Discord e muitas outras formas que chegarão no futuro!"
   },
   "landing.creator.feature.discovery.title": {
     "message": "Descoberta"
@@ -912,11 +924,20 @@
     "message": "Preencha o formulário fiscal"
   },
   "layout.banner.tax.description": {
-    "message": "Você já retirou mais de US$ 600 do Modrinth este ano. Para cumprir as normas fiscais, você precisa preencher um formulário fiscal. Suas retiradas ficarão suspensas até que esse formulário seja enviado."
+    "message": "Você já retirou mais de $600 do Modrinth neste ano. Para cumprir as regras fiscais, é preciso preencher um formulário de impostos. Seus saques ficarão pausados até que o formulário seja enviado."
   },
   "layout.banner.tax.title": {
     "message": "Formulário fiscal necessário"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Contatar suporte"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "Seus saques estão temporariamente bloqueados porque seu TIN ou SSN não corresponde aos registros do IRS. Por favor, entre em contato com o suporte para redefinir e reenviar seu formulário de impostos."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Falha ao enviar formulário de impostos"
+  },
   "layout.banner.verify-email.action": {
     "message": "Reenviar verificação de e-mail"
   },
@@ -1065,7 +1086,7 @@
     "message": "Buscar"
   },
   "layout.nav.upgrade-to-modrinth-plus": {
-    "message": "Atualize para o Modrinth+"
+    "message": "Assinar o Modrinth+"
   },
   "moderation.filter.by": {
     "message": "Filtrar por"
@@ -1091,27 +1112,66 @@
   "moderation.technical.search.placeholder": {
     "message": "Buscar revisões técnicas..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "Um criador Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Usuário comum."
+  },
   "profile.button.billing": {
     "message": "Gerenciar cobrança do usuário"
   },
+  "profile.button.edit-role": {
+    "message": "Editar cargo"
+  },
   "profile.button.info": {
     "message": "Ver detalhes do usuário"
   },
   "profile.button.manage-projects": {
     "message": "Gerenciar projetos"
   },
+  "profile.details.label.auth-providers": {
+    "message": "Provedores de autenticação"
+  },
+  "profile.details.label.email": {
+    "message": "E-mail"
+  },
+  "profile.details.label.has-password": {
+    "message": "Possui senha"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Possui TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Métodos de pagamento"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "E-mail não verificado"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "E-mail verificado"
+  },
   "profile.error.not-found": {
     "message": "Usuário não encontrado"
   },
-  "profile.joined-at": {
-    "message": "Entrou há <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Emblemas"
   },
+  "profile.label.collection": {
+    "message": "Coleção"
+  },
   "profile.label.details": {
     "message": "Detalhes"
   },
+  "profile.label.downloads": {
+    "message": "{count, plural, =0 {Nenhum download} one {{count} download} other {{count} downloads}}\n"
+  },
+  "profile.label.joined": {
+    "message": "Entrou"
+  },
+  "profile.label.no": {
+    "message": "Não"
+  },
   "profile.label.no-collections": {
     "message": "Este usuário não possui coleções!"
   },
@@ -1127,18 +1187,21 @@
   "profile.label.organizations": {
     "message": "Organizações"
   },
+  "profile.label.projects": {
+    "message": "{count, plural, =0 {Nenhum projeto} one {{count} projeto} other {{count} projetos}}"
+  },
+  "profile.label.saving": {
+    "message": "Salvando..."
+  },
+  "profile.label.yes": {
+    "message": "Sim"
+  },
   "profile.meta.description": {
     "message": "Baixe os projetos de {username} no Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} — Baixe os projetos de {username} no Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "“{count, plural, one {<stat>{count}</stat> projeto baixado} other {<stat>{count}</stat> projetos baixados}}”"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> projeto} other {<stat>{count}</stat> projetos}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> seguidor} other {<stat>{count}</stat> seguidores}} do projeto"
   },
@@ -1865,21 +1928,21 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Restauração de backup em andamento"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "O download de um backup já está sendo preparado"
-  },
   "servers.backups.item.automated": {
     "message": "Automatizado"
   },
   "servers.backups.item.creating-backup": {
     "message": "Criando backup..."
   },
+  "servers.backups.item.downloading": {
+    "message": "Baixando"
+  },
+  "servers.backups.item.downloading-backup": {
+    "message": "Baixando backup..."
+  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Falha ao criar um backup"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Falha ao preparar o download"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Falha ao restaurar um backup"
   },
@@ -1889,15 +1952,6 @@
   "servers.backups.item.locked": {
     "message": "Trancado"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Preparar download"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Tente preparar novamente"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Preparando download..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "Na fila para backup"
   },
@@ -2127,7 +2181,7 @@
     "message": "Selecione seu tema de cor preferido para o Modrinth neste dispositivo."
   },
   "settings.display.theme.title": {
-    "message": "Cor do tema"
+    "message": "Tema"
   },
   "settings.language.categories.auto": {
     "message": "Automático"
diff --git a/apps/frontend/src/locales/pt-PT/index.json b/apps/frontend/src/locales/pt-PT/index.json
index 3a2e5865..ef322e6f 100644
--- a/apps/frontend/src/locales/pt-PT/index.json
+++ b/apps/frontend/src/locales/pt-PT/index.json
@@ -893,9 +893,6 @@
   "profile.error.not-found": {
     "message": "Utilizador não encontrado"
   },
-  "profile.joined-at": {
-    "message": "Juntou-se <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Emblemas"
   },
@@ -923,12 +920,6 @@
   "profile.meta.description-with-bio": {
     "message": "{bio} - Transfere os projetos de {username} no Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> transferência do projeto} other {<stat>{count}</stat> transferências do projeto}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> projeto} other {<stat>{count}</stat> projetos}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> seguidor do projeto} other {<stat>{count}</stat> seguidores do projeto}}"
   },
@@ -1646,9 +1637,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Restauro de backup em curso"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Preparação do backup para transferência já em curso"
-  },
   "servers.backups.item.automated": {
     "message": "Automático"
   },
@@ -1658,9 +1646,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Falha a criar backup"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Falha a preparar transferência"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Falha a restaurar do backup"
   },
@@ -1670,15 +1655,6 @@
   "servers.backups.item.locked": {
     "message": "Trancado"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Preparar transferência"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Tenta preparar novamente"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Preparando transferência..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "Na fila para backup"
   },
diff --git a/apps/frontend/src/locales/ro-RO/index.json b/apps/frontend/src/locales/ro-RO/index.json
index 92869ff6..a034388b 100644
--- a/apps/frontend/src/locales/ro-RO/index.json
+++ b/apps/frontend/src/locales/ro-RO/index.json
@@ -578,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "Colecțiile tale"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Descarcă {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "Formularul tău fiscal {formType} a fost trimis cu succes!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Poți retrage liber acum. Dacă ai întrebări sau trebuie să îți actualizezi detaliile, <support-link>contactează suportul</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Totul este pregătit! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "O entitate străină înseamnă o entitate de afaceri organizată în afara Statelor Unite (cum ar fi o corporație, un parteneriat sau un SRL non-SUA)."
   },
@@ -911,9 +923,6 @@
   "layout.banner.tax.action": {
     "message": "Completează formularul fiscal"
   },
-  "layout.banner.tax.description": {
-    "message": "Ai retras deja peste $600 de la Modrinth anul acesta. Pentru a respecta reglementările fiscale, trebuie să completezi un formular fiscal. Retragerile tale sunt puse pe pauză până când acest formular este trimis."
-  },
   "layout.banner.tax.title": {
     "message": "Formular fiscal necesar"
   },
@@ -1094,6 +1103,9 @@
   "profile.button.billing": {
     "message": "Administrează facturarea utilizatorului"
   },
+  "profile.button.edit-role": {
+    "message": "Editează rolul"
+  },
   "profile.button.info": {
     "message": "Vizualizează detaliile utilizatorului"
   },
@@ -1103,9 +1115,6 @@
   "profile.error.not-found": {
     "message": "Utilizatorul nu a fost găsit"
   },
-  "profile.joined-at": {
-    "message": "S-a alăturat în urmă cu <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Insigne"
   },
@@ -1133,12 +1142,6 @@
   "profile.meta.description-with-bio": {
     "message": "{bio} - Descarcă proiectele lui {username} pe Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> descărcare} few {<stat>{count}</stat> descărcări} other {<stat>{count}</stat> de descărcări}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> proiect} few {<stat>{count}</stat> proiecte} other {<stat>{count}</stat> de proiecte}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> urmăritor} other {<stat>{count}</stat> urmăritori}}"
   },
@@ -1865,9 +1868,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Restaurare copie de rezervă în curs"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Se pregătește deja copia de rezervă pentru descărcare"
-  },
   "servers.backups.item.automated": {
     "message": "Automat"
   },
@@ -1877,9 +1877,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Eșec la crearea copiei de rezervă"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Eșec la pregătirea descărcării"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Eșec la restaurarea din copie de rezervă"
   },
@@ -1889,15 +1886,6 @@
   "servers.backups.item.locked": {
     "message": "Blocat"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Pregătește descărcarea"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Încearcă să pregătești din nou"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Se pregătește descărcarea..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "Programat pentru copiere de rezervă"
   },
@@ -2061,34 +2049,34 @@
     "message": "Activați sau dezactivați anumite caracteristici pe acest dispozitiv."
   },
   "settings.display.flags.title": {
-    "message": "Comută funcțiile"
+    "message": "Funcții avansate"
   },
   "settings.display.project-list-layouts.datapack": {
-    "message": "Pagina Pachetelor de Date"
+    "message": "Pagina cu pachete de date"
   },
   "settings.display.project-list-layouts.description": {
     "message": "Selectează aspectul preferat pentru fiecare pagină care afișează liste de proiecte pe acest dispozitiv."
   },
   "settings.display.project-list-layouts.mod": {
-    "message": "Pagina Modurilor"
+    "message": "Pagina cu moduri"
   },
   "settings.display.project-list-layouts.modpack": {
-    "message": "Pagina Pachetelor de Moduri"
+    "message": "Pagina cu pachete de moduri"
   },
   "settings.display.project-list-layouts.plugin": {
-    "message": "Pagina Pluginurilor"
+    "message": "Pagina cu pluginuri"
   },
   "settings.display.project-list-layouts.resourcepack": {
-    "message": "Pagina Pachetelor de Resurse"
+    "message": "Pagina cu pachete de resurse"
   },
   "settings.display.project-list-layouts.shader": {
-    "message": "Pagina Shaderurilor"
+    "message": "Pagina cu shadere"
   },
   "settings.display.project-list-layouts.title": {
     "message": "Aspectul listelor de proiecte"
   },
   "settings.display.project-list-layouts.user": {
-    "message": "Pagini de profil ale utilizatorilor"
+    "message": "Paginile de profil ale utilizatorului"
   },
   "settings.display.project-list.layouts.collection": {
     "message": "Colecție"
@@ -2100,10 +2088,10 @@
     "message": "Redare avansată"
   },
   "settings.display.sidebar.external-links-new-tab.description": {
-    "message": "Deschide linkurile externe de pe Modrinth într-un tab nou. Indiferent de această setare, linkurile de pe același domeniu și din descrierile Markdown se vor deschide în același tab, iar linkurile din reclame și paginile de editare se vor deschide într-un tab nou."
+    "message": "Deschide linkurile externe de pe Modrinth într-o pagină nouă. Indiferent de această setare, linkurile de pe același domeniu și din descrierile Markdown se vor deschide în aceeași pagină, iar linkurile din reclame și paginile de editare se vor deschide într-o pagină nouă."
   },
   "settings.display.sidebar.external-links-new-tab.title": {
-    "message": "Deschide linkurile externe într-un tab nou"
+    "message": "Deschide linkurile externe într-o pagină nouă"
   },
   "settings.display.sidebar.hide-app-promos.description": {
     "message": "Ascunde butoanele \"Descarcă Modrinth App\" din navigarea principală. Pagina aplicației Modrinth poate fi găsită în continuare pe pagina de destinație sau în subsol."
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index a2a9bcbf..47fded6d 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -108,7 +108,7 @@
     "message": "% ЦП"
   },
   "app-marketing.features.performance.description": {
-    "message": "Modrinth App работает лучше многих популярных лаунчеров, используя лишь 150 МБ ОЗУ!"
+    "message": "Modrinth App работает лучше многих популярных Launchers, используя лишь 150 МБ ОЗУ!"
   },
   "app-marketing.features.performance.discord": {
     "message": "Discord"
@@ -258,7 +258,7 @@
     "message": "Введите код двухфакторной аутентификации."
   },
   "auth.sign-in.2fa.label": {
-    "message": "Введите код двухфакторной аутентификации"
+    "message": "Введите код двухкратной  аутентификации"
   },
   "auth.sign-in.2fa.placeholder": {
     "message": "Введите код..."
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "Скрыт"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Создать ссылку"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Ошибка загрузки партнёрских ссылок"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Партнёрские ссылки"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Партнёрский код `{id}` будет удалён навсегда, и все связанные с ним ссылки станут недействительными."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Удалить"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "Вы действительно хотите удалить партнёрскую ссылку «{title}»?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Поиск ссылок..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "Создать"
   },
@@ -578,6 +599,18 @@
   "dashboard.collections.long-title": {
     "message": "Ваши коллекции"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Скачать {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "Налоговая форма {formType} успешно отправлена!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Средства можно выводить. По вопросам и для обновления данных <support-link>обращайтесь в поддержку</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Готово! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Иностранная организация означает коммерческую организацию, созданную за пределами Соединённых Штатов (например, иностранную компанию, партнёрство или ООО)."
   },
@@ -591,10 +624,10 @@
     "message": "Вы физическое лицо или из иностранной организации?"
   },
   "dashboard.creator-tax-form-modal.header": {
-    "message": "Налоговая декларация"
+    "message": "Налоговая форма"
   },
   "dashboard.creator-tax-form-modal.security.description": {
-    "message": "Modrinth использует стороннего поставщика Track1099 для безопасного сбора и хранения налоговых деклараций. <security-link>Подробнее...</security-link>"
+    "message": "Modrinth использует стороннего поставщика Track1099 для безопасного сбора и хранения налоговых форм. <security-link>Подробнее...</security-link>"
   },
   "dashboard.creator-tax-form-modal.security.header": {
     "message": "Меры безопасности"
@@ -711,7 +744,7 @@
     "message": "Перейти в панель управления"
   },
   "landing.creator.feature.constantly-evolving.description": {
-    "message": "Получайте лучший опыт моддинга с постоянными обновлениями от команды Modrinth"
+    "message": "Получайте лучший опыт Modrinth с постоянными обновлениями от команды Modrinth"
   },
   "landing.creator.feature.constantly-evolving.title": {
     "message": "Постоянное развитие"
@@ -756,10 +789,10 @@
     "message": "Следите за тем, что нравится"
   },
   "landing.feature.launcher.description": {
-    "message": "Наш открытый API позволяет глубже интегрироваться с Modrinth — используйте <link>наше приложение</link> или сторонние лаунчеры наподобие ATLauncher, MultiMC и Prism Launcher."
+    "message": "Наш открытый API позволяет глубже интегрироваться с Modrinth — используйте <link>наше приложение</link> или сторонние Launchers наподобие ATLauncher, MultiMC и Prism Launcher."
   },
   "landing.feature.launcher.heading": {
-    "message": "Играйте с вашим любимым лаунчером"
+    "message": "Играйте с вашим любимым launcher"
   },
   "landing.feature.search.description": {
     "message": "Мгновенный поиск и мощные фильтры Modrinth позволяют находить контент уже во время ввода."
@@ -768,10 +801,10 @@
     "message": "Ищите нужное быстро и легко"
   },
   "landing.heading.the-place-for-minecraft": {
-    "message": "Место для Minecraft {content}"
+    "message": "Место Minecraft {content}"
   },
   "landing.heading.the-place-for-minecraft.data-packs": {
-    "message": "датапаков"
+    "message": "Дата паков"
   },
   "landing.heading.the-place-for-minecraft.modpacks": {
     "message": "сборок"
@@ -783,7 +816,7 @@
     "message": "плагинов"
   },
   "landing.heading.the-place-for-minecraft.resource-packs": {
-    "message": "наборов ресурсов"
+    "message": "Наборов ресурсов"
   },
   "landing.heading.the-place-for-minecraft.servers": {
     "message": "серверов"
@@ -804,7 +837,7 @@
     "message": "Prism Launcher"
   },
   "landing.notifications.has-been-updated": {
-    "message": "{title} обновлён!"
+    "message": "{title} Обновлён!"
   },
   "landing.notifications.heading": {
     "message": "Уведомления"
@@ -813,7 +846,7 @@
     "message": "Получено {time}"
   },
   "landing.notifications.version-released": {
-    "message": "Выпущена версия {version} для {gameVersion}"
+    "message": "Выпущена версия {version} была выпущена  {gameVersion}"
   },
   "landing.search.label": {
     "message": "Поиск"
@@ -857,6 +890,9 @@
   "layout.action.lookup-by-email": {
     "message": "Поиск по почте"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Партнёрские ссылки"
+  },
   "layout.action.manage-server-notices": {
     "message": "Оповещения серверов"
   },
@@ -888,13 +924,13 @@
     "message": "В целях безопасности Modrinth просит вас привязать электронный адрес к учётной записи."
   },
   "layout.banner.build-fail.description": {
-    "message": "При развёртывании фронтенда Modrinth не удалось сгенерировать состояние от API. Причиной может быть временный сбой или неверная настройка. Повторите сборку, когда API будет доступен. Коды ошибок: {errors}; Текущий URL-адрес API: {url}"
+    "message": "При развёртывании фронтона Modrinth не удалось сгенерировать состояние от API. Причиной может быть временный сбой или неверная настройка. Повторите сборку, когда API будет доступен. Коды ошибок: {errors}; Текущий URL-адрес API: {url}"
   },
   "layout.banner.build-fail.title": {
     "message": "Ошибка генерации состояния от API во время сборки."
   },
   "layout.banner.staging.description": {
-    "message": "Тестовая среда полностью отделена от основной базы данных Modrinth и нужна для тестирования и отладки. Фронтенд и бэкенд здесь могут быть новее, чем на основном сайте."
+    "message": "Тестовая среда полностью отделена от основной базы данных Modrinth и нужна для тестирования и отладки. Протеид и бекхенд здесь могут быть новее, чем на основном сайте."
   },
   "layout.banner.staging.title": {
     "message": "Вы находитесь в тестовой среде Modrinth"
@@ -909,13 +945,22 @@
     "message": "Требуются действия с платёжными данными."
   },
   "layout.banner.tax.action": {
-    "message": "Заполнить налоговую декларацию"
+    "message": "Заполнить налоговую форму"
   },
   "layout.banner.tax.description": {
-    "message": "В этом году вы вывели уже более $600 из Modrinth. В соответствии с налоговым законодательством необходимо заполнить налоговую декларацию. Вывод средств приостановлен, пока декларация не будет заполнена."
+    "message": "В этом году вы вывели уже более $600 из Modrinth. В соответствии с налоговым законодательством необходимо заполнить налоговую форму. Вывод средств приостановлен, пока форма не будет заполнена."
   },
   "layout.banner.tax.title": {
-    "message": "Требуется налоговая декларация"
+    "message": "Требуется налоговая форма"
+  },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Связаться с поддержкой"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "Вывод средств временно заблокирован — указанный TIN или SSN не совпал с данными IRS. Свяжитесь с поддержкой для повторной отправки формы."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Налоговая форма отклонена"
   },
   "layout.banner.verify-email.action": {
     "message": "Повторно отправить письмо"
@@ -966,7 +1011,7 @@
     "message": "Информация о Modrinth"
   },
   "layout.footer.open-source": {
-    "message": "Modrinth — это проект с <github-link>открытым исходным кодом</github-link>."
+    "message": "Modrinth — <github-link>с открытым кодом</github-link>."
   },
   "layout.footer.products": {
     "message": "Продукты"
@@ -1014,7 +1059,7 @@
     "message": "Меню"
   },
   "layout.meta.description": {
-    "message": "Скачивайте моды, плагины, датапаки, шейдеры, ресурс-паки и сборки для Minecraft на Modrinth. Ищите и публикуйте проекты на Modrinth, используя удобный современный интерфейс и API."
+    "message": "Скачивайте моды, плагины, дата паки, шейдер, ресурс-банки и сборки для Minecraft на Modrinth. Ищите и публикуйте проекты на Modrinth, используя удобный современный интерфейс и API."
   },
   "layout.meta.og-description": {
     "message": "Ищите и публикуйте проекты для Minecraft!"
@@ -1029,7 +1074,7 @@
     "message": "Найти проекты"
   },
   "layout.nav.feature-flags": {
-    "message": "Экспериментальные функции"
+    "message": "Флаги функциональности"
   },
   "layout.nav.get-modrinth-app": {
     "message": "Скачать Modrinth App"
@@ -1091,27 +1136,75 @@
   "moderation.technical.search.placeholder": {
     "message": "Поиск техпроверок..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "Автор на Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Пользователь Modrinth."
+  },
   "profile.button.billing": {
     "message": "Управление платежами"
   },
+  "profile.button.edit-role": {
+    "message": "Изменить роль"
+  },
   "profile.button.info": {
     "message": "Посмотреть подробности"
   },
   "profile.button.manage-projects": {
     "message": "Управление проектами"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Убрать из партнёров"
+  },
+  "profile.button.set-affiliate": {
+    "message": "Сделать партнёром"
+  },
+  "profile.details.label.auth-providers": {
+    "message": "Сервисы входа"
+  },
+  "profile.details.label.email": {
+    "message": "Электронная почта"
+  },
+  "profile.details.label.has-password": {
+    "message": "Есть пароль"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Есть TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Способы оплаты"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "Почта не подтверждена"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "Почта подтверждена"
+  },
   "profile.error.not-found": {
     "message": "Пользователь не найден"
   },
-  "profile.joined-at": {
-    "message": "Присоединился <date>{ago}</date>"
+  "profile.label.affiliate": {
+    "message": "Партнёр"
   },
   "profile.label.badges": {
     "message": "Значки"
   },
+  "profile.label.collection": {
+    "message": "Коллекция"
+  },
   "profile.label.details": {
     "message": "Подробности"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, one {скачивание} few {скачивания} many {скачиваний} other {скачивания}}"
+  },
+  "profile.label.joined": {
+    "message": "Регистрация:"
+  },
+  "profile.label.no": {
+    "message": "Нет"
+  },
   "profile.label.no-collections": {
     "message": "У этого пользователя нет коллекций!"
   },
@@ -1127,18 +1220,21 @@
   "profile.label.organizations": {
     "message": "Организации"
   },
+  "profile.label.projects": {
+    "message": "{count} {count, plural, one {проект} few {проекта} many {проектов} other {проекта}}"
+  },
+  "profile.label.saving": {
+    "message": "Сохранение..."
+  },
+  "profile.label.yes": {
+    "message": "Да"
+  },
   "profile.meta.description": {
     "message": "Скачивайте проекты {username} на Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} — Скачивайте проекты {username} на Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> скачивание} few {<stat>{count}</stat> скачивания} many {<stat>{count}</stat> скачиваний} other {<stat>{count}</stat> скачивания}} у проектов"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> проект} few {<stat>{count}</stat> проекта} many {<stat>{count}</stat> проектов} other {<stat>{count}</stat> проекта}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> подписчик} few {<stat>{count}</stat> подписчика} many {<stat>{count}</stat> подписчиков} other {<stat>{count}</stat> подписчика}} у проектов"
   },
@@ -1521,10 +1617,10 @@
     "message": "Вы уже пожаловались на {title}"
   },
   "report.already-reported-description": {
-    "message": "У вас уже есть открытая жалоба. Если у вас есть дополнительная информация, добавьте её к жалобе."
+    "message": "У вас уже есть открытая жалоба на {item, select, project {этот проект} version {эту версию} user {этого пользователя} other {этот контент}}. Если у вас есть дополнительная информация, добавьте её к жалобе."
   },
   "report.back-to-item": {
-    "message": "Назад"
+    "message": "Вернуться к {item, select, project {проекту} version {версии} user {пользователю} other {контенту}}"
   },
   "report.body.description": {
     "message": "При необходимости прикрепите ссылки и изображения. Пустые и неполные жалобы закрываются без рассмотрения."
@@ -1533,10 +1629,10 @@
     "message": "Добавьте подробности к жалобе"
   },
   "report.checking": {
-    "message": "Проверка..."
+    "message": "Поиск {item, select, project {проекта} version {версии} user {пользователя} other {контента}}..."
   },
   "report.could-not-find": {
-    "message": "Не удалось найти объект жалобы"
+    "message": "Не удалось найти {item, select, project {проект} version {версию} user {пользователя} other {контент}}"
   },
   "report.for.violation": {
     "message": "Нарушение наших <rules-link>правил</rules-link> или <terms-link>условий</terms-link>"
@@ -1578,13 +1674,13 @@
     "message": "На что жаловаться:"
   },
   "report.question.content-id": {
-    "message": "Какой ID у объекта жалобы?"
+    "message": "Какой ID у {item, select, project {проекта} version {версии} user {пользователя} other {контента}}?"
   },
   "report.question.content-type": {
     "message": "На какой тип контента вы жалуетесь?"
   },
   "report.question.report-reason": {
-    "message": "Какое правило Modrinth нарушает объект жалобы?"
+    "message": "Какое правило Modrinth нарушено {item, select, project {этим проектом} version {этой версией} user {этим пользователем} other {этим контентом}}?"
   },
   "report.report-content": {
     "message": "Жалоба модераторам на контент"
@@ -1674,13 +1770,13 @@
     "message": "Изменение организаций"
   },
   "scopes.patCreate.description": {
-    "message": "Создавать персональные токены доступа"
+    "message": "Создавать токены доступа"
   },
   "scopes.patCreate.label": {
     "message": "Создание токенов доступа"
   },
   "scopes.patDelete.description": {
-    "message": "Удалять персональные токены доступа"
+    "message": "Удалять токены доступа"
   },
   "scopes.patDelete.label": {
     "message": "Удаление токенов доступа"
@@ -1692,7 +1788,7 @@
     "message": "Просмотр токенов доступа"
   },
   "scopes.patWrite.description": {
-    "message": "Изменять персональные токены доступа"
+    "message": "Изменять токены доступа"
   },
   "scopes.patWrite.label": {
     "message": "Изменение токенов доступа"
@@ -1865,21 +1961,21 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Выполняется восстановление из резервной копии"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Уже подготавливается резервная копия для скачивания"
-  },
   "servers.backups.item.automated": {
     "message": "Автоматически"
   },
   "servers.backups.item.creating-backup": {
     "message": "Создание резервной копии..."
   },
+  "servers.backups.item.downloading": {
+    "message": "Скачивание"
+  },
+  "servers.backups.item.downloading-backup": {
+    "message": "Скачивание резервной копии..."
+  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Не удалось создать резервную копию"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Не удалось подготовить скачивание"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Не удалось восстановить из резервной копии"
   },
@@ -1889,15 +1985,6 @@
   "servers.backups.item.locked": {
     "message": "Заблокирована"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Подготовить скачивание"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Повторить подготовку"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Подготовка скачивания..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "В очереди на создание"
   },
@@ -1974,7 +2061,7 @@
     "message": "Удалить этот способ оплаты"
   },
   "settings.billing.modal.delete.description": {
-    "message": "Этот способ оплаты будет удалён навсегда. Совсем."
+    "message": "Этот способ оплаты будет удалён навсегда (буквально навсегда)."
   },
   "settings.billing.modal.delete.title": {
     "message": "Вы действительно хотите удалить этот способ оплаты?"
@@ -2067,7 +2154,7 @@
     "message": "Страница наборов данных"
   },
   "settings.display.project-list-layouts.description": {
-    "message": "Выберите предпочитаемый макет для каждой страницы с проектами на этом устройстве."
+    "message": "Выберите макет для каждой страницы с проектами на этом устройстве."
   },
   "settings.display.project-list-layouts.mod": {
     "message": "Страница модов"
@@ -2124,7 +2211,7 @@
     "message": "Отображать боковую панель фильтров поиска справа"
   },
   "settings.display.theme.description": {
-    "message": "Выберите предпочитаемую тему Modrinth на этом устройстве."
+    "message": "Выберите тему для Modrinth на этом устройстве."
   },
   "settings.display.theme.title": {
     "message": "Тема"
@@ -2145,7 +2232,7 @@
     "message": "Результаты поиска"
   },
   "settings.language.description": {
-    "message": "Выберите предпочитаемый язык сайта. Переводы выполнены сообществом <crowdin-link>на Crowdin</crowdin-link>."
+    "message": "Выберите основной язык сайта. Переводы выполнены сообществом <crowdin-link>на Crowdin</crowdin-link>."
   },
   "settings.language.languages.automatic": {
     "message": "Как в системе"
@@ -2175,10 +2262,10 @@
     "message": "Изменение языка сайта может привести к отображению части контента на английском, если перевод недоступен или пока невозможен. Мы всё ещё работаем над системой локализации, поэтому иногда что-то может отображаться неправильно."
   },
   "settings.pats.action.create": {
-    "message": "Создать PAT"
+    "message": "Создать токен доступа"
   },
   "settings.pats.description": {
-    "message": "PAT можно использовать для обращения к API Modrinth. Ознакомьтесь с <doc-link>документацией к Modrinth's API </doc-link>. Их можно создавать и удалять в любое время."
+    "message": "Токены доступа можно использовать для обращения к API Modrinth — ознакомьтесь с <doc-link>документацией по API</doc-link>. Их можно создавать и удалять в любое время."
   },
   "settings.pats.modal.create.action": {
     "message": "Создать токен доступа"
@@ -2193,19 +2280,19 @@
     "message": "Введите название токена..."
   },
   "settings.pats.modal.create.title": {
-    "message": "Создать персональный токен доступа"
+    "message": "Создание персонального токена доступа"
   },
   "settings.pats.modal.delete.action": {
-    "message": "Удалить токен"
+    "message": "Удалить этот токен"
   },
   "settings.pats.modal.delete.description": {
-    "message": "Данное действие навсегда удалит этот токен (ну буквально навсегда)."
+    "message": "Этот токен будет удалён навсегда (буквально навсегда)."
   },
   "settings.pats.modal.delete.title": {
-    "message": "Вы уверены, что хотите удалить данный токен?"
+    "message": "Вы действительно хотите удалить этот токен?"
   },
   "settings.pats.modal.edit.title": {
-    "message": "Редактировать персональный токен доступа"
+    "message": "Изменение персонального токена доступа"
   },
   "settings.pats.token.action.edit": {
     "message": "Изменить токен"
@@ -2214,28 +2301,28 @@
     "message": "Отозвать токен"
   },
   "settings.pats.token.expired-ago": {
-    "message": "Устарел {ago}"
+    "message": "Истёк {ago}"
   },
   "settings.pats.token.expires-in": {
-    "message": "Устареет {inTime}"
+    "message": "Истечёт {inTime}"
   },
   "settings.pats.token.last-used": {
-    "message": "Последнее использование {ago}"
+    "message": "Активность: {ago}"
   },
   "settings.pats.token.never-used": {
-    "message": "Никогда не использовался"
+    "message": "Не использовался"
   },
   "settings.profile.bio.description": {
-    "message": "Небольшое описание, чтобы рассказать всем немного о себе."
+    "message": "Возможность кратко рассказать всем о себе."
   },
   "settings.profile.bio.title": {
-    "message": "Описание"
+    "message": "О себе"
   },
   "settings.profile.description": {
-    "message": "Информация о вашем профиле доступна публично на Modrinth и через <docs-link>Modrinth API</docs-link>."
+    "message": "Информация в вашем профиле доступна публично на Modrinth и через <docs-link>API Modrinth</docs-link>."
   },
   "settings.profile.profile-info": {
-    "message": "Информация профиля"
+    "message": "Информация в профиле"
   },
   "settings.profile.profile-picture.reset": {
     "message": "Сбросить"
@@ -2244,25 +2331,25 @@
     "message": "Изображение профиля"
   },
   "settings.profile.username.description": {
-    "message": "Уникальное имя, не зависящее от регистра, для идентификации вашего профиля."
+    "message": "Уникальное имя для идентификации профиля. Регистр не имеет значения."
   },
   "settings.profile.username.title": {
     "message": "Имя пользователя"
   },
   "settings.sessions.action.revoke-session": {
-    "message": "Удалить сессию"
+    "message": "Завершить сеанс"
   },
   "settings.sessions.created-ago": {
-    "message": "Создан {ago}"
+    "message": "Запущен {ago}"
   },
   "settings.sessions.current-session": {
-    "message": "Текущая сессия"
+    "message": "Текущий сеанс"
   },
   "settings.sessions.description": {
-    "message": "Здесь перечислены все устройства, которые в настоящее время вошли в систему с помощью вашей учетной записи Modrinth. Вы можете выйти из каждого устройства по отдельности.\n\nЕсли вы видите запись, которую не узнаете, выйдите из этого устройства и немедленно измените пароль учетной записи Modrinth."
+    "message": "Ниже представлены все устройства, с которых осуществлён вход в вашу учётную запись Modrinth. Вы можете управлять сеансом каждого из них по отдельности.\n\nЕсли среди них присутствует незнакомое устройство, незамедлительно завершите его сеанс и смените пароль своей учётной записи."
   },
   "settings.sessions.last-accessed-ago": {
-    "message": "Последняя активность {ago}"
+    "message": "Активность: {ago}"
   },
   "settings.sessions.unknown-os": {
     "message": "Неизвестная ОС"
@@ -2274,6 +2361,6 @@
     "message": "Последние новости от Modrinth"
   },
   "ui.latest-news-row.view-all": {
-    "message": "Все новости"
+    "message": "Посмотреть все новости"
   }
 }
diff --git a/apps/frontend/src/locales/ru-RU/languages.json b/apps/frontend/src/locales/ru-RU/languages.json
index 6ab64c16..c473f15a 100644
--- a/apps/frontend/src/locales/ru-RU/languages.json
+++ b/apps/frontend/src/locales/ru-RU/languages.json
@@ -3,7 +3,7 @@
 	"be": "Белорусский",
 	"bg": "Болгарский",
 	"bn": "Бенгальский",
-	"ca": "Каталонский",
+	"ca": "Каталанский",
 	"cs": "Чешский",
 	"da": "Датский",
 	"de": "Немецкий",
@@ -35,9 +35,9 @@
 	"lt": "Литовский",
 	"lv": "Латышский",
 	"ms": "Малайский",
-	"nb": "Норвежский (букмол)",
+	"nb": "Норвежский букмол",
 	"nl": "Нидерландский",
-	"nn": "Норвежский (нюнорск)",
+	"nn": "Норвежский нюнорск",
 	"pes": "Персидский",
 	"pl": "Польский",
 	"pt": "Португальский",
@@ -53,6 +53,6 @@
 	"tt": "Татарский",
 	"uk": "Украинский",
 	"vi": "Вьетнамский",
-	"zh-Hans": "Китайский (упрощенный)",
+	"zh-Hans": "Китайский (упрощённый)",
 	"zh-Hant": "Китайский (традиционный)"
 }
diff --git a/apps/frontend/src/locales/sr-CS/index.json b/apps/frontend/src/locales/sr-CS/index.json
index 0fc3c289..77fff4be 100644
--- a/apps/frontend/src/locales/sr-CS/index.json
+++ b/apps/frontend/src/locales/sr-CS/index.json
@@ -506,9 +506,6 @@
   "profile.error.not-found": {
     "message": "Korisnik nije pronađen"
   },
-  "profile.joined-at": {
-    "message": "Pridružio/la se <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Bedževi"
   },
@@ -536,12 +533,6 @@
   "profile.meta.description-with-bio": {
     "message": "{bio} - Preuzmite projekte korisnika {username} na Modrinthu"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> preuzimanje projekta} few {<stat>{count}</stat> preuzimanja projekta} other {<stat>{count}</stat> preuzimanja projekata}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> projekat} few {<stat>{count}</stat> projekta} other {<stat>{count}</stat> projekata}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> pratilac projekta} few {<stat>{count}</stat> pratioca projekta} other {<stat>{count}</stat> pratilaca projekta}}"
   },
@@ -1016,9 +1007,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Vraćanje iz backupa u toku"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Već se priprema backup za preuzimanje"
-  },
   "servers.backups.item.automated": {
     "message": "Automatski"
   },
@@ -1028,9 +1016,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Neuspešno kreiranje backupa"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Neuspešno pripremanje za preuzimanje"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Neuspešno vraćanje iz backupa"
   },
@@ -1040,15 +1025,6 @@
   "servers.backups.item.locked": {
     "message": "Zaključano"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Pripremi preuzimanje"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Pokušajte ponovo da pripremite"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Pripremanje preuzimanja..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "U redu za backup"
   },
diff --git a/apps/frontend/src/locales/sv-SE/index.json b/apps/frontend/src/locales/sv-SE/index.json
index 51e088dd..247ffedb 100644
--- a/apps/frontend/src/locales/sv-SE/index.json
+++ b/apps/frontend/src/locales/sv-SE/index.json
@@ -407,6 +407,9 @@
   "collection.title": {
     "message": "{name} - samling"
   },
+  "create.organization.summary-label": {
+    "message": "Sammanfattning"
+  },
   "dashboard.collections.button.create-new": {
     "message": "Skapa ny"
   },
@@ -896,9 +899,6 @@
   "profile.error.not-found": {
     "message": "Användare hittades inte"
   },
-  "profile.joined-at": {
-    "message": "Gick med <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "Märken"
   },
@@ -926,12 +926,6 @@
   "profile.meta.description-with-bio": {
     "message": "{bio} - Ladda ned {username}s projekt på Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> nedladdning} other {<stat>{count}</stat> nedladdningar}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> projekt} other {<stat>{count}</stat> projekt}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> följare} other {<stat>{count}</stat> följare}}"
   },
@@ -1457,24 +1451,12 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Misslyckades med att skapa säkerhetskopia"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Misslyckades med att förbereda nerladdning"
-  },
   "servers.backups.item.lock": {
     "message": "Lås"
   },
   "servers.backups.item.locked": {
     "message": "Låst"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Förbered nedladdning"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Försök förbereda igen"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Förbereder nedladdning..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "Köad för säkerhetskopiering"
   },
diff --git a/apps/frontend/src/locales/tl-PH/index.json b/apps/frontend/src/locales/tl-PH/index.json
index e3c901a4..97b5644b 100644
--- a/apps/frontend/src/locales/tl-PH/index.json
+++ b/apps/frontend/src/locales/tl-PH/index.json
@@ -1,6 +1,9 @@
 {
+  "action.cancel": {
+    "message": "Bawiin"
+  },
   "app-marketing.download.description": {
-    "message": "Magagamit ang aming desktop na aplikasyon sa samot-saring plataporma, piliin ang iyong ninanais na bersiyon."
+    "message": "Magagamit ang aming desktop na aplikasyon sa samot-saring batyawan, piliin ang iyong ninanais na bersiyon."
   },
   "app-marketing.download.download-appimage": {
     "message": "Idalamba ang AppImage"
@@ -35,15 +38,54 @@
   "app-marketing.download.windows": {
     "message": "Windows"
   },
+  "app-marketing.features.importing.multimc-alt": {
+    "message": "MultiMC"
+  },
+  "app-marketing.features.mod-management.actions": {
+    "message": "Mga Kilos"
+  },
+  "app-marketing.features.mod-management.description": {
+    "message": "Pinapadali ng Modrinth na pamahalaan ang lahat ng iyong pambago sa iisang pook. Makakakabit, makakaalis, at makakapagsapanahon ng mga pambago sa iisang pindot lang."
+  },
+  "app-marketing.features.mod-management.installed-mods": {
+    "message": "Mga pambagong kinabit"
+  },
+  "app-marketing.features.mod-management.name": {
+    "message": "Pangalan"
+  },
+  "app-marketing.features.mod-management.search-mods": {
+    "message": "Maghanap ng mga pambago"
+  },
   "app-marketing.features.open-source.title": {
     "message": "Bukas na pinagmulan"
   },
+  "app-marketing.features.performance.cpu-percent": {
+    "message": "% CPU"
+  },
+  "app-marketing.features.performance.infinite-mb": {
+    "message": "∞ MB"
+  },
+  "app-marketing.features.performance.less-than-150mb": {
+    "message": "< 150 MB"
+  },
   "app-marketing.features.performance.modrinth-app": {
     "message": "Modrinth App"
   },
+  "app-marketing.features.performance.one-billion-percent": {
+    "message": "1 gatos na %"
+  },
+  "app-marketing.features.performance.ram": {
+    "message": "RAM"
+  },
+  "app-marketing.features.performance.small": {
+    "message": "Maliit"
+  },
   "app-marketing.features.play.description": {
     "message": "Gamitin ang Modrinth App sa pagdalamba at paglaro ng iyong mga paboritong pambago at balot ng pambago."
   },
+  "app-marketing.features.sharing.share-button": {
+    "message": "Ibahagi"
+  },
   "app-marketing.hero.download-button": {
     "message": "Idalamba ang Modrinth App"
   },
@@ -56,9 +98,21 @@
   "app-marketing.hero.more-download-options": {
     "message": "Higit na Pagpipilian sa Pagdalamba"
   },
+  "auth.reset-password.method-choice.email-username.placeholder": {
+    "message": "Dagisulat"
+  },
+  "auth.sign-in.additional-options": {
+    "message": "<forgot-password-link>Nalimutan ang lihim na salita?</forgot-password-link> • <create-account-link>Lumikha ng akawnt</create-account-link>"
+  },
+  "auth.sign-up.email.label": {
+    "message": "Dagisulat"
+  },
   "auth.verify-email.action.account-settings": {
     "message": "Mga kagustuhan sa akawnt"
   },
+  "auth.verify-email.post-verification.description": {
+    "message": "Tagumpay na napatunayan ang tinitirhan ng iyong dagisulat!"
+  },
   "auth.welcome.description": {
     "message": "Bahagi ka na ngayon ng nitong kahanga-hangang pamayanan kabilang sa mga tagalikha at manlalakbay na nagtataguyod, nagdadalamba, at nananatiling napapanahon sa mga nakamamanghang mga pambago."
   },
@@ -71,6 +125,51 @@
   "collection.delete-modal.description": {
     "message": "Habambuhay na matatanggal ang pagtitipong ito. Hindi mababawi ang pagkilos na ito."
   },
+  "collection.error.not-found": {
+    "message": "Hindi mahanap ang pagtitipon"
+  },
+  "collection.label.owner": {
+    "message": "May-ari"
+  },
+  "common.no": {
+    "message": "Hindi"
+  },
+  "common.yes": {
+    "message": "Oo"
+  },
+  "create.collection.cancel": {
+    "message": "Bawiin"
+  },
+  "create.collection.name-label": {
+    "message": "Pangalan"
+  },
+  "create.organization.cancel": {
+    "message": "Bawiin"
+  },
+  "create.organization.name-label": {
+    "message": "Pangalan"
+  },
+  "create.organization.url-label": {
+    "message": "URL"
+  },
+  "create.project.cancel": {
+    "message": "Bawiin"
+  },
+  "create.project.name-label": {
+    "message": "Pangalan"
+  },
+  "create.project.url-label": {
+    "message": "URL"
+  },
+  "create.project.visibility-public": {
+    "message": "Publiko"
+  },
+  "create.project.visibility-unlisted": {
+    "message": "Hindi nakatala"
+  },
+  "dashboard.collections.label.search-input": {
+    "message": "Maghanap sa iyong mga pagtitipon"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Isang kalakalang entidad ang banyagang entidad na nakaayos sa labas ng Nangagkakaisang Banwa (tulod ng di-US na korporasyon, partnership, o LLC)."
   },
@@ -80,17 +179,62 @@
   "dashboard.creator-tax-form-modal.entity.question": {
     "message": "Isa ka bang pribadong indibidwal o parte ng isang banyagang entidad?"
   },
+  "error.collection.404.list_title": {
+    "message": "Bakit?"
+  },
+  "error.generic.default.title": {
+    "message": "Naku!"
+  },
+  "error.organization.404.list_title": {
+    "message": "Bakit?"
+  },
+  "error.project.404.list_title": {
+    "message": "Bakit?"
+  },
+  "error.user.404.list_title": {
+    "message": "Bakit?"
+  },
+  "frog.altText": {
+    "message": "Isang malakatotohanang pagpipinta ng laberintong palaka"
+  },
+  "frog.title": {
+    "message": "Palaka"
+  },
+  "landing.button.discover-mods": {
+    "message": "Magtuklas ng mga pambago"
+  },
+  "landing.button.go-to-dashboard": {
+    "message": "Pumunta sa hapag ng pagsubaybay"
+  },
   "landing.creator.feature.data-statistics.description": {
     "message": "Makatanggap ng detalyadong ulat ng mga pagtingin ng pahina, bilang ng pagdownload, at kinikita"
   },
   "landing.feature.launcher.description": {
     "message": "Binibigyang-daan ng bukas na pinagmulang API ng Modrinth ang mga tagapaglunsad na makadagdag ng malalimang pagsasama sa Modrinth. Maaari mong gamitin ang Modrinth sa <link>aming aplikasyon</link> at sa iilang pinakasikat na mga tagapaglunsad gaya ng ATLauncher, MultiMC, at Prism Launcher."
   },
+  "landing.heading.the-place-for-minecraft": {
+    "message": "Ang pook para sa Minecraft na {content}"
+  },
+  "landing.heading.the-place-for-minecraft.mods": {
+    "message": "mga pambago"
+  },
   "landing.heading.the-place-for-minecraft.resource-packs": {
     "message": "mga balot ng mapagkukunan"
   },
+  "landing.notifications.has-been-updated": {
+    "message": "Naisapanahon ang {title}!"
+  },
+  "landing.search.label": {
+    "message": "Maghanap"
+  },
+  "landing.search.placeholder": {
+    "message": "Maghanap..."
+  },
+  "landing.section.for-players.label": {
+    "message": "Para sa mga Manlalaro"
+  },
   "landing.subheading": {
-    "message": "Magtuklas, maglaro, at magbahagi ng mga kontentong Minecraft sa aming bukas na pinagmulang platapormang ginawa para sa pamayanan."
+    "message": "Magtuklas, maglaro, at magbahagi ng mga kontentong Minecraft sa aming bukas na pinagmulang batyawang ginawa para sa pamayanan."
   },
   "layout.action.create-new": {
     "message": "Gumawa ng bago..."
@@ -98,8 +242,14 @@
   "layout.action.reports": {
     "message": "Mga pag-ulat"
   },
+  "layout.banner.account-action": {
+    "message": "Nangangailangan ng akawnt"
+  },
   "layout.banner.add-email.button": {
-    "message": "Mga kagustuhan sa akawnt"
+    "message": "Bisitahin ang mga kagustuhan sa akawnt"
+  },
+  "layout.banner.add-email.description": {
+    "message": "Dahil sa mga kadahilang pangkaligtasan, kailangan ng Modrinth na makapagrehistro ka ng tinitirhan ng dagisulat sa iyong akawnt."
   },
   "layout.banner.build-fail.description": {
     "message": "Bigong makabuo ng kalagayan galing sa API ang nitong pinakalat na frontend ng Modrinth. Marahil dahil ito sa isang pagkawalan o kamalian sa pagsasaaayos. Muling itayo kapag magagamit na ang API. Mga palahudyatan ng kamalian: {errors}; Ang kasalukuyang URL ng API: {url}"
@@ -107,6 +257,9 @@
   "layout.banner.build-fail.title": {
     "message": "May kamalian sa pagbuo ng katayuan galing sa API habang nagpapatayo."
   },
+  "layout.banner.verify-email.description": {
+    "message": "Dahil sa mga kadahilang pangkaligtasan, kailangan ng Modrinth na mapatunayan ang tinitirhan ng dagisulat sa iyong akawnt."
+  },
   "layout.footer.about": {
     "message": "Tungkol"
   },
@@ -194,6 +347,12 @@
   "layout.meta.description": {
     "message": "Magpasayong sipi ng mga pambago, pansaksak, balot ng malak, tagalilom, balot ng mapagkukunan, at balot ng pambago ng Minecraft sa Modrinth. Tumuklas at maglathala ng mga panukala sa Modrinth na may makabagong, madaling magamit na daungan at API."
   },
+  "layout.nav.home": {
+    "message": "Tirahan"
+  },
+  "layout.nav.search": {
+    "message": "Maghanap"
+  },
   "moderation.page.projects": {
     "message": "Mga Panukala"
   },
@@ -203,14 +362,41 @@
   "moderation.page.technicalReview": {
     "message": "Aghimuing Pagsusuri"
   },
+  "moderation.search.placeholder": {
+    "message": "Maghanap..."
+  },
+  "profile.bio.fallback.creator": {
+    "message": "Isang tagalikha sa Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Isang tagagamit sa Modrinth."
+  },
+  "profile.details.label.email": {
+    "message": "Dagisulat"
+  },
+  "profile.label.badges": {
+    "message": "Tsapa"
+  },
+  "profile.label.joined": {
+    "message": "Sumali"
+  },
+  "profile.label.no": {
+    "message": "Hindi"
+  },
+  "profile.label.yes": {
+    "message": "Oo"
+  },
   "profile.meta.description": {
     "message": "Magdalamba ng mga panukala ni {username} sa Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - Magdalamba ng mga panukala ni {username} sa Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> dalamba ng panukala} other {<stat>{count}</stat> na dalamba ng panukala}}"
+  "project-member-header.accept": {
+    "message": "Tanggapin"
+  },
+  "project-member-header.error": {
+    "message": "Kamalian"
   },
   "project-type.datapack.plural": {
     "message": "Mga Balot ng Malak"
@@ -218,20 +404,38 @@
   "project-type.datapack.singular": {
     "message": "Balot ng Malak"
   },
+  "project-type.mod.plural": {
+    "message": "Mga Pambago"
+  },
+  "project-type.mod.singular": {
+    "message": "Pambago"
+  },
+  "project-type.plugin.singular": {
+    "message": "Pansaksak"
+  },
   "project-type.resourcepack.plural": {
     "message": "Mga Balot ng Mapagkukunan"
   },
   "project-type.resourcepack.singular": {
     "message": "Balot ng Mapagkukunan"
   },
+  "project-type.shader.singular": {
+    "message": "Tagalilom"
+  },
+  "project.about.details.updated": {
+    "message": "Naisapanahon {date}"
+  },
   "project.download.game-version": {
     "message": "Bersiyon ng laro: {version}"
   },
+  "project.download.install-with-app": {
+    "message": "Ikabit gamit ang Modrinth App"
+  },
   "project.download.no-app": {
     "message": "Wala kang Modrinth App?"
   },
   "project.download.platform": {
-    "message": "Plataporma: {platform}"
+    "message": "Batyawan: {platform}"
   },
   "project.download.search-game-versions": {
     "message": "Maghanap ng mga bersiyon ng laro..."
@@ -239,6 +443,9 @@
   "project.download.select-game-version": {
     "message": "Piliin ang lahat ng bersiyon ng laro"
   },
+  "project.download.select-platform": {
+    "message": "Pumili ng batyawan"
+  },
   "project.download.show-all-versions": {
     "message": "Ipakita ang lahat ng bersiyon"
   },
@@ -272,40 +479,112 @@
   "project.settings.environment.notice.review-options.description": {
     "message": "Kakaunlad lang ng aming kaayusan sa Mga Kapaligiran sa Modrinth at magagamit na ngayon ang mga bagong pagpipilian. Mangyaring suriin na tama ang napili sa ibaba at pindutin ang 'Patunayan' kapag tapos ka na!"
   },
+  "project.settings.environment.verification.verify-button": {
+    "message": "Patunayan"
+  },
+  "project.settings.general.name.title": {
+    "message": "Pangalan"
+  },
+  "project.settings.general.url.title": {
+    "message": "URL"
+  },
   "project.settings.title": {
     "message": "Mga Kagustuhan"
   },
   "project.stats.downloads-label": {
     "message": "dalamba {count, plural, one {} other {}}"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Bigong maihanda ang dalamba"
+  "scopes.performAnalytics.description": {
+    "message": "Buhata ang mga kalihokan sa analitika"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Ihanda ang dalamba"
+  "servers.backups.item.lock": {
+    "message": "Ikandado"
   },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Muling subukan ang paghahanda"
+  "servers.backups.item.locked": {
+    "message": "Kinandado"
   },
-  "servers.backups.item.preparing-download": {
-    "message": "Hinahanda ang dalamba..."
+  "servers.backups.item.rename": {
+    "message": "Palitan ang pangalan"
+  },
+  "servers.backups.item.retry": {
+    "message": "Subukan muli"
+  },
+  "servers.backups.item.unlock": {
+    "message": "Buksan"
+  },
+  "servers.notice.actions": {
+    "message": "Mga Kilos"
+  },
+  "servers.notice.begins": {
+    "message": "Magsisimula"
+  },
+  "servers.notice.id": {
+    "message": "ID"
+  },
+  "servers.notice.level": {
+    "message": "Antas"
+  },
+  "servers.plan.large.name": {
+    "message": "Malaki"
+  },
+  "servers.plan.medium.name": {
+    "message": "Katamtaman"
+  },
+  "servers.plan.small.name": {
+    "message": "Maliit"
+  },
+  "settings.billing.payment_method_type.eftpos": {
+    "message": "EFTPOS"
+  },
+  "settings.billing.payment_method_type.jcb": {
+    "message": "JCB"
+  },
+  "settings.billing.payment_method_type.paypal": {
+    "message": "PayPal"
+  },
+  "settings.billing.payment_method_type.unknown": {
+    "message": "Hindi kilalang paraan ng pagbabayad"
+  },
+  "settings.billing.payment_method_type.visa": {
+    "message": "Visa"
   },
   "settings.display.flags.description": {
     "message": "Magpagana o huwag magpagana ng mga tiyak na tampok sa iyong pakasam."
   },
   "settings.display.project-list-layouts.datapack": {
-    "message": "Pahina ng mga Balot ng Malak"
+    "message": "Pahina ng Mga Balot ng Malak"
   },
   "settings.display.project-list-layouts.description": {
-    "message": "Pumili ng iyong ninanais na pag-aayos ng bawat pahinang magpapakita sa mga tala ng panukala sa iyong pakasam."
+    "message": "Pumili ng iyong ninanais na ayos ng bawat pahinang magpapakita sa mga tala ng panukala sa iyong pakasam."
   },
   "settings.display.project-list-layouts.resourcepack": {
-    "message": "Pahina ng mga Balot ng Mapagkukunan"
+    "message": "Pahina ng Mga Balot ng Mapagkukunan"
+  },
+  "settings.display.project-list-layouts.title": {
+    "message": "Mga ayos ng talaan ng panukala"
   },
   "settings.display.theme.description": {
     "message": "Pumili ng iyong gugustohing paksang-kulay para sa Modrinth ng nitong pakasam."
   },
+  "settings.language.languages.search-field.placeholder": {
+    "message": "Maghanap ng wika..."
+  },
+  "settings.pats.modal.create.name.label": {
+    "message": "Pangalan"
+  },
+  "settings.profile.bio.title": {
+    "message": "Talambuhay"
+  },
+  "settings.profile.profile-picture.reset": {
+    "message": "Isauli"
+  },
   "settings.sessions.description": {
     "message": "Narito ang lahat ng mga pakasam na kasalukuyang nakalog-in sa iyong Modrinth account. Maaari mong maisaisang ma-logout ang bawat isa.\n\nKung makakita ka ng isang hindi mo nakikilala, maglog-out sa pakasam na iyon at agarang palitan ang lihim na salita ng iyong akawnt sa Modrinth."
+  },
+  "settings.sessions.unknown-os": {
+    "message": "Hindi kilalang OS"
+  },
+  "settings.sessions.unknown-platform": {
+    "message": "Hindi kilalang batyawan"
   }
 }
diff --git a/apps/frontend/src/locales/tr-TR/index.json b/apps/frontend/src/locales/tr-TR/index.json
index 3eba75b9..19006534 100644
--- a/apps/frontend/src/locales/tr-TR/index.json
+++ b/apps/frontend/src/locales/tr-TR/index.json
@@ -15,7 +15,7 @@
     "message": "AppImage'i indir"
   },
   "app-marketing.download.download-beta": {
-    "message": "Betayı indir"
+    "message": "Beta'yı indir"
   },
   "app-marketing.download.download-deb": {
     "message": "DEB'i indir"
@@ -578,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "Koleksiyonların"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "{formType} İndirin"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "{formType} vergi formunuz başarıyla gönderildi!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Artık özgürce çekim yapabilirsiniz. Sorunuz varsa veya bilgilerinizi güncellemeniz gerekiyorsa <support-link>desteğe başvurun</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Hazırsın! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Yabancı kuruluş, Amerika Birleşik Devletleri dışında kurulmuş bir ticari kuruluş (örneğin, ABD dışı şirket, ortaklık veya LLC) anlamına gelir."
   },
@@ -912,11 +924,20 @@
     "message": "Vergi formunu doldurun"
   },
   "layout.banner.tax.description": {
-    "message": "Bu yıl Modrinth'ten 600 doların üzerinde para çektiniz. Vergi düzenlemelerine uymak için bir vergi formu doldurmanız gerekiyor. Bu form gönderilene kadar para çekme işlemleriniz askıya alınacaktır."
+    "message": "Bu yıl Modrinth'ten 600 dolardan fazla para çektiniz. Vergi düzenlemelerine uymak için bir vergi formu doldurmanız gerekiyor. Bu form gönderilene kadar para çekme işlemleriniz durdurulmuştur."
   },
   "layout.banner.tax.title": {
     "message": "Vergi formu gereklidir"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Destekle iletişime geçin"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "Vergi kimlik numaranız (TIN) veya sosyal güvenlik numaranız (SSN) IRS kayıtlarıyla eşleşmediği için para çekme işlemleriniz geçici olarak kilitlenmiştir. Vergi formunuzu sıfırlamak ve yeniden göndermek için lütfen destek ekibiyle iletişime geçin."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Vergi formu başarısız oldu"
+  },
   "layout.banner.verify-email.action": {
     "message": "Doğrulama e-postasını yeniden gönder"
   },
@@ -1091,27 +1112,66 @@
   "moderation.technical.search.placeholder": {
     "message": "Teknik incelemeleri ara..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "Bir Modrinth içerik üreticisi."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Bir Modrinth kullanıcısı."
+  },
   "profile.button.billing": {
     "message": "Kullanıcı faturasını yönet"
   },
+  "profile.button.edit-role": {
+    "message": "Rolü düzenle"
+  },
   "profile.button.info": {
     "message": "Kullanıcı ayrıntılarını görüntüle"
   },
   "profile.button.manage-projects": {
     "message": "Projeleri yönet"
   },
+  "profile.details.label.auth-providers": {
+    "message": "Kimlik doğrulama sağlayıcıları"
+  },
+  "profile.details.label.email": {
+    "message": "Eposta"
+  },
+  "profile.details.label.has-password": {
+    "message": "Parolayı sıfırla"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Zaman bazlı Tek Seferlik Şifre"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Ödeme yöntemi"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "Eposta doğrulanmadı"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "Eposta doğrulandı"
+  },
   "profile.error.not-found": {
     "message": "Kullanıcı bulunamadı"
   },
-  "profile.joined-at": {
-    "message": "<date>{ago}</date> katıldı"
-  },
   "profile.label.badges": {
     "message": "Rozetler"
   },
+  "profile.label.collection": {
+    "message": "Koleksiyon"
+  },
   "profile.label.details": {
     "message": "Ayrıntılar"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, one {indirme} other {indirme}}"
+  },
+  "profile.label.joined": {
+    "message": "Katıldı"
+  },
+  "profile.label.no": {
+    "message": "Hayır"
+  },
   "profile.label.no-collections": {
     "message": "Bu kullanıcının hiç koleksiyonu yok!"
   },
@@ -1127,18 +1187,21 @@
   "profile.label.organizations": {
     "message": "Organizasyonlar"
   },
+  "profile.label.projects": {
+    "message": "{count}{count, plural, one {proje} other {proje}}"
+  },
+  "profile.label.saving": {
+    "message": "Kaydediliyor..."
+  },
+  "profile.label.yes": {
+    "message": "Evet"
+  },
   "profile.meta.description": {
     "message": "{username} kullanıcısının Modrinth'teki projelerini indir"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - {username} kullanıcısının Modrinth'teki projelerini indir"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> proje indirmesi} other {<stat>{count}</stat> proje indirmesi}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, one {<stat>{count}</stat> proje} other {<stat>{count}</stat> proje}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> proje takipçisi} other {<stat>{count}</stat> proje takipçisi}}"
   },
@@ -1865,9 +1928,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "Yedek geri yükleme devam ediyor"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "Zaten indirmek için yedek hazırlanıyor"
-  },
   "servers.backups.item.automated": {
     "message": "Otomatikleştirilmiş"
   },
@@ -1877,9 +1937,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Yedek oluşturma başarısız"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "İndirmeye hazırlanılamadı"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Yedekten geri yükleme başarısız"
   },
@@ -1889,15 +1946,6 @@
   "servers.backups.item.locked": {
     "message": "Kilitli"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "İndirmeye hazırla"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Tekrar hazırlanmayı dene"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "İndirmeye hazırlanıyor..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "Yedek için sırada"
   },
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index be29c422..cf1c70d4 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -27,7 +27,7 @@
     "message": "Linux"
   },
   "app-marketing.download.linux-disclaimer": {
-    "message": "На версії Modrinth для Linux <issues-link>проблеми</issues-link> на певних системах та налаштуваннях. Якщо Modrinth робить нестабільно на вашому пристрої, ми рекомендуємо спробувати інші додатки, такі як <prism-link>Prism Launcher</prism-link>, щоб легко встановлювати контент Modrinth."
+    "message": "На версії Modrinth App для Linux є <issues-link>відомі проблеми</issues-link> на деяких системах та конфігураціях. Якщо Modrinth App нестабільно працює на вашій системі, ми радимо вам спробувати інші програми, як наприклад <prism-link>Prism Launcher</prism-link> щоб легко встановлювати контент від Modrinth."
   },
   "app-marketing.download.mac": {
     "message": "Mac"
@@ -36,7 +36,7 @@
     "message": "Налаштування завантаження"
   },
   "app-marketing.download.terms": {
-    "message": "Завантажуючи Modrinth, ви погоджуєтеся з <terms-link>Умовами користування</terms-link> та <privacy-link>Політикою конфіденційности</privacy-link>."
+    "message": "Встановлюючи Modrinth, ви погоджуєтесь з <terms-link>Умовами користування</terms-link> та <privacy-link>Політикою конфіденційності</privacy-link>."
   },
   "app-marketing.download.third-party-packages": {
     "message": "Сторонні пакети"
@@ -48,7 +48,7 @@
     "message": "Windows"
   },
   "app-marketing.features.follow.description": {
-    "message": "Зберігайте контент, який вам до вподоби та отримуйте оновлення лише за один клік."
+    "message": "Зберігайте вміст, який вам подобається, та отримуйте оновлення за одне натискання."
   },
   "app-marketing.features.follow.title": {
     "message": "Відстежувати проєкти"
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "Поза списком"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Створити партнерське посилання"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Помилка під час завантаження партнерських посилань"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Ваші партнерські посилання"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Це незворотно відкличе код партнера «{id}» та будь-які наявні посилання з цим кодом, які було оприлюднено, більше не будуть доступні."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Відкликати"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "Ви впевнені, що хочете відкликати своє партнерське посилання «{title}»?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Шукати партнерські посилання…"
+  },
   "dashboard.collections.button.create-new": {
     "message": "Створити нову"
   },
@@ -578,6 +599,18 @@
   "dashboard.collections.long-title": {
     "message": "Ваші добірки"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Завантажити {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "Ваша податкова форма {formType} була успішно надіслана!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Ви можете вивести кошти вже зараз. Якщо у вас залишилися питання або вам треба оновити свої дані, <support-link>зв'яжіться з підтримкою</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Все готово! 🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Закордонна організація означає ділову організацію, організовану за межами США (наприклад, неамериканську корпорацію, партнерство, або ТОВ)."
   },
@@ -857,6 +890,9 @@
   "layout.action.lookup-by-email": {
     "message": "Пошук електронною поштою"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Керувати партнерськими посиланнями"
+  },
   "layout.action.manage-server-notices": {
     "message": "Керування сповіщеннями сервера"
   },
@@ -912,11 +948,20 @@
     "message": "Заповніть податкову форму"
   },
   "layout.banner.tax.description": {
-    "message": "Ви вже вивели більше ніж $600 з Modrinth цього року. Щоб дотримуватися податкових форм, ви маєте заповнити податкову форму. Ваші виведення затримані до поки ця форма не буде заповнена."
+    "message": "Ви вже вивели більше ніж $600 з Modrinth цього року. Щоб дотримуватися податкових зобов’язань, ви маєте заповнити податкову форму. Ваші виведення затримані, доки ця форма не буде заповнена."
   },
   "layout.banner.tax.title": {
     "message": "Вимагано податкову форму"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "Звернутися до підтримки"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "Виведення коштів тимчасово заблоковано, оскільки вказаний TIN або SSN не збігається з IRS. Зверніться до служби підтримки для повторного подання форми."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Податкову форму відхилено"
+  },
   "layout.banner.verify-email.action": {
     "message": "Повторно надіслати електронний лист для підтвердження"
   },
@@ -1091,27 +1136,75 @@
   "moderation.technical.search.placeholder": {
     "message": "Пошук технічних оглядів…"
   },
+  "profile.bio.fallback.creator": {
+    "message": "Творець Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "message": "Користувач Modrinth."
+  },
   "profile.button.billing": {
     "message": "Керувати розрахунками користувача"
   },
+  "profile.button.edit-role": {
+    "message": "Редагувати роль"
+  },
   "profile.button.info": {
     "message": "Переглянути дані користувача"
   },
   "profile.button.manage-projects": {
     "message": "Керувати проєктами"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Усунути як партнера"
+  },
+  "profile.button.set-affiliate": {
+    "message": "Установити як партнера"
+  },
+  "profile.details.label.auth-providers": {
+    "message": "Провайдери автентифікації"
+  },
+  "profile.details.label.email": {
+    "message": "Електронна пошта"
+  },
+  "profile.details.label.has-password": {
+    "message": "Має пароль"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Має TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Способи оплати"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "Електронна пошта не перевірена"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "Електронна пошта перевірена"
+  },
   "profile.error.not-found": {
     "message": "Користувача не знайдено"
   },
-  "profile.joined-at": {
-    "message": "Приєднався <date>{ago}</date>"
+  "profile.label.affiliate": {
+    "message": "Партнер"
   },
   "profile.label.badges": {
     "message": "Значки"
   },
+  "profile.label.collection": {
+    "message": "Добірка"
+  },
   "profile.label.details": {
     "message": "Деталі"
   },
+  "profile.label.downloads": {
+    "message": "{count} завантажен{count, plural, one {ня} few {ня} many {ь} other {ня}}"
+  },
+  "profile.label.joined": {
+    "message": "Приєднався"
+  },
+  "profile.label.no": {
+    "message": "Ні"
+  },
   "profile.label.no-collections": {
     "message": "У цього користувача немає добірок!"
   },
@@ -1127,18 +1220,21 @@
   "profile.label.organizations": {
     "message": "Організації"
   },
+  "profile.label.projects": {
+    "message": "{count} проєкт{count, plural, one {} few {и} many {ів} other {у}}"
+  },
+  "profile.label.saving": {
+    "message": "Збереження…"
+  },
+  "profile.label.yes": {
+    "message": "Так"
+  },
   "profile.meta.description": {
     "message": "Завантажте проєкти {username} на Modrinth"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} — Завантажуйте проєкти {username} на Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, one {<stat>{count}</stat> завантаження} few {<stat>{count}</stat> завантаження} other {<stat>{count}</stat> завантажень}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural,one {<stat>{count}</stat> проєкт}other {<stat>{count}</stat> проєкти(-ів)}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, one {<stat>{count}</stat> підписника} other\n {<stat>{count}</stat> підписника (-ів)}}"
   },
@@ -1473,7 +1569,7 @@
     "message": "Підсумуйте свій проєкт одним реченням."
   },
   "project.settings.general.tagline.placeholder.1": {
-    "message": "наприклад, Змінено ігровий процес щоб він був зациклений навколо Нижнього світу."
+    "message": "наприклад, Змінено ігровий процес, щоб він був зациклений навколо Незеру."
   },
   "project.settings.general.tagline.placeholder.2": {
     "message": "наприклад, Додає будівельне спорядження, що можна носити."
@@ -1860,13 +1956,10 @@
     "message": "Синхронізувати з сервером"
   },
   "servers.backup.create.in-progress.tooltip": {
-    "message": "Створення резервної копії в процесі"
+    "message": "Створення резервної копії триває"
   },
   "servers.backup.restore.in-progress.tooltip": {
-    "message": "Відновлення резервної копії в процесі"
-  },
-  "servers.backups.item.already-preparing": {
-    "message": "Вже іде підготовка до завантаження резервної копії"
+    "message": "Відновлення резервної копії триває"
   },
   "servers.backups.item.automated": {
     "message": "Автоматично"
@@ -1874,12 +1967,15 @@
   "servers.backups.item.creating-backup": {
     "message": "Створення резервної копії…"
   },
+  "servers.backups.item.downloading": {
+    "message": "Завантаження"
+  },
+  "servers.backups.item.downloading-backup": {
+    "message": "Завантаження резервної копії…"
+  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Помилка в створенні резервної копії"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "Помилка в підготовці до завантаження"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Помилка в відновленні з резервної копії"
   },
@@ -1889,15 +1985,6 @@
   "servers.backups.item.locked": {
     "message": "Замкнено"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "Підготувати завантаження"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "Спробувати підготувати знову"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "Підготовка завантаження…"
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "В черзі на створення резервної копії"
   },
diff --git a/apps/frontend/src/locales/vi-VN/index.json b/apps/frontend/src/locales/vi-VN/index.json
index 2405f250..25cfa69c 100644
--- a/apps/frontend/src/locales/vi-VN/index.json
+++ b/apps/frontend/src/locales/vi-VN/index.json
@@ -758,12 +758,6 @@
   "profile.meta.description-with-bio": {
     "message": "{bio} - Tải xuống các dự án của {username} trên Modrinth"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, other {<stat>{count}</stat> lượt tải dự án về}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, other {<stat>{count}</stat> dự án}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, other {<stat>{count}</stat> người theo dõi dự án}}"
   },
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index b1e7d95b..19f861be 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -428,6 +428,9 @@
   "create.collection.cancel": {
     "message": "取消"
   },
+  "create.collection.collection-info": {
+    "message": ""
+  },
   "create.collection.create-collection": {
     "message": "新建收藏夹"
   },
@@ -440,12 +443,33 @@
   "create.collection.name-placeholder": {
     "message": "输入收藏夹名称……"
   },
+  "create.collection.summary-description": {
+    "message": "一两句话描述你的收藏夹。"
+  },
   "create.collection.summary-label": {
     "message": "收藏夹概述"
   },
+  "create.collection.summary-placeholder": {
+    "message": "一个收藏夹……"
+  },
   "create.collection.title": {
     "message": "新建收藏夹"
   },
+  "create.limit-alert.approaching-limit": {
+    "message": "接近 {type} 限制 ({current}/{max})"
+  },
+  "create.limit-alert.approaching-limit-description": {
+    "message": "你即将达到{type}限制，如需超过{max} {typePlural}，请联系客服。"
+  },
+  "create.limit-alert.contact-support": {
+    "message": "联系客服"
+  },
+  "create.limit-alert.limit-reached": {
+    "message": "已达到 {type} 限制"
+  },
+  "create.limit-alert.limit-reached-description": {
+    "message": "你已达到你的 {type} 限制 {max}。请联系客服增加你的限额。"
+  },
   "create.limit-alert.type-collection": {
     "message": "收藏夹"
   },
@@ -479,9 +503,21 @@
   "create.organization.name-placeholder": {
     "message": "输入组织名称……"
   },
+  "create.organization.ownership-info": {
+    "message": "你将成为这个组织的所有者，但你可以随时邀请其他成员并转让所有权。"
+  },
+  "create.organization.summary-description": {
+    "message": "一两句话描述你的组织。"
+  },
   "create.organization.summary-label": {
     "message": "组织概述"
   },
+  "create.organization.summary-placeholder": {
+    "message": "一个组织……"
+  },
+  "create.organization.title": {
+    "message": "创建组织"
+  },
   "create.organization.url-label": {
     "message": "URL"
   },
@@ -500,15 +536,24 @@
   "create.project.name-placeholder": {
     "message": "输入项目名称"
   },
+  "create.project.summary-description": {
+    "message": "一两句话描述你的项目。"
+  },
   "create.project.summary-label": {
     "message": "项目概述"
   },
+  "create.project.summary-placeholder": {
+    "message": "这个项目增加了……"
+  },
   "create.project.title": {
     "message": "创建项目"
   },
   "create.project.url-label": {
     "message": "URL"
   },
+  "create.project.visibility-description": {
+    "message": "你的项目在获得批准后的可见性。"
+  },
   "create.project.visibility-label": {
     "message": "可见性"
   },
@@ -533,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "你的收藏夹"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "下载{formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "您的{formType}税务表格已成功提交！"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "你现在可以随时自由提现。如有疑问或需要更新账户信息，请<support-link>联系客服</support-link>。"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "搞定啦！🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "外国实体指的是在美国以外组织的企业实体（例如非美国公司、合伙企业或有限责任公司）。"
   },
@@ -578,6 +635,12 @@
   "error.generic.404.title": {
     "message": "页面不存在"
   },
+  "error.generic.451.subtitle": {
+    "message": "由于法律原因，例如政府审查或正在进行的法律诉讼，本页面已被屏蔽。"
+  },
+  "error.generic.451.title": {
+    "message": "因法律原因无法提供内容"
+  },
   "error.generic.default.list_item.1": {
     "message": "在我们的<status-link>状态页面</status-link>上查看 Modrinth 服务是否中断。"
   },
@@ -866,6 +929,15 @@
   "layout.banner.tax.title": {
     "message": "需要填写税务表格"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "联系客服"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "由于你的纳税人识别号或社会安全号码与美国国税局记录不符，你的提款被暂时锁定。请联系客服重置并重新提交你的税表。"
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "税务表格上报失败"
+  },
   "layout.banner.verify-email.action": {
     "message": "重新发送验证邮件"
   },
@@ -1040,27 +1112,66 @@
   "moderation.technical.search.placeholder": {
     "message": "搜索技术评价……"
   },
+  "profile.bio.fallback.creator": {
+    "message": "一位 Modrinth 创作者。"
+  },
+  "profile.bio.fallback.user": {
+    "message": "一位 Modrinth 用户。"
+  },
   "profile.button.billing": {
     "message": "管理用户财务"
   },
+  "profile.button.edit-role": {
+    "message": "编辑角色"
+  },
   "profile.button.info": {
     "message": "查看用户详情"
   },
   "profile.button.manage-projects": {
     "message": "管理项目"
   },
+  "profile.details.label.auth-providers": {
+    "message": "身份验证提供者"
+  },
+  "profile.details.label.email": {
+    "message": "电子邮箱"
+  },
+  "profile.details.label.has-password": {
+    "message": "已设置密码"
+  },
+  "profile.details.label.has-totp": {
+    "message": "已设置动态令牌"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "支付方式"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "电子邮箱未验证"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "电子邮箱验证成功"
+  },
   "profile.error.not-found": {
     "message": "未找到用户"
   },
-  "profile.joined-at": {
-    "message": "<date>{ago}</date>加入"
-  },
   "profile.label.badges": {
     "message": "徽章"
   },
+  "profile.label.collection": {
+    "message": "收藏夹"
+  },
   "profile.label.details": {
     "message": "详情"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, other {次下载}}"
+  },
+  "profile.label.joined": {
+    "message": "加入"
+  },
+  "profile.label.no": {
+    "message": "否"
+  },
   "profile.label.no-collections": {
     "message": "该用户没有收藏夹！"
   },
@@ -1076,18 +1187,21 @@
   "profile.label.organizations": {
     "message": "组织"
   },
+  "profile.label.projects": {
+    "message": "{count} {count, plural, other {个项目}}"
+  },
+  "profile.label.saving": {
+    "message": "正在保存……"
+  },
+  "profile.label.yes": {
+    "message": "是"
+  },
   "profile.meta.description": {
     "message": "前往 Modrinth 下载 {username} 的项目"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} - 前往 Modrinth 下载 {username} 的项目"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, other {<stat>{count}</stat>次项目下载}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, other {<stat>{count}</stat>个项目}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, other {<stat>{count}</stat>项目关注者}}"
   },
@@ -1814,9 +1928,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "正在恢复备份"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "已在准备下载备份了"
-  },
   "servers.backups.item.automated": {
     "message": "自动"
   },
@@ -1826,9 +1937,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "创建备份时失败"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "准备下载时失败"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "恢复备份时失败"
   },
@@ -1838,15 +1946,6 @@
   "servers.backups.item.locked": {
     "message": "已锁定"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "准备下载"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "请尝试再准备一次"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "正在准备下载……"
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "排队等待备份"
   },
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index 7d9586e4..a13d77a5 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -357,7 +357,7 @@
     "message": "你現在已加入由創作者與探索者組成的精彩社群，大家都在積極打造、下載並持續掌握優質模組的最新動態。"
   },
   "auth.welcome.label.tos": {
-    "message": "建立帳號即表示您同意 Modrinth 的《<terms-link>使用規定</terms-link>》及《<privacy-policy-link>隱私權政策</privacy-policy-link>》。"
+    "message": "建立帳號即表示您已同意 Modrinth 的《<terms-link>使用規定</terms-link>》及《<privacy-policy-link>隱私權政策</privacy-policy-link>》。"
   },
   "auth.welcome.long-title": {
     "message": "歡迎使用 Modrinth！"
@@ -444,7 +444,7 @@
     "message": "輸入收藏名稱..."
   },
   "create.collection.summary-description": {
-    "message": "用一句話或兩句話描述你的收藏。"
+    "message": "用一兩句話描述你的收藏。"
   },
   "create.collection.summary-label": {
     "message": "簡介"
@@ -456,7 +456,7 @@
     "message": "建立收藏"
   },
   "create.limit-alert.approaching-limit": {
-    "message": "即將達到{type}上限（{current}/{max}）"
+    "message": "即將達到{type}上限 ({current}/{max})"
   },
   "create.limit-alert.approaching-limit-description": {
     "message": "你即將達到{type}上限，如果你需要超過 {max} 個 {typePlural}，請聯絡客服。"
@@ -507,7 +507,7 @@
     "message": "你將是這個組織的擁有者，但你可以隨時邀請其他成員並轉移擁有權。"
   },
   "create.organization.summary-description": {
-    "message": "用一句話或兩句話描述你的組織。"
+    "message": "用一兩句話描述你的組織。"
   },
   "create.organization.summary-label": {
     "message": "簡介"
@@ -537,7 +537,7 @@
     "message": "輸入專案名稱..."
   },
   "create.project.summary-description": {
-    "message": "用一句話或兩句話描述你的專案。"
+    "message": "用一兩句話描述你的專案。"
   },
   "create.project.summary-label": {
     "message": "簡介"
@@ -578,6 +578,18 @@
   "dashboard.collections.long-title": {
     "message": "你的收藏"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "下載 {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "你的 {formType} 稅表已成功送出！"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "你現在可以自由提領了。如果你有任何疑問，或需要更新你的資料，請<support-link>聯絡客服</support-link>。"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "一切就緒！🎉"
+  },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "「外國實體」係指在美國境外設立的商業實體（例如非美國公司、合夥事業或有限責任公司）。"
   },
@@ -917,6 +929,15 @@
   "layout.banner.tax.title": {
     "message": "需填寫稅表"
   },
+  "layout.banner.tin-mismatch.action": {
+    "message": "聯絡客服"
+  },
+  "layout.banner.tin-mismatch.description": {
+    "message": "由於您的納稅人識別號碼 (TIN) 或社會安全號碼 (SSN) 與美國國稅局 (IRS) 的紀錄不符，您的提款功能已暫時鎖定。請聯絡客服以重設並重新提交您的稅務表格。"
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "稅務表格提交失敗"
+  },
   "layout.banner.verify-email.action": {
     "message": "重新傳送驗證電子郵件"
   },
@@ -1091,27 +1112,66 @@
   "moderation.technical.search.placeholder": {
     "message": "搜尋技術審查..."
   },
+  "profile.bio.fallback.creator": {
+    "message": "一位 Modrinth 創作者。"
+  },
+  "profile.bio.fallback.user": {
+    "message": "一位 Modrinth 使用者。"
+  },
   "profile.button.billing": {
     "message": "管理使用者帳務"
   },
+  "profile.button.edit-role": {
+    "message": "編輯角色"
+  },
   "profile.button.info": {
     "message": "檢視使用者詳細資訊"
   },
   "profile.button.manage-projects": {
     "message": "管理專案"
   },
+  "profile.details.label.auth-providers": {
+    "message": "驗證提供者"
+  },
+  "profile.details.label.email": {
+    "message": "電子郵件"
+  },
+  "profile.details.label.has-password": {
+    "message": "是否有密碼"
+  },
+  "profile.details.label.has-totp": {
+    "message": "是否有 TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "付款方式"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "message": "電子郵件尚未驗證"
+  },
+  "profile.details.tooltip.email-verified": {
+    "message": "電子郵件已驗證"
+  },
   "profile.error.not-found": {
     "message": "找不到使用者"
   },
-  "profile.joined-at": {
-    "message": "加入於 <date>{ago}</date>"
-  },
   "profile.label.badges": {
     "message": "徽章"
   },
+  "profile.label.collection": {
+    "message": "收藏"
+  },
   "profile.label.details": {
     "message": "詳細資料"
   },
+  "profile.label.downloads": {
+    "message": "{count} 次下載"
+  },
+  "profile.label.joined": {
+    "message": "加入時間"
+  },
+  "profile.label.no": {
+    "message": "否"
+  },
   "profile.label.no-collections": {
     "message": "這個使用者沒有任何收藏！"
   },
@@ -1127,18 +1187,21 @@
   "profile.label.organizations": {
     "message": "組織"
   },
+  "profile.label.projects": {
+    "message": "{count} 個專案"
+  },
+  "profile.label.saving": {
+    "message": "儲存中..."
+  },
+  "profile.label.yes": {
+    "message": "是"
+  },
   "profile.meta.description": {
     "message": "前往 Modrinth 下載 {username} 的專案"
   },
   "profile.meta.description-with-bio": {
     "message": "{bio} — 前往 Modrinth 下載 {username} 的專案"
   },
-  "profile.stats.downloads": {
-    "message": "{count, plural, other {<stat>{count}</stat> 次專案下載}}"
-  },
-  "profile.stats.projects": {
-    "message": "{count, plural, other {<stat>{count}</stat> 個專案}}"
-  },
   "profile.stats.projects-followers": {
     "message": "{count, plural, other {<stat>{count}</stat> 位專案追蹤者}}"
   },
@@ -1865,9 +1928,6 @@
   "servers.backup.restore.in-progress.tooltip": {
     "message": "正在還原備份"
   },
-  "servers.backups.item.already-preparing": {
-    "message": "備份已經在準備下載"
-  },
   "servers.backups.item.automated": {
     "message": "自動"
   },
@@ -1877,9 +1937,6 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "無法建立備份"
   },
-  "servers.backups.item.failed-to-prepare-backup": {
-    "message": "無法準備下載"
-  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "無法從備份還原"
   },
@@ -1889,15 +1946,6 @@
   "servers.backups.item.locked": {
     "message": "已鎖定"
   },
-  "servers.backups.item.prepare-download": {
-    "message": "準備下載"
-  },
-  "servers.backups.item.prepare-download-again": {
-    "message": "再試一次準備下載"
-  },
-  "servers.backups.item.preparing-download": {
-    "message": "正在準備下載..."
-  },
   "servers.backups.item.queued-for-backup": {
     "message": "已排入備份佇列"
   },
diff --git a/apps/frontend/src/locales/zh-TW/languages.json b/apps/frontend/src/locales/zh-TW/languages.json
index 15a15f78..ab692392 100644
--- a/apps/frontend/src/locales/zh-TW/languages.json
+++ b/apps/frontend/src/locales/zh-TW/languages.json
@@ -14,7 +14,7 @@
 	"en-x-lolcat": "LOLCAT",
 	"en-x-pirate": "英文（海盜）",
 	"en-x-updown": "英文（顛倒）",
-	"en-x-uwu": "英文（UwU）",
+	"en-x-uwu": "英文 (UwU)",
 	"eo": "世界語",
 	"es": "西班牙文",
 	"et": "愛沙尼亞文",
diff --git a/apps/frontend/src/locales/zh-TW/meta.json b/apps/frontend/src/locales/zh-TW/meta.json
index 1019c3eb..4f99d4e2 100644
--- a/apps/frontend/src/locales/zh-TW/meta.json
+++ b/apps/frontend/src/locales/zh-TW/meta.json
@@ -5,6 +5,6 @@
 	},
 	"searchTerms": {
 		"description": "Please provide additional search terms associated with the language, if needed, to enhance the search functionality (e.g., American English, Deutschland). Each search term should be entered on a separate line. Translate as a hyphen (-) if no additional terms are needed.",
-		"message": "Taiwan\nChinese\nTraditional Chinese\nChinese Traditional\nTC\n正體\n繁體\n繁中\n中文\n臺灣\n台灣"
+		"message": "Taiwan\nChinese\nTraditional Chinese\nChinese Traditional\nTC\n正體\n繁體\n繁中\n中文\n漢語\n華語\n臺灣\n台灣"
 	}
 }
diff --git a/packages/moderation/src/locales/ar-SA/index.json b/packages/moderation/src/locales/ar-SA/index.json
index 311847da..c7b3a3d9 100644
--- a/packages/moderation/src/locales/ar-SA/index.json
+++ b/packages/moderation/src/locales/ar-SA/index.json
@@ -1,2 +1,6 @@
-{}
+{
+  "nags.add-description.description": {
+    "defaultMessage": "يجب تقديم وصف يوضح غرض المشروع ووظيفته بشكل واضح."
+  }
+}
 
diff --git a/packages/moderation/src/locales/ceb-PH/index.json b/packages/moderation/src/locales/ceb-PH/index.json
index 4d023e9e..884bbf94 100644
--- a/packages/moderation/src/locales/ceb-PH/index.json
+++ b/packages/moderation/src/locales/ceb-PH/index.json
@@ -11,6 +11,9 @@
   "nags.add-icon.title": {
     "defaultMessage": "Pagbutang og amoy"
   },
+  "nags.add-links.title": {
+    "defaultMessage": "Pagdugang og mga panggawas nga katayan"
+  },
   "nags.edit-description.title": {
     "defaultMessage": "Usba ang paghulagway"
   },
@@ -26,26 +29,32 @@
   "nags.edit-title.title": {
     "defaultMessage": "Usba ang titulo"
   },
+  "nags.feature-gallery-image.title": {
+    "defaultMessage": "Pagpasundayag og galeriyang hulagway"
+  },
   "nags.select-environments.title": {
     "defaultMessage": "Pagpili ug mga kalikopan"
   },
+  "nags.select-tags.title": {
+    "defaultMessage": "Pagpili og mga timailhan"
+  },
   "nags.settings.description.title": {
-    "defaultMessage": "Bisitahon ang mga gusto sa paghulagway"
+    "defaultMessage": "Duawi ang mga himutangan sa paghulagway"
   },
   "nags.settings.environments.title": {
-    "defaultMessage": "Bisitahin ang mga gusto sa kalikopan"
+    "defaultMessage": "Duawi ang mga himutangan sa kalikopan"
   },
   "nags.settings.license.title": {
-    "defaultMessage": "Bisitahon ang mga gusto sa lisensiya"
+    "defaultMessage": "Duawi ang mga himutangan sa lisensiya"
   },
   "nags.settings.links.title": {
-    "defaultMessage": "Bisitahon ang mga gusto sa mga katayan"
+    "defaultMessage": "Duawi ang mga himutangan sa mga katayan"
   },
   "nags.settings.tags.title": {
-    "defaultMessage": "Bisitahon ang mga gusto sa timailhan"
+    "defaultMessage": "Duawi ang mga himutangan sa timailhan"
   },
   "nags.settings.title": {
-    "defaultMessage": "Bisitahon ang tinanan nga mga gusto"
+    "defaultMessage": "Duawi ang tinanan nga mga himutangan"
   },
   "nags.summary-same-as-title.description": {
     "defaultMessage": "Dili mahimong mopareho ang imong kalangkoban sa Ngalan sa imong proyekto. Hinungdanon ang pagbuhat sa mapahibaloon ug madanihon nga Kalangkoban."
@@ -60,7 +69,7 @@
     "defaultMessage": "Pamatud-i ang mga panggawas nga katayan"
   },
   "nags.visit-links-settings.title": {
-    "defaultMessage": "Bisitahon ang mga gusto sa mga katayan"
+    "defaultMessage": "Duawi ang mga himutangan sa mga katayan"
   }
 }
 
diff --git a/packages/moderation/src/locales/fil-PH/index.json b/packages/moderation/src/locales/fil-PH/index.json
index f4dff063..6dd8227e 100644
--- a/packages/moderation/src/locales/fil-PH/index.json
+++ b/packages/moderation/src/locales/fil-PH/index.json
@@ -11,6 +11,9 @@
   "nags.add-icon.title": {
     "defaultMessage": "Maglagay ng ikono"
   },
+  "nags.add-links.title": {
+    "defaultMessage": "Magdagdag ng mga external na link"
+  },
   "nags.edit-description.title": {
     "defaultMessage": "Baguhin ang paglalarawan"
   },
@@ -21,14 +24,20 @@
     "defaultMessage": "Baguhin ang buod"
   },
   "nags.edit-tags.title": {
-    "defaultMessage": "Baguhin ang mga pananda"
+    "defaultMessage": "Baguhin ang mga tag"
   },
   "nags.edit-title.title": {
     "defaultMessage": "Baguhin ang pamagat"
   },
+  "nags.feature-gallery-image.title": {
+    "defaultMessage": "Magtampok ng gallery image"
+  },
   "nags.select-environments.title": {
     "defaultMessage": "Pumili ng mga environment"
   },
+  "nags.select-tags.title": {
+    "defaultMessage": "Pumili ng mga tag"
+  },
   "nags.settings.description.title": {
     "defaultMessage": "Bisitahin ang mga setting sa paglalarawan"
   },
@@ -42,7 +51,7 @@
     "defaultMessage": "Bisitahin ang mga setting sa mga link"
   },
   "nags.settings.tags.title": {
-    "defaultMessage": "Bisitahin ang mga setting sa pananda"
+    "defaultMessage": "Bisitahin ang mga setting sa tag"
   },
   "nags.settings.title": {
     "defaultMessage": "Bisitahin ang mga general na setting"
diff --git a/packages/moderation/src/locales/he-IL/index.json b/packages/moderation/src/locales/he-IL/index.json
index 6561751b..d5b79470 100644
--- a/packages/moderation/src/locales/he-IL/index.json
+++ b/packages/moderation/src/locales/he-IL/index.json
@@ -154,6 +154,63 @@
   },
   "nags.settings.tags.title": {
     "defaultMessage": "בקר בהגדרות התגיות"
+  },
+  "nags.settings.title": {
+    "defaultMessage": "בקר בהגדרות כלליות"
+  },
+  "nags.summary-same-as-title.description": {
+    "defaultMessage": "התקציר שלך לא יכול להיות זהה לשם הפרוייקט שלך. זה חשוב ליצור תקציר אינפורמטיבי ומעניין."
+  },
+  "nags.summary-same-as-title.title": {
+    "defaultMessage": "עשה את התקציר שלך ייחודי"
+  },
+  "nags.summary-special-formatting.description": {
+    "defaultMessage": "התקציר שלך לא יכול לכלול פרמוט, הפסקות שורה, תווים מיוחדים או קישורים, מכיוון שהוא יוצג בטקסט פשוט."
+  },
+  "nags.summary-special-formatting.title": {
+    "defaultMessage": "נקה את התקציר"
+  },
+  "nags.summary-too-short.description": {
+    "defaultMessage": "התקציר שלך באורך {length} תווים. מומלץ לרשום לפחות {minChars} תווים על מנת ליצור תקציר אינפורמטיבי ומעניין."
+  },
+  "nags.summary-too-short.title": {
+    "defaultMessage": "הארך את התקציר"
+  },
+  "nags.title-contains-technical-info.description": {
+    "defaultMessage": "שמירת שם הפרוייקט שלך נקי הופך אותו לקל יותר לזכירה ולמציאה. פרטים אודות גרסה וטוען המודים מופיעים באופן אוטומטי לצד שם הפרוייקט."
+  },
+  "nags.title-contains-technical-info.title": {
+    "defaultMessage": "נקה את השם"
+  },
+  "nags.too-many-tags.description": {
+    "defaultMessage": "בחרת {tagCount} תגים. שקול להפחית את כמות התגים ל {maxTagCount} או פחות על מנת שהפרוייקט שלך יופיע בחיפושים הרלוונטיים."
+  },
+  "nags.too-many-tags.title": {
+    "defaultMessage": "בחר תגים מדוייקים"
+  },
+  "nags.upload-gallery-image.description": {
+    "defaultMessage": "לפחות תמונת גלריה אחת נדרשת בכדי להציג את התוכן של {type}{resourcepackMessage}."
+  },
+  "nags.upload-gallery-image.title": {
+    "defaultMessage": "העלה תמונת גלריה"
+  },
+  "nags.upload-version.description": {
+    "defaultMessage": "לפחות גרסה אחת נדרשת כדי להגיש פרוייקט לבדיקה."
+  },
+  "nags.upload-version.title": {
+    "defaultMessage": "העלה גרסה"
+  },
+  "nags.verify-external-links.description": {
+    "defaultMessage": "חלק מהקישורים החיצוניים שלך עלולים לכלול דומיינים לא ראויים לסוג הקישור הזה."
+  },
+  "nags.verify-external-links.title": {
+    "defaultMessage": "אשר קישורים חיצוניים"
+  },
+  "nags.versions.title": {
+    "defaultMessage": "בקר בדף הגרסאות"
+  },
+  "nags.visit-links-settings.title": {
+    "defaultMessage": "בקר בהגדרות הקישורים"
   }
 }
 
diff --git a/packages/moderation/src/locales/hu-HU/index.json b/packages/moderation/src/locales/hu-HU/index.json
index 58352b95..7b3b28a4 100644
--- a/packages/moderation/src/locales/hu-HU/index.json
+++ b/packages/moderation/src/locales/hu-HU/index.json
@@ -16,6 +16,21 @@
   },
   "nags.add-links.title": {
     "defaultMessage": "Agy hozzá külső linkeket"
+  },
+  "nags.edit-description.title": {
+    "defaultMessage": "Leírás szerkesztése"
+  },
+  "nags.edit-license.title": {
+    "defaultMessage": "Licenc szerkesztése"
+  },
+  "nags.edit-summary.title": {
+    "defaultMessage": "Összefoglalás szerkesztése"
+  },
+  "nags.edit-tags.title": {
+    "defaultMessage": "Címkék szerkesztése"
+  },
+  "nags.edit-title.title": {
+    "defaultMessage": "Cím szerkesztése"
   }
 }
 
diff --git a/packages/moderation/src/locales/ru-RU/index.json b/packages/moderation/src/locales/ru-RU/index.json
index 3ff15532..0d2a32b7 100644
--- a/packages/moderation/src/locales/ru-RU/index.json
+++ b/packages/moderation/src/locales/ru-RU/index.json
@@ -162,7 +162,7 @@
     "defaultMessage": "Ваше краткое описание не может быть названием проекта. Важно создать информативное и привлекательное краткое содержание."
   },
   "nags.summary-same-as-title.title": {
-    "defaultMessage": "Сделайте краткое содержание уникальным"
+    "defaultMessage": "Разнообразьте сводку"
   },
   "nags.summary-special-formatting.description": {
     "defaultMessage": "Ваше краткое описание не должно содержать форматирования, строк, специальных символов или ссылок, так как краткое содержание отображает только простой текст."
diff --git a/packages/moderation/src/locales/tl-PH/index.json b/packages/moderation/src/locales/tl-PH/index.json
index 2772aff0..44edfdc5 100644
--- a/packages/moderation/src/locales/tl-PH/index.json
+++ b/packages/moderation/src/locales/tl-PH/index.json
@@ -11,6 +11,9 @@
   "nags.add-icon.title": {
     "defaultMessage": "Maglagay ng lambana"
   },
+  "nags.add-links.title": {
+    "defaultMessage": "Magdagdag ng mga panlabas na kawingan"
+  },
   "nags.edit-description.title": {
     "defaultMessage": "Baguhin ang paglalarawan"
   },
@@ -26,9 +29,15 @@
   "nags.edit-title.title": {
     "defaultMessage": "Baguhin ang pamagat"
   },
+  "nags.feature-gallery-image.title": {
+    "defaultMessage": "Magtampok ng tanghalang laragway"
+  },
   "nags.select-environments.title": {
     "defaultMessage": "Pumili ng mga kapaligiran"
   },
+  "nags.select-tags.title": {
+    "defaultMessage": "Pumili ng mga pananda"
+  },
   "nags.settings.description.title": {
     "defaultMessage": "Bisitahin ang mga kagustuhan sa paglalarawan"
   },
diff --git a/packages/moderation/src/locales/zh-TW/index.json b/packages/moderation/src/locales/zh-TW/index.json
index 913fac45..861a1c40 100644
--- a/packages/moderation/src/locales/zh-TW/index.json
+++ b/packages/moderation/src/locales/zh-TW/index.json
@@ -84,7 +84,7 @@
     "defaultMessage": "請勿使用短網址"
   },
   "nags.long-headers.description": {
-    "defaultMessage": "你的描述中有 {count, plural, other {# 個標題}}{count, plural, other {}}過長。標題應該簡潔，並作為區塊的標題，而非完整的句子。"
+    "defaultMessage": "你的描述中有 {count, plural, other {# 個標題}}過長。標題應該簡潔，並作為區塊的標題，而非完整的句子。"
   },
   "nags.long-headers.title": {
     "defaultMessage": "縮短標題"
diff --git a/packages/ui/src/locales/ar-SA/index.json b/packages/ui/src/locales/ar-SA/index.json
index 6ad52acd..0d9a2d42 100644
--- a/packages/ui/src/locales/ar-SA/index.json
+++ b/packages/ui/src/locales/ar-SA/index.json
@@ -370,6 +370,9 @@
   },
   "project-type.modpack.category": {
     "defaultMessage": "حزم المودات"
+  },
+  "project.about.compatibility.environments.client-and-server": {
+    "defaultMessage": ""
   }
 }
 
diff --git a/packages/ui/src/locales/ceb-PH/index.json b/packages/ui/src/locales/ceb-PH/index.json
index 87536e46..c8e7fe70 100644
--- a/packages/ui/src/locales/ceb-PH/index.json
+++ b/packages/ui/src/locales/ceb-PH/index.json
@@ -1,18 +1,30 @@
 {
+  "badge.beta": {
+    "defaultMessage": "Beta"
+  },
+  "badge.new": {
+    "defaultMessage": "Bag-o"
+  },
   "button.back": {
     "defaultMessage": "Pagbalik"
   },
   "button.cancel": {
     "defaultMessage": "Paphai"
   },
+  "button.clear": {
+    "defaultMessage": "Limpyohi"
+  },
+  "button.close": {
+    "defaultMessage": "Tak-opi"
+  },
   "button.continue": {
     "defaultMessage": "Magpadayon"
   },
   "button.copy-id": {
-    "defaultMessage": "Kuhai ang bili sa tigpaila"
+    "defaultMessage": "Awata ang tigpaila"
   },
   "button.copy-permalink": {
-    "defaultMessage": "Kuhai ang bili sa kununay nga katayan"
+    "defaultMessage": "Awata ang kununay nga katayan"
   },
   "button.create-a-project": {
     "defaultMessage": "Pagbuhat og proyekto"
@@ -26,11 +38,14 @@
   "button.edit": {
     "defaultMessage": "Usba"
   },
+  "button.follow": {
+    "defaultMessage": "Sundi"
+  },
   "button.next": {
     "defaultMessage": "Sunod"
   },
   "button.open-folder": {
-    "defaultMessage": "Buksi ang tigpilo"
+    "defaultMessage": "Buksi ang limbasan"
   },
   "button.play": {
     "defaultMessage": "Pagdula"
@@ -47,11 +62,17 @@
   "button.report": {
     "defaultMessage": "Isumbong"
   },
+  "button.reset": {
+    "defaultMessage": "Pag-usab"
+  },
   "button.save": {
-    "defaultMessage": "Hinumdumi"
+    "defaultMessage": "Pagtipig"
   },
   "button.save-changes": {
-    "defaultMessage": "Hinumdumi ang mga pagbag-o"
+    "defaultMessage": "Tipigi ang mga pagbag-o"
+  },
+  "button.saving": {
+    "defaultMessage": "Nagtipig"
   },
   "button.sign-in": {
     "defaultMessage": "Magsignin"
@@ -75,7 +96,7 @@
     "defaultMessage": "App"
   },
   "changelog.product.servers": {
-    "defaultMessage": "Mga serber"
+    "defaultMessage": "Mga magsisilbi"
   },
   "changelog.product.web": {
     "defaultMessage": "Balayan"
@@ -89,6 +110,9 @@
   "icon-select.remove": {
     "defaultMessage": "Tangtangi ang amoy"
   },
+  "input.search.placeholder": {
+    "defaultMessage": "Mangita..."
+  },
   "input.view.gallery": {
     "defaultMessage": "Galeriya nga talan-awon"
   },
@@ -111,7 +135,7 @@
     "defaultMessage": "Pagkabuhi nga Paagi"
   },
   "instance.worlds.game_mode.unknown": {
-    "defaultMessage": "Wala mailhi nga paagi sa dula"
+    "defaultMessage": "Diinilang paagi sa dula"
   },
   "label.collections": {
     "defaultMessage": "Mga gitigom"
@@ -123,11 +147,14 @@
     "defaultMessage": "Talad sa Pagsubay"
   },
   "label.delete": {
-    "defaultMessage": "Tangtangi"
+    "defaultMessage": "Panas-i"
   },
   "label.description": {
     "defaultMessage": "Paghulagway"
   },
+  "label.error": {
+    "defaultMessage": "Kasaypanan"
+  },
   "label.followed-projects": {
     "defaultMessage": "Mga gisundan nga proyekto"
   },
@@ -140,6 +167,9 @@
   "label.notifications": {
     "defaultMessage": "Mga pahibalo"
   },
+  "label.or": {
+    "defaultMessage": "o"
+  },
   "label.password": {
     "defaultMessage": "Tinago nga pulong"
   },
@@ -152,11 +182,17 @@
   "label.rejected": {
     "defaultMessage": "Gisalikway"
   },
+  "label.saved": {
+    "defaultMessage": "Pagtipig"
+  },
+  "label.scopes": {
+    "defaultMessage": "Mga Katungod"
+  },
   "label.server": {
-    "defaultMessage": "Serber"
+    "defaultMessage": "Magsisilbi"
   },
   "label.servers": {
-    "defaultMessage": "Mga serber"
+    "defaultMessage": "Mga magsisilbi"
   },
   "label.settings": {
     "defaultMessage": "Mga gusto"
@@ -174,7 +210,7 @@
     "defaultMessage": "Pagkamakit-an"
   },
   "label.visit-your-profile": {
-    "defaultMessage": "Bisitahon ang imong profile"
+    "defaultMessage": "Duawi ang imong profile"
   },
   "omorphia.component.badge.label.accepted": {
     "defaultMessage": "Gidawat"
@@ -186,7 +222,7 @@
     "defaultMessage": "Inarkibo"
   },
   "omorphia.component.badge.label.closed": {
-    "defaultMessage": "Sirado"
+    "defaultMessage": "Gitak-op"
   },
   "omorphia.component.badge.label.creator": {
     "defaultMessage": "Magbubuhat"
@@ -234,19 +270,19 @@
     "defaultMessage": "Gipugngan"
   },
   "omorphia.component.copy.action.copy": {
-    "defaultMessage": "Kopyaha ang kalagdaan sa clipboard"
+    "defaultMessage": "Awata ang kalagdaan sa clipboard"
   },
   "omorphia.component.environment-indicator.label.client": {
     "defaultMessage": "Kliyente"
   },
   "omorphia.component.environment-indicator.label.client-and-server": {
-    "defaultMessage": "Kliyente ug serber"
+    "defaultMessage": "Kliyente ug magsisilbi"
   },
   "omorphia.component.environment-indicator.label.client-or-server": {
-    "defaultMessage": "Kliyente o serber"
+    "defaultMessage": "Kliyente o magsisilbi"
   },
   "omorphia.component.environment-indicator.label.server": {
-    "defaultMessage": "Serber"
+    "defaultMessage": "Magsisilbi"
   },
   "omorphia.component.environment-indicator.label.type": {
     "defaultMessage": "Usa ka {type}"
@@ -269,17 +305,47 @@
   "omorphia.component.purchase_modal.payment_method_type.discover": {
     "defaultMessage": "Discover"
   },
+  "omorphia.component.purchase_modal.payment_method_type.eftpos": {
+    "defaultMessage": "EFTPOS"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.jcb": {
+    "defaultMessage": "JCB"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.paypal": {
+    "defaultMessage": "PayPal"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.unknown": {
+    "defaultMessage": "Diiniliang pamaagi sa pagbayad"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.visa": {
+    "defaultMessage": "Visa"
+  },
+  "project-type.all": {
+    "defaultMessage": "Lahat"
+  },
   "project-type.datapack.capital": {
-    "defaultMessage": "{count, plural, one {Putos sa Datos} other {Putos sa Datos}}"
+    "defaultMessage": "{count, plural, one {Putos sa Lawsayod} other {Mga Putos sa Lawsayod}}"
   },
   "project-type.datapack.category": {
-    "defaultMessage": "Mga Putos sa Datos"
+    "defaultMessage": "Mga Putos sa Lawsayod"
   },
   "project-type.datapack.lowercase": {
-    "defaultMessage": "{count, plural, one {putos sa datos} other {putos sa datos}}"
+    "defaultMessage": "{count, plural, one {putos sa lawsayod} other {mga putos sa lawsayod}}"
+  },
+  "project-type.mod.category": {
+    "defaultMessage": "Mga Kausaban"
+  },
+  "project.about.compatibility.environments.singleplayer": {
+    "defaultMessage": "Inusara nga dula"
+  },
+  "project.about.compatibility.environments.singleplayer-only": {
+    "defaultMessage": "Inusara nga dula lamang"
   },
   "project.about.compatibility.game.minecraftJava": {
-    "defaultMessage": "Minecraft: Java nga Edisyon"
+    "defaultMessage": "Minecraft: Java Edition"
+  },
+  "project.about.compatibility.platforms": {
+    "defaultMessage": "Mga pantawan"
   },
   "project.about.creators.title": {
     "defaultMessage": "Mga magbubuhat"
@@ -291,17 +357,44 @@
     "defaultMessage": "Gimantala {date}"
   },
   "project.about.details.updated": {
-    "defaultMessage": "Nagbag-o {date}"
+    "defaultMessage": "Nasibo {date}"
+  },
+  "project.about.links.donate.generic": {
+    "defaultMessage": "Pag-amot"
   },
   "project.about.links.issues": {
     "defaultMessage": "Pagtaho og mga isyu"
   },
+  "project.about.links.title": {
+    "defaultMessage": "Mga Katayan"
+  },
+  "project.settings.environment.server_only.supports_singleplayer.title": {
+    "defaultMessage": "Mugana sad sa inusara nga dula"
+  },
+  "project.settings.environment.singleplayer.description": {
+    "defaultMessage": "Mogana lamang sa Insura nga dula o kun wala mokonekta sa usa ka magsisilbi nga Katalingbanon nga dula."
+  },
+  "project.settings.environment.singleplayer.title": {
+    "defaultMessage": "Inusara nga dula lamang"
+  },
   "project.settings.environment.title": {
     "defaultMessage": "Kalikopan"
   },
+  "project.settings.general.title": {
+    "defaultMessage": "Tinanan"
+  },
+  "project.settings.links.title": {
+    "defaultMessage": "Mga Katayan"
+  },
+  "project.settings.tags.title": {
+    "defaultMessage": "Mga Timailhan"
+  },
   "project.settings.upload.title": {
     "defaultMessage": "Sakarga"
   },
+  "project.settings.view.title": {
+    "defaultMessage": "Lantawa"
+  },
   "project.versions.channel.alpha.symbol": {
     "defaultMessage": "ᜀ"
   },
@@ -333,17 +426,71 @@
     "defaultMessage": "Ginasusi"
   },
   "project.visibility.unknown": {
-    "defaultMessage": "Wala mahibal-an"
+    "defaultMessage": "Dili maila"
+  },
+  "project.visibility.unlisted": {
+    "defaultMessage": "Wala malista"
+  },
+  "project.visibility.unlisted-by-staff": {
+    "defaultMessage": "Gipawala malista sa kawani"
   },
   "search.filter_type.environment": {
     "defaultMessage": "Kalikopan"
   },
+  "search.filter_type.environment.server": {
+    "defaultMessage": "Magsisilbi"
+  },
   "search.filter_type.license.open_source": {
     "defaultMessage": "Bukas nga tinubdan"
   },
+  "search.filter_type.mod_loader": {
+    "defaultMessage": "Tigkarga"
+  },
+  "search.filter_type.modpack_loader": {
+    "defaultMessage": "Tigkarga"
+  },
+  "search.filter_type.plugin_loader": {
+    "defaultMessage": "Tigkarga"
+  },
+  "search.filter_type.plugin_platform": {
+    "defaultMessage": "Pantawan"
+  },
+  "search.filter_type.shader_loader": {
+    "defaultMessage": "Tigkarga"
+  },
+  "servers.notice.heading.info": {
+    "defaultMessage": "Kasayoran"
+  },
+  "servers.notice.level.info.name": {
+    "defaultMessage": "Kasayoran"
+  },
+  "servers.notice.level.survey.name": {
+    "defaultMessage": "Pagpaniid"
+  },
+  "servers.purchase.step.plan.title": {
+    "defaultMessage": "Plano"
+  },
+  "servers.purchase.step.region.title": {
+    "defaultMessage": "Bungto"
+  },
+  "servers.purchase.step.review.title": {
+    "defaultMessage": "Susiha"
+  },
+  "settings.display.theme.dark": {
+    "defaultMessage": "ngitngit"
+  },
   "settings.display.theme.description": {
     "defaultMessage": "Pamili og imong gigusto nga hiligotanong kulay alang sa Modrinth sa kini nga himan."
   },
+  "settings.display.theme.light": {
+    "defaultMessage": "Hayag"
+  },
+  "settings.display.theme.oled": {
+    "defaultMessage": "OLED"
+  },
+  "settings.display.theme.retro": {
+    "defaultMessage": "Retro"
+  },
   "settings.profile.title": {
     "defaultMessage": "Publiko"
   }
diff --git a/packages/ui/src/locales/cs-CZ/index.json b/packages/ui/src/locales/cs-CZ/index.json
index 14baf07a..9c89aca5 100644
--- a/packages/ui/src/locales/cs-CZ/index.json
+++ b/packages/ui/src/locales/cs-CZ/index.json
@@ -6,7 +6,7 @@
     "defaultMessage": "Beta verze"
   },
   "badge.new": {
-    "defaultMessage": "Nový"
+    "defaultMessage": "Nové"
   },
   "button.analytics": {
     "defaultMessage": "Analytika"
@@ -585,7 +585,7 @@
     "defaultMessage": "Žádná práva"
   },
   "project.settings.tags.title": {
-    "defaultMessage": "Štítky"
+    "defaultMessage": "Značky"
   },
   "project.settings.upload.title": {
     "defaultMessage": "Nahrát"
diff --git a/packages/ui/src/locales/de-CH/index.json b/packages/ui/src/locales/de-CH/index.json
index ddec294e..601db8c7 100644
--- a/packages/ui/src/locales/de-CH/index.json
+++ b/packages/ui/src/locales/de-CH/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Partnerlink erstellen"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Neuen Partnercode erstellen"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Gib deinem Partnerlink einen Namen, damit du weist, von wo Leute kommen!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Titel des Partnerlinks"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "z.B. YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "Der Benutzername des Benutzers, für den der Affiliate-Code erstellt werden soll"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Benutzername"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Benutzername eingeben..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Erstellt von {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Erstelle Partnerlink..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Partnerlink widerrufen"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Analytiken ansehen"
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "Neu"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Partnerlinks"
+  },
   "button.analytics": {
     "defaultMessage": "Analytik"
   },
@@ -17,6 +56,9 @@
   "button.cancel": {
     "defaultMessage": "Abbrechen"
   },
+  "button.clear": {
+    "defaultMessage": "Löschen"
+  },
   "button.close": {
     "defaultMessage": "Schliessen"
   },
@@ -594,7 +636,7 @@
     "defaultMessage": "Versionen"
   },
   "project.settings.view.title": {
-    "defaultMessage": "Anzeigen"
+    "defaultMessage": "Ansehen"
   },
   "project.versions.channel.alpha.symbol": {
     "defaultMessage": "A"
diff --git a/packages/ui/src/locales/de-DE/index.json b/packages/ui/src/locales/de-DE/index.json
index 7e6e31cb..084bd881 100644
--- a/packages/ui/src/locales/de-DE/index.json
+++ b/packages/ui/src/locales/de-DE/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "Abbrechen"
   },
+  "button.clear": {
+    "defaultMessage": "Eingabe löschen"
+  },
   "button.close": {
     "defaultMessage": "Schließen"
   },
diff --git a/packages/ui/src/locales/es-419/index.json b/packages/ui/src/locales/es-419/index.json
index f7d9c49e..6ae83f76 100644
--- a/packages/ui/src/locales/es-419/index.json
+++ b/packages/ui/src/locales/es-419/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "Cancelar"
   },
+  "button.clear": {
+    "defaultMessage": "Borrar"
+  },
   "button.close": {
     "defaultMessage": "Cerrar"
   },
diff --git a/packages/ui/src/locales/es-ES/index.json b/packages/ui/src/locales/es-ES/index.json
index af5f4421..1563bebf 100644
--- a/packages/ui/src/locales/es-ES/index.json
+++ b/packages/ui/src/locales/es-ES/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "Cancelar"
   },
+  "button.clear": {
+    "defaultMessage": "Borrar"
+  },
   "button.close": {
     "defaultMessage": "Cerrar"
   },
@@ -380,18 +383,42 @@
   "project-type.mod.lowercase": {
     "defaultMessage": "{count, plural, one {modificación} other {modificaciones}}"
   },
+  "project-type.modpack.capital": {
+    "defaultMessage": "{count, plural, one {Modpack} other {Modpacks}}"
+  },
   "project-type.modpack.category": {
     "defaultMessage": "Paquetes de mods"
   },
+  "project-type.modpack.lowercase": {
+    "defaultMessage": "{count, plural, one {modpack} other {modpacks}}"
+  },
+  "project-type.plugin.capital": {
+    "defaultMessage": "{count, plural, one {Plugin} other {Plugins}}"
+  },
   "project-type.plugin.category": {
     "defaultMessage": "Complementos"
   },
+  "project-type.plugin.lowercase": {
+    "defaultMessage": "{count, plural, one {plugin} other {plugins}}"
+  },
+  "project-type.resourcepack.capital": {
+    "defaultMessage": "{count, plural, one {Pequete de recursos} other {Paquetes de recursos}}"
+  },
   "project-type.resourcepack.category": {
     "defaultMessage": "Paquetes de Recursos"
   },
+  "project-type.resourcepack.lowercase": {
+    "defaultMessage": "{count, plural, one {paquete de recursos} other {paquetes de recursos}}"
+  },
+  "project-type.shader.capital": {
+    "defaultMessage": "{count, plural, one {Shader} other {Shaders}}"
+  },
   "project-type.shader.category": {
     "defaultMessage": "Sombreadores"
   },
+  "project-type.shader.lowercase": {
+    "defaultMessage": "{count, plural, one {shader} other {shaders}}"
+  },
   "project.about.compatibility.environments": {
     "defaultMessage": "Entornos soportados"
   },
diff --git a/packages/ui/src/locales/fil-PH/index.json b/packages/ui/src/locales/fil-PH/index.json
index 01b56bcd..7df02bc2 100644
--- a/packages/ui/src/locales/fil-PH/index.json
+++ b/packages/ui/src/locales/fil-PH/index.json
@@ -1,10 +1,22 @@
 {
+  "badge.beta": {
+    "defaultMessage": "Beta"
+  },
+  "badge.new": {
+    "defaultMessage": "Bago"
+  },
   "button.back": {
     "defaultMessage": "Bumalik"
   },
   "button.cancel": {
     "defaultMessage": "Kanselahin"
   },
+  "button.clear": {
+    "defaultMessage": "Linisin"
+  },
+  "button.close": {
+    "defaultMessage": "Isara"
+  },
   "button.continue": {
     "defaultMessage": "Magpatuloy"
   },
@@ -26,6 +38,9 @@
   "button.edit": {
     "defaultMessage": "Baguhin"
   },
+  "button.follow": {
+    "defaultMessage": "Sundan"
+  },
   "button.next": {
     "defaultMessage": "Susunod"
   },
@@ -47,12 +62,18 @@
   "button.report": {
     "defaultMessage": "I-report"
   },
+  "button.reset": {
+    "defaultMessage": "I-reset"
+  },
   "button.save": {
     "defaultMessage": "I-save"
   },
   "button.save-changes": {
     "defaultMessage": "I-save ang mga pagbabago"
   },
+  "button.saving": {
+    "defaultMessage": "Sine-save"
+  },
   "button.sign-in": {
     "defaultMessage": "Mag-sign-in"
   },
@@ -89,6 +110,9 @@
   "icon-select.remove": {
     "defaultMessage": "Tanggalin ang ikono"
   },
+  "input.search.placeholder": {
+    "defaultMessage": "Maghanap..."
+  },
   "input.view.gallery": {
     "defaultMessage": "Tanawing gallery"
   },
@@ -99,16 +123,16 @@
     "defaultMessage": "Tanawing row"
   },
   "instance.worlds.game_mode.adventure": {
-    "defaultMessage": "Panglakbayan"
+    "defaultMessage": "Modong panglakbayan"
   },
   "instance.worlds.game_mode.creative": {
-    "defaultMessage": "Kalikhaan"
+    "defaultMessage": "Modong kalikhaan"
   },
   "instance.worlds.game_mode.spectator": {
-    "defaultMessage": "Taganood"
+    "defaultMessage": "Modong taganood"
   },
   "instance.worlds.game_mode.survival": {
-    "defaultMessage": "Kaligtasan"
+    "defaultMessage": "Modong kaligtasan"
   },
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "Hindi kilalang modo ng laro"
@@ -128,6 +152,9 @@
   "label.description": {
     "defaultMessage": "Paglalarawan"
   },
+  "label.error": {
+    "defaultMessage": "Error"
+  },
   "label.followed-projects": {
     "defaultMessage": "Mga sinusundang proyekto"
   },
@@ -140,6 +167,9 @@
   "label.notifications": {
     "defaultMessage": "Mga notipikasyon"
   },
+  "label.or": {
+    "defaultMessage": "o"
+  },
   "label.password": {
     "defaultMessage": "Password"
   },
@@ -152,6 +182,12 @@
   "label.rejected": {
     "defaultMessage": "Tinanggihan"
   },
+  "label.saved": {
+    "defaultMessage": "Na-save"
+  },
+  "label.scopes": {
+    "defaultMessage": "Mga Sakop"
+  },
   "label.server": {
     "defaultMessage": "Server"
   },
@@ -269,17 +305,47 @@
   "omorphia.component.purchase_modal.payment_method_type.discover": {
     "defaultMessage": "Discover"
   },
+  "omorphia.component.purchase_modal.payment_method_type.eftpos": {
+    "defaultMessage": "EFTPOS"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.jcb": {
+    "defaultMessage": "JCB"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.paypal": {
+    "defaultMessage": "PayPal"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.unknown": {
+    "defaultMessage": "Hindi kilalang payment method"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.visa": {
+    "defaultMessage": "Visa"
+  },
+  "project-type.all": {
+    "defaultMessage": "Lahat"
+  },
   "project-type.datapack.capital": {
-    "defaultMessage": "{count, plural, one {Data Pack} other {Data Pack}}"
+    "defaultMessage": "{count, plural, one {Data Pack} other {Mga Data Pack}}"
   },
   "project-type.datapack.category": {
     "defaultMessage": "Mga Data Pack"
   },
   "project-type.datapack.lowercase": {
-    "defaultMessage": "{count, plural, one {data pack} other {data pack}}"
+    "defaultMessage": "{count, plural, one {data pack} other {mga data pack}}"
+  },
+  "project-type.mod.category": {
+    "defaultMessage": "Mga Mod"
+  },
+  "project.about.compatibility.environments.singleplayer": {
+    "defaultMessage": "Pang-isahang laro"
+  },
+  "project.about.compatibility.environments.singleplayer-only": {
+    "defaultMessage": "Pang-isahang laro lamang"
   },
   "project.about.compatibility.game.minecraftJava": {
-    "defaultMessage": "Minecraft: Edisyong Java"
+    "defaultMessage": "Minecraft: Java Edition"
+  },
+  "project.about.compatibility.platforms": {
+    "defaultMessage": "Mga plataporma"
   },
   "project.about.creators.title": {
     "defaultMessage": "Mga tagagawa"
@@ -293,15 +359,42 @@
   "project.about.details.updated": {
     "defaultMessage": "In-update {date}"
   },
+  "project.about.links.donate.generic": {
+    "defaultMessage": "Mag-donate"
+  },
   "project.about.links.issues": {
     "defaultMessage": "Magreport ng mga isyu"
   },
+  "project.about.links.title": {
+    "defaultMessage": "Mga Link"
+  },
+  "project.settings.environment.server_only.supports_singleplayer.title": {
+    "defaultMessage": "Gagana rin sa pang-isahang laro"
+  },
+  "project.settings.environment.singleplayer.description": {
+    "defaultMessage": "Gagana lamang sa Pang-isahang laro o kung hindi nakakonekta sa isang Pangmaramihang laro na server."
+  },
+  "project.settings.environment.singleplayer.title": {
+    "defaultMessage": "Pang-isahang laro lamang"
+  },
   "project.settings.environment.title": {
     "defaultMessage": "Environment"
   },
+  "project.settings.general.title": {
+    "defaultMessage": "General"
+  },
+  "project.settings.links.title": {
+    "defaultMessage": "Mga Link"
+  },
+  "project.settings.tags.title": {
+    "defaultMessage": "Mga Tag"
+  },
   "project.settings.upload.title": {
     "defaultMessage": "Upload"
   },
+  "project.settings.view.title": {
+    "defaultMessage": "Tingnan"
+  },
   "project.versions.channel.alpha.symbol": {
     "defaultMessage": "A"
   },
@@ -335,15 +428,69 @@
   "project.visibility.unknown": {
     "defaultMessage": "Hindi alam"
   },
+  "project.visibility.unlisted": {
+    "defaultMessage": "Unlisted"
+  },
+  "project.visibility.unlisted-by-staff": {
+    "defaultMessage": "Pina-unlisted ng staff"
+  },
   "search.filter_type.environment": {
     "defaultMessage": "Environment"
   },
+  "search.filter_type.environment.server": {
+    "defaultMessage": "Server"
+  },
   "search.filter_type.license.open_source": {
     "defaultMessage": "Open source"
   },
+  "search.filter_type.mod_loader": {
+    "defaultMessage": "Loader"
+  },
+  "search.filter_type.modpack_loader": {
+    "defaultMessage": "Loader"
+  },
+  "search.filter_type.plugin_loader": {
+    "defaultMessage": "Loader"
+  },
+  "search.filter_type.plugin_platform": {
+    "defaultMessage": "Plataporma"
+  },
+  "search.filter_type.shader_loader": {
+    "defaultMessage": "Loader"
+  },
+  "servers.notice.heading.info": {
+    "defaultMessage": "Impormasyon"
+  },
+  "servers.notice.level.info.name": {
+    "defaultMessage": "Impormasyon"
+  },
+  "servers.notice.level.survey.name": {
+    "defaultMessage": "Survey"
+  },
+  "servers.purchase.step.plan.title": {
+    "defaultMessage": "Plan"
+  },
+  "servers.purchase.step.region.title": {
+    "defaultMessage": "Rehiyon"
+  },
+  "servers.purchase.step.review.title": {
+    "defaultMessage": "Suriin"
+  },
+  "settings.display.theme.dark": {
+    "defaultMessage": "madilim"
+  },
   "settings.display.theme.description": {
     "defaultMessage": "Pumili ng iyong gugustohing paksang-kulay para sa Modrinth ng nitong device."
   },
+  "settings.display.theme.light": {
+    "defaultMessage": "Liwanag"
+  },
+  "settings.display.theme.oled": {
+    "defaultMessage": "OLED"
+  },
+  "settings.display.theme.retro": {
+    "defaultMessage": "Retro"
+  },
   "settings.profile.title": {
     "defaultMessage": "Publiko"
   }
diff --git a/packages/ui/src/locales/fr-FR/index.json b/packages/ui/src/locales/fr-FR/index.json
index bcc91d2d..0e8e9c06 100644
--- a/packages/ui/src/locales/fr-FR/index.json
+++ b/packages/ui/src/locales/fr-FR/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Créer un lien affilié"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Création d'un nouveau code d'affiliation"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Donnez un nom au lien d'affiliation pour s'avoir d'où les gens viennent !"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Titre du lien affilié"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "par exemple, YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "Pseudo de l'utilisateur à qui est destiné le code d'affiliation"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Pseudo"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Entrez un pseudo..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Créé par {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Création d'un lien affilié..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Révoquer un lien affilié"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Voir les statistiques"
+  },
   "badge.beta": {
     "defaultMessage": "Bêta"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "Nouveau"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Liens affiliés"
+  },
   "button.analytics": {
     "defaultMessage": "Analyses"
   },
@@ -17,6 +56,12 @@
   "button.cancel": {
     "defaultMessage": "Annuler"
   },
+  "button.clear": {
+    "defaultMessage": "Effacer"
+  },
+  "button.close": {
+    "defaultMessage": "Fermer"
+  },
   "button.continue": {
     "defaultMessage": "Continuer"
   },
diff --git a/packages/ui/src/locales/he-IL/index.json b/packages/ui/src/locales/he-IL/index.json
index a29a16d2..6d1953c0 100644
--- a/packages/ui/src/locales/he-IL/index.json
+++ b/packages/ui/src/locales/he-IL/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "ביטול"
   },
+  "button.close": {
+    "defaultMessage": "סגור"
+  },
   "button.continue": {
     "defaultMessage": "המשך"
   },
diff --git a/packages/ui/src/locales/hu-HU/index.json b/packages/ui/src/locales/hu-HU/index.json
index 0ebb8407..d0190db6 100644
--- a/packages/ui/src/locales/hu-HU/index.json
+++ b/packages/ui/src/locales/hu-HU/index.json
@@ -17,6 +17,12 @@
   "button.cancel": {
     "defaultMessage": "Mégsem"
   },
+  "button.clear": {
+    "defaultMessage": "Törlés"
+  },
+  "button.close": {
+    "defaultMessage": "Bezárt"
+  },
   "button.continue": {
     "defaultMessage": "Tovább"
   },
@@ -275,18 +281,27 @@
   "omorphia.component.badge.label.private": {
     "defaultMessage": "Privát"
   },
+  "omorphia.component.badge.label.processed": {
+    "defaultMessage": "Feldolgozva"
+  },
   "omorphia.component.badge.label.rejected": {
     "defaultMessage": "Elutasítva"
   },
   "omorphia.component.badge.label.returned": {
     "defaultMessage": "Visszatérve"
   },
+  "omorphia.component.badge.label.scheduled": {
+    "defaultMessage": "Ütemezve"
+  },
   "omorphia.component.badge.label.under-review": {
     "defaultMessage": "Felülvizsgálat alatt"
   },
   "omorphia.component.badge.label.unlisted": {
     "defaultMessage": "Nem listázott"
   },
+  "omorphia.component.badge.label.withheld": {
+    "defaultMessage": "Vissztartva"
+  },
   "omorphia.component.copy.action.copy": {
     "defaultMessage": "Kód másolása a vágólapra"
   },
@@ -497,6 +512,15 @@
   "project.settings.description.title": {
     "defaultMessage": "Leírás"
   },
+  "project.settings.environment.client_and_server.description": {
+    "defaultMessage": "Van néhány funkciója mind a kliensen, mind a szerveren, még ha csak részlegesen is."
+  },
+  "project.settings.environment.client_and_server.optional_both.title": {
+    "defaultMessage": "Mindkettőn opcionális, mindkét oldalon történő felszerelés esetén működik a legjobban"
+  },
+  "project.settings.environment.client_and_server.optional_both_prefers_both.title": {
+    "defaultMessage": "Mindkettőn opciónális, mindkét oldalon legjobb ha mindkét oldalon telepítve van"
+  },
   "project.settings.environment.client_and_server.optional_client.title": {
     "defaultMessage": "Opcionális kliensen"
   },
@@ -509,15 +533,27 @@
   "project.settings.environment.client_and_server.title": {
     "defaultMessage": "Kliens és szerver"
   },
+  "project.settings.environment.client_only.description": {
+    "defaultMessage": "Minden funkció kliens oldalon történik, és kompatibilis a vanilla szerverekkel."
+  },
   "project.settings.environment.client_only.title": {
     "defaultMessage": "Csak kliens-oldal"
   },
+  "project.settings.environment.server_only.dedicated_only.title": {
+    "defaultMessage": "Szerverkhez dedikálva"
+  },
+  "project.settings.environment.server_only.description": {
+    "defaultMessage": "Minden funkció szerver oldalon történik, és kompatibilis a vanilla klinesekkel."
+  },
   "project.settings.environment.server_only.supports_singleplayer.title": {
     "defaultMessage": "Mükszik Egyjátékos módban is"
   },
   "project.settings.environment.server_only.title": {
     "defaultMessage": "Csak Szerver-oldal"
   },
+  "project.settings.environment.singleplayer.description": {
+    "defaultMessage": "Csak egyjátékos módban vagy többjátékos szerverhez való csatlakozás nélkül működik."
+  },
   "project.settings.environment.singleplayer.title": {
     "defaultMessage": "Csak egyjátékos mód"
   },
@@ -587,6 +623,9 @@
   "project.visibility.rejected": {
     "defaultMessage": "Elutasítva"
   },
+  "project.visibility.scheduled": {
+    "defaultMessage": "Ütemezve"
+  },
   "project.visibility.under-review": {
     "defaultMessage": "Felülvizsgálat alatt"
   },
@@ -602,6 +641,9 @@
   "search.filter.locked.default": {
     "defaultMessage": "Szűrő zárolva"
   },
+  "search.filter.locked.default.description": {
+    "defaultMessage": "E szűrő feloldásával le tudsz tölteni nem támogatott tartalmat."
+  },
   "search.filter.locked.default.sync": {
     "defaultMessage": "Szűrő szinkronizálása"
   },
@@ -650,6 +692,12 @@
   "search.filter_type.shader_loader": {
     "defaultMessage": "Betöltő"
   },
+  "servers.notice.dismiss": {
+    "defaultMessage": "Elutasítás"
+  },
+  "servers.notice.dismissable": {
+    "defaultMessage": "Elutasítható"
+  },
   "servers.notice.heading.attention": {
     "defaultMessage": "Figyelem"
   },
@@ -668,18 +716,48 @@
   "servers.notice.level.warn.name": {
     "defaultMessage": "Figyelmeztetés"
   },
+  "servers.notice.undismissable": {
+    "defaultMessage": "Elutasíthatatlan"
+  },
+  "servers.purchase.step.payment.description": {
+    "defaultMessage": "Nem lesz terhelve még."
+  },
   "servers.purchase.step.payment.prompt": {
     "defaultMessage": "Válasz fizetési módot"
   },
   "servers.purchase.step.payment.title": {
     "defaultMessage": "Fizetési mód"
   },
+  "servers.purchase.step.plan.billed": {
+    "defaultMessage": "számlázva {interval}"
+  },
+  "servers.purchase.step.plan.custom.desc": {
+    "defaultMessage": "Válasszon egy személyre szabott csomagot, amely pontosan az Ön igényeinek megfelelő specifikációkkal rendelkezik."
+  },
+  "servers.purchase.step.plan.get-started": {
+    "defaultMessage": "Itt kezdj"
+  },
+  "servers.purchase.step.plan.large.desc": {
+    "defaultMessage": "Ideális 15–25 játékos számára, modpackekhez vagy intenzív moddinghoz."
+  },
+  "servers.purchase.step.plan.medium.desc": {
+    "defaultMessage": "6–15 játékos és többféle mod számára ideális."
+  },
+  "servers.purchase.step.plan.most-popular": {
+    "defaultMessage": "Legnépszerűbb"
+  },
   "servers.purchase.step.plan.prompt": {
     "defaultMessage": "Válasz előfizetést"
   },
   "servers.purchase.step.plan.select": {
     "defaultMessage": "Válasz előfizetést"
   },
+  "servers.purchase.step.plan.small.desc": {
+    "defaultMessage": "Tökéletes 1–5 barát számára, néhány kisebb módosítással."
+  },
+  "servers.purchase.step.plan.subtitle": {
+    "defaultMessage": "Válassza ki az Ön igényeinek megfelelő RAM-mennyiséget és specifikációkat."
+  },
   "servers.purchase.step.plan.title": {
     "defaultMessage": "Előfizetés"
   },
@@ -692,9 +770,24 @@
   "servers.region.central-europe": {
     "defaultMessage": "Közép Európa"
   },
+  "servers.region.custom.prompt": {
+    "defaultMessage": "Mennyi RAM-ot szeretne szerveréhez?"
+  },
   "servers.region.north-america": {
     "defaultMessage": "Észak Amerika"
   },
+  "servers.region.prompt": {
+    "defaultMessage": "Hol szeretné elhelyezni a szerverét?"
+  },
+  "servers.region.region-unsupported": {
+    "defaultMessage": "Régió nincs listázva? <link> Tudassa velünk mit szeretne látni következőnek a Modrinth Szervereknél!</link>"
+  },
+  "servers.region.southeast-asia": {
+    "defaultMessage": "Délkelet-Ázsia"
+  },
+  "servers.region.western-europe": {
+    "defaultMessage": "Nyugat-Európa"
+  },
   "settings.account.title": {
     "defaultMessage": "Fiók és biztonság"
   },
@@ -713,12 +806,21 @@
   "settings.display.theme.dark": {
     "defaultMessage": "Sötét"
   },
+  "settings.display.theme.description": {
+    "defaultMessage": "Válassza ki a Modrinth számára a kívánt színsémát ezen az eszközön."
+  },
   "settings.display.theme.light": {
     "defaultMessage": "Világos"
   },
   "settings.display.theme.oled": {
     "defaultMessage": "OLED"
   },
+  "settings.display.theme.preferred-dark-theme": {
+    "defaultMessage": "Sötét témát szeretnék"
+  },
+  "settings.display.theme.preferred-light-theme": {
+    "defaultMessage": "Világos témát szeretnék"
+  },
   "settings.display.theme.retro": {
     "defaultMessage": "Retro"
   },
@@ -731,9 +833,15 @@
   "settings.language.title": {
     "defaultMessage": "Nyelv"
   },
+  "settings.pats.title": {
+    "defaultMessage": "Személyes hozzáférsi tokenek"
+  },
   "settings.profile.title": {
     "defaultMessage": "Publikus profil"
   },
+  "settings.sessions.title": {
+    "defaultMessage": "Munkamenetek"
+  },
   "tooltip.date-at-time": {
     "defaultMessage": "{date, date, long} kor {time, time, short}"
   },
diff --git a/packages/ui/src/locales/id-ID/index.json b/packages/ui/src/locales/id-ID/index.json
index 25d1c86e..b980c79a 100644
--- a/packages/ui/src/locales/id-ID/index.json
+++ b/packages/ui/src/locales/id-ID/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "Batal"
   },
+  "button.clear": {
+    "defaultMessage": "Bersihkan"
+  },
   "button.close": {
     "defaultMessage": "Tutup"
   },
@@ -195,7 +198,7 @@
     "defaultMessage": "Kata sandi"
   },
   "label.played": {
-    "defaultMessage": "Bermain selama {time}"
+    "defaultMessage": "Dimainkan selama {time}"
   },
   "label.public": {
     "defaultMessage": "Publik"
@@ -407,6 +410,15 @@
   "project-type.resourcepack.lowercase": {
     "defaultMessage": "{count, plural, other {paket sumber}}"
   },
+  "project-type.shader.capital": {
+    "defaultMessage": "{count, plural, one {Pencorak} other {Pencorak}}"
+  },
+  "project-type.shader.category": {
+    "defaultMessage": "Pencorak (\"Shader\")"
+  },
+  "project-type.shader.lowercase": {
+    "defaultMessage": "{count, plural, one {pencorak} other {pencorak}}"
+  },
   "project.about.compatibility.environments": {
     "defaultMessage": "Lingkungan yang didukung"
   },
@@ -439,6 +451,402 @@
   },
   "project.about.creators.owner": {
     "defaultMessage": "Pemilik proyek"
+  },
+  "project.about.creators.title": {
+    "defaultMessage": "Kreator"
+  },
+  "project.about.details.created": {
+    "defaultMessage": "Dibuat pada {date}"
+  },
+  "project.about.details.licensed": {
+    "defaultMessage": "Berlisensi {license}"
+  },
+  "project.about.details.published": {
+    "defaultMessage": "Diterbitkan pada {date}"
+  },
+  "project.about.details.submitted": {
+    "defaultMessage": "Diserahkan pada {date}"
+  },
+  "project.about.details.title": {
+    "defaultMessage": "Perincian"
+  },
+  "project.about.details.updated": {
+    "defaultMessage": "Diperbarui pada {date}"
+  },
+  "project.about.links.discord": {
+    "defaultMessage": "Gabung ke peladen Discord"
+  },
+  "project.about.links.donate.bmac": {
+    "defaultMessage": "Buy Me a Coffee"
+  },
+  "project.about.links.donate.generic": {
+    "defaultMessage": "Donasi"
+  },
+  "project.about.links.donate.github": {
+    "defaultMessage": "Sponsori di GitHub"
+  },
+  "project.about.links.donate.kofi": {
+    "defaultMessage": "Buat donasi pada Ko-fi"
+  },
+  "project.about.links.donate.patreon": {
+    "defaultMessage": "Buat donasi pada Patreon"
+  },
+  "project.about.links.donate.paypal": {
+    "defaultMessage": "Buat donasi pada PayPal"
+  },
+  "project.about.links.issues": {
+    "defaultMessage": "Laporkan masalah"
+  },
+  "project.about.links.source": {
+    "defaultMessage": "Lihat sumber"
+  },
+  "project.about.links.title": {
+    "defaultMessage": "Tautan"
+  },
+  "project.about.links.wiki": {
+    "defaultMessage": "Kunjungi wiki"
+  },
+  "project.settings.analytics.title": {
+    "defaultMessage": "Analitik"
+  },
+  "project.settings.description.title": {
+    "defaultMessage": "Keterangan"
+  },
+  "project.settings.environment.client_and_server.description": {
+    "defaultMessage": "Memiliki fungsionalitas pada klien dan peladen, walaupun hanya sebagian saja."
+  },
+  "project.settings.environment.client_and_server.optional_both.title": {
+    "defaultMessage": "Opsional pada kedua-duanya, bekerja dengan sama bila dipasang pada kedua-dua sisi"
+  },
+  "project.settings.environment.client_and_server.optional_both_prefers_both.title": {
+    "defaultMessage": "Opsional pada kedua-duanya, bekerja paling baik bila dipasang pada kedua-dua sisi"
+  },
+  "project.settings.environment.client_and_server.optional_client.title": {
+    "defaultMessage": "Opsional pada klien"
+  },
+  "project.settings.environment.client_and_server.optional_server.title": {
+    "defaultMessage": "Opsional pada peladen"
+  },
+  "project.settings.environment.client_and_server.required_both.title": {
+    "defaultMessage": "Diperlukan pada kedua-duanya"
+  },
+  "project.settings.environment.client_and_server.title": {
+    "defaultMessage": "Klien dan peladen"
+  },
+  "project.settings.environment.client_only.description": {
+    "defaultMessage": "Semua fungsionalitas dilakukan oleh sisi klien dan kompatibel dengan peladen vanila."
+  },
+  "project.settings.environment.client_only.title": {
+    "defaultMessage": "Sisi klien saja"
+  },
+  "project.settings.environment.server_only.dedicated_only.title": {
+    "defaultMessage": "Peladen khusus saja"
+  },
+  "project.settings.environment.server_only.description": {
+    "defaultMessage": "Semua fungsionalitas dilakukan oleh sisi peladen dan kompatibel dengan klien vanila."
+  },
+  "project.settings.environment.server_only.supports_singleplayer.title": {
+    "defaultMessage": "Dapat bekerja pada bermain sendiri"
+  },
+  "project.settings.environment.server_only.title": {
+    "defaultMessage": "Sisi peladen saja"
+  },
+  "project.settings.environment.singleplayer.description": {
+    "defaultMessage": "Hanya berfungsi di Bermain Sendiri atau pada saat tidak terhubung ke peladen Bermain Bersama."
+  },
+  "project.settings.environment.singleplayer.title": {
+    "defaultMessage": "Bermain sendiri saja"
+  },
+  "project.settings.environment.suboption.accessibility-option-label": {
+    "defaultMessage": "{title}: {description}"
+  },
+  "project.settings.environment.suboption.accessibility-suboption-group-label": {
+    "defaultMessage": "Subpilihan dari {option}"
+  },
+  "project.settings.environment.title": {
+    "defaultMessage": "Lingkungan"
+  },
+  "project.settings.gallery.title": {
+    "defaultMessage": "Galeri"
+  },
+  "project.settings.general.title": {
+    "defaultMessage": "Umum"
+  },
+  "project.settings.license.title": {
+    "defaultMessage": "Lisensi"
+  },
+  "project.settings.links.title": {
+    "defaultMessage": "Tautan"
+  },
+  "project.settings.members.title": {
+    "defaultMessage": "Anggota"
+  },
+  "project.settings.notice.no-permission.description": {
+    "defaultMessage": "Anda tidak memiliki izin untuk mengubah ini."
+  },
+  "project.settings.notice.no-permission.title": {
+    "defaultMessage": "Tidak ada izin"
+  },
+  "project.settings.tags.title": {
+    "defaultMessage": "Etiket"
+  },
+  "project.settings.upload.title": {
+    "defaultMessage": "Unggah"
+  },
+  "project.settings.versions.title": {
+    "defaultMessage": "Versi"
+  },
+  "project.settings.view.title": {
+    "defaultMessage": "Lihat"
+  },
+  "project.versions.channel.alpha.symbol": {
+    "defaultMessage": "A"
+  },
+  "project.versions.channel.beta.symbol": {
+    "defaultMessage": "B"
+  },
+  "project.versions.channel.release.symbol": {
+    "defaultMessage": "R"
+  },
+  "project.visibility.archived": {
+    "defaultMessage": "Diarsipkan"
+  },
+  "project.visibility.draft": {
+    "defaultMessage": "Draf"
+  },
+  "project.visibility.private": {
+    "defaultMessage": "Pribadi"
+  },
+  "project.visibility.public": {
+    "defaultMessage": "Publik"
+  },
+  "project.visibility.rejected": {
+    "defaultMessage": "Ditolak"
+  },
+  "project.visibility.scheduled": {
+    "defaultMessage": "Dijadwalkan"
+  },
+  "project.visibility.under-review": {
+    "defaultMessage": "Dalam tinjauan"
+  },
+  "project.visibility.unknown": {
+    "defaultMessage": "Tidak diketahui"
+  },
+  "project.visibility.unlisted": {
+    "defaultMessage": "Tidak terdaftar"
+  },
+  "project.visibility.unlisted-by-staff": {
+    "defaultMessage": "Disembunyikan oleh staf"
+  },
+  "search.filter.locked.default": {
+    "defaultMessage": "Saringan terkunci"
+  },
+  "search.filter.locked.default.description": {
+    "defaultMessage": "Membuka kunci saringan ini memperbolehkan Anda memasang konten yang tidak kompatibel."
+  },
+  "search.filter.locked.default.sync": {
+    "defaultMessage": "Sinkronkan saringan"
+  },
+  "search.filter.locked.default.title": {
+    "defaultMessage": "{type} dikunci"
+  },
+  "search.filter.locked.default.unlock": {
+    "defaultMessage": "Buka kunci saringan"
+  },
+  "search.filter_type.environment": {
+    "defaultMessage": "Lingkungan"
+  },
+  "search.filter_type.environment.client": {
+    "defaultMessage": "Klien"
+  },
+  "search.filter_type.environment.server": {
+    "defaultMessage": "Peladen"
+  },
+  "search.filter_type.game_version": {
+    "defaultMessage": "Versi permainan"
+  },
+  "search.filter_type.game_version.all_versions": {
+    "defaultMessage": "Tampilkan semua versi"
+  },
+  "search.filter_type.license": {
+    "defaultMessage": "Lisensi"
+  },
+  "search.filter_type.license.open_source": {
+    "defaultMessage": "Sumber terbuka"
+  },
+  "search.filter_type.mod_loader": {
+    "defaultMessage": "Pemuat"
+  },
+  "search.filter_type.modpack_loader": {
+    "defaultMessage": "Pemuat"
+  },
+  "search.filter_type.plugin_loader": {
+    "defaultMessage": "Pemuat"
+  },
+  "search.filter_type.plugin_platform": {
+    "defaultMessage": "Platform"
+  },
+  "search.filter_type.project_id": {
+    "defaultMessage": "Pengenal proyek"
+  },
+  "search.filter_type.shader_loader": {
+    "defaultMessage": "Pemuat"
+  },
+  "servers.notice.dismiss": {
+    "defaultMessage": "Abaikan"
+  },
+  "servers.notice.dismissable": {
+    "defaultMessage": "Dapat diabaikan"
+  },
+  "servers.notice.heading.attention": {
+    "defaultMessage": "Perhatian"
+  },
+  "servers.notice.heading.info": {
+    "defaultMessage": "Info"
+  },
+  "servers.notice.level.critical.name": {
+    "defaultMessage": "Kritis"
+  },
+  "servers.notice.level.info.name": {
+    "defaultMessage": "Info"
+  },
+  "servers.notice.level.survey.name": {
+    "defaultMessage": "Angket"
+  },
+  "servers.notice.level.warn.name": {
+    "defaultMessage": "Peringatan"
+  },
+  "servers.notice.undismissable": {
+    "defaultMessage": "Tidak dapat diabaikan"
+  },
+  "servers.purchase.step.payment.description": {
+    "defaultMessage": "Anda belum ditagih"
+  },
+  "servers.purchase.step.payment.prompt": {
+    "defaultMessage": "Pilih metode pembayaran"
+  },
+  "servers.purchase.step.payment.title": {
+    "defaultMessage": "Metode pembayaran"
+  },
+  "servers.purchase.step.plan.billed": {
+    "defaultMessage": "ditagih {interval}"
+  },
+  "servers.purchase.step.plan.custom.desc": {
+    "defaultMessage": "Pilih berlangganan tersesuaikan dengan spesifikasi yang Anda perlukan saja."
+  },
+  "servers.purchase.step.plan.get-started": {
+    "defaultMessage": "Mulai"
+  },
+  "servers.purchase.step.plan.large.desc": {
+    "defaultMessage": "Cocok untuk 15—25 pemain, paket mod, atau pemodifikasian berat."
+  },
+  "servers.purchase.step.plan.medium.desc": {
+    "defaultMessage": "Cocok untuk 6—15 pemain dan mod berganda."
+  },
+  "servers.purchase.step.plan.most-popular": {
+    "defaultMessage": "Paling Populer"
+  },
+  "servers.purchase.step.plan.prompt": {
+    "defaultMessage": "Pilih berlangganan"
+  },
+  "servers.purchase.step.plan.select": {
+    "defaultMessage": "Pilih Berlangganan"
+  },
+  "servers.purchase.step.plan.small.desc": {
+    "defaultMessage": "Cocok untuk 1—5 orang teman dengan beberapa mod ringan."
+  },
+  "servers.purchase.step.plan.subtitle": {
+    "defaultMessage": "Pilih jumlah RAM dan spesifikasi yang sesuai dengan keperluan Anda."
+  },
+  "servers.purchase.step.plan.title": {
+    "defaultMessage": "Berlangganan"
+  },
+  "servers.purchase.step.region.title": {
+    "defaultMessage": "Wilayah"
+  },
+  "servers.purchase.step.review.title": {
+    "defaultMessage": "Ulas"
+  },
+  "servers.region.central-europe": {
+    "defaultMessage": "Eropa Tengah"
+  },
+  "servers.region.custom.prompt": {
+    "defaultMessage": "Berapa besar RAM yang diinginkan untuk peladen Anda?"
+  },
+  "servers.region.north-america": {
+    "defaultMessage": "Amerika Utara"
+  },
+  "servers.region.prompt": {
+    "defaultMessage": "Lokasi manakah yang Anda inginkan untuk peladen Anda?"
+  },
+  "servers.region.region-unsupported": {
+    "defaultMessage": "Wilayah tidak terdaftar? <link>Beri tahu kami di mana Anda ingin melihat Modrinth Servers untuk kedepannya!</link>"
+  },
+  "servers.region.southeast-asia": {
+    "defaultMessage": "Asia Tenggara"
+  },
+  "servers.region.western-europe": {
+    "defaultMessage": "Eropa Barat"
+  },
+  "settings.account.title": {
+    "defaultMessage": "Akun dan keamanan"
+  },
+  "settings.appearance.title": {
+    "defaultMessage": "Tampilan"
+  },
+  "settings.applications.title": {
+    "defaultMessage": "Aplikasi Anda"
+  },
+  "settings.authorized-apps.title": {
+    "defaultMessage": "Aplikasi yang diotorisasi"
+  },
+  "settings.billing.title": {
+    "defaultMessage": "Pembayaran dan berlangganan"
+  },
+  "settings.display.theme.dark": {
+    "defaultMessage": "Gelap"
+  },
+  "settings.display.theme.description": {
+    "defaultMessage": "Pilih tema warna pilihan untuk Modrinth di perangkat ini."
+  },
+  "settings.display.theme.light": {
+    "defaultMessage": "Terang"
+  },
+  "settings.display.theme.oled": {
+    "defaultMessage": "OLED"
+  },
+  "settings.display.theme.preferred-dark-theme": {
+    "defaultMessage": "Tema gelap pilihan"
+  },
+  "settings.display.theme.preferred-light-theme": {
+    "defaultMessage": "Tema terang pilihan"
+  },
+  "settings.display.theme.retro": {
+    "defaultMessage": "Retro"
+  },
+  "settings.display.theme.system": {
+    "defaultMessage": "Sinkronkan dengan sistem"
+  },
+  "settings.display.theme.title": {
+    "defaultMessage": "Tema warna"
+  },
+  "settings.language.title": {
+    "defaultMessage": "Bahasa"
+  },
+  "settings.pats.title": {
+    "defaultMessage": "Token akses pribadi"
+  },
+  "settings.profile.title": {
+    "defaultMessage": "Profil publik"
+  },
+  "settings.sessions.title": {
+    "defaultMessage": "Sesi"
+  },
+  "tooltip.date-at-time": {
+    "defaultMessage": "{date, date, long} pukul {time, time, short}"
+  },
+  "ui.component.unsaved-changes-popup.body": {
+    "defaultMessage": "Anda memiliki perubahan yang belum tersimpan."
   }
 }
 
diff --git a/packages/ui/src/locales/it-IT/index.json b/packages/ui/src/locales/it-IT/index.json
index c3535000..b117e458 100644
--- a/packages/ui/src/locales/it-IT/index.json
+++ b/packages/ui/src/locales/it-IT/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "Annulla"
   },
+  "button.clear": {
+    "defaultMessage": "Cancella"
+  },
   "button.close": {
     "defaultMessage": "Chiudi"
   },
diff --git a/packages/ui/src/locales/ja-JP/index.json b/packages/ui/src/locales/ja-JP/index.json
index 46c12381..7ae2c772 100644
--- a/packages/ui/src/locales/ja-JP/index.json
+++ b/packages/ui/src/locales/ja-JP/index.json
@@ -17,6 +17,12 @@
   "button.cancel": {
     "defaultMessage": "キャンセル"
   },
+  "button.clear": {
+    "defaultMessage": "クリア"
+  },
+  "button.close": {
+    "defaultMessage": "閉じる"
+  },
   "button.continue": {
     "defaultMessage": "続行"
   },
diff --git a/packages/ui/src/locales/ms-Arab/index.json b/packages/ui/src/locales/ms-Arab/index.json
index 514b3930..b0aee956 100644
--- a/packages/ui/src/locales/ms-Arab/index.json
+++ b/packages/ui/src/locales/ms-Arab/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "بطل"
   },
+  "button.clear": {
+    "defaultMessage": "کوسوڠکن"
+  },
   "button.close": {
     "defaultMessage": "توتوڤ"
   },
diff --git a/packages/ui/src/locales/ms-MY/index.json b/packages/ui/src/locales/ms-MY/index.json
index 36b5f22d..157ab071 100644
--- a/packages/ui/src/locales/ms-MY/index.json
+++ b/packages/ui/src/locales/ms-MY/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "Batal"
   },
+  "button.clear": {
+    "defaultMessage": "Kosongkan"
+  },
   "button.close": {
     "defaultMessage": "Tutup"
   },
diff --git a/packages/ui/src/locales/pl-PL/index.json b/packages/ui/src/locales/pl-PL/index.json
index 1a872846..7416827c 100644
--- a/packages/ui/src/locales/pl-PL/index.json
+++ b/packages/ui/src/locales/pl-PL/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "Anuluj"
   },
+  "button.clear": {
+    "defaultMessage": "Wyczyść"
+  },
   "button.close": {
     "defaultMessage": "Zamknij"
   },
@@ -336,7 +339,7 @@
     "defaultMessage": "Diners Club"
   },
   "omorphia.component.purchase_modal.payment_method_type.discover": {
-    "defaultMessage": "Discover"
+    "defaultMessage": "Odkryj"
   },
   "omorphia.component.purchase_modal.payment_method_type.eftpos": {
     "defaultMessage": "EFTPOS"
@@ -375,7 +378,7 @@
     "defaultMessage": "{count, plural, one {Mod} few {Mody} other {Modów}}"
   },
   "project-type.mod.category": {
-    "defaultMessage": "Mody"
+    "defaultMessage": "Modyfikacje"
   },
   "project-type.mod.lowercase": {
     "defaultMessage": "{count, plural, one {mod} few {mody} other {modów}}"
diff --git a/packages/ui/src/locales/pt-BR/index.json b/packages/ui/src/locales/pt-BR/index.json
index ffec8971..215acb29 100644
--- a/packages/ui/src/locales/pt-BR/index.json
+++ b/packages/ui/src/locales/pt-BR/index.json
@@ -3,7 +3,7 @@
     "defaultMessage": "Beta"
   },
   "badge.beta-release": {
-    "defaultMessage": "Em beta"
+    "defaultMessage": "Versão Beta"
   },
   "badge.new": {
     "defaultMessage": "Novo"
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "Cancelar"
   },
+  "button.clear": {
+    "defaultMessage": "Limpar"
+  },
   "button.close": {
     "defaultMessage": "Fechar"
   },
@@ -81,10 +84,10 @@
     "defaultMessage": "Salvando"
   },
   "button.sign-in": {
-    "defaultMessage": "Iniciar sessão"
+    "defaultMessage": "Entrar"
   },
   "button.sign-out": {
-    "defaultMessage": "Desconectar-se"
+    "defaultMessage": "Sair"
   },
   "button.sign-up": {
     "defaultMessage": "Entrar"
@@ -825,7 +828,7 @@
     "defaultMessage": "Sincronizar com o sistema"
   },
   "settings.display.theme.title": {
-    "defaultMessage": "Cor do tema"
+    "defaultMessage": "Tema"
   },
   "settings.language.title": {
     "defaultMessage": "Idioma"
diff --git a/packages/ui/src/locales/ru-RU/index.json b/packages/ui/src/locales/ru-RU/index.json
index a0b6a84f..49c5fecb 100644
--- a/packages/ui/src/locales/ru-RU/index.json
+++ b/packages/ui/src/locales/ru-RU/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Создать партнёрскую ссылку"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Создание партнёрского кода"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Укажите название для отслеживания источника переходов!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Название партнёрской ссылки"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "Например: YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "Пользователь, для которого нужно создать партнёрский код"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Имя пользователя"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Введите имя..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Создана {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Создание партнёрской ссылки..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Удалить ссылку"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Посмотреть аналитику"
+  },
   "badge.beta": {
     "defaultMessage": "Бета"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "Новое"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Партнёрские ссылки"
+  },
   "button.analytics": {
     "defaultMessage": "Аналитика"
   },
@@ -17,6 +56,9 @@
   "button.cancel": {
     "defaultMessage": "Отмена"
   },
+  "button.clear": {
+    "defaultMessage": "Очистить"
+  },
   "button.close": {
     "defaultMessage": "Закрыть"
   },
@@ -45,10 +87,10 @@
     "defaultMessage": "Подписаться"
   },
   "button.more-options": {
-    "defaultMessage": "Больше настроек"
+    "defaultMessage": "Дополнительно"
   },
   "button.next": {
-    "defaultMessage": "Вперёд"
+    "defaultMessage": "Далее"
   },
   "button.open-folder": {
     "defaultMessage": "Открыть папку"
@@ -90,7 +132,7 @@
     "defaultMessage": "Зарегистрироваться"
   },
   "button.stop": {
-    "defaultMessage": "Завершить"
+    "defaultMessage": "Остановить"
   },
   "button.unfollow": {
     "defaultMessage": "Отписаться"
@@ -105,28 +147,28 @@
     "defaultMessage": "API"
   },
   "changelog.product.app": {
-    "defaultMessage": "Приложение"
+    "defaultMessage": "App"
   },
   "changelog.product.servers": {
-    "defaultMessage": "Серверы"
+    "defaultMessage": "Servers"
   },
   "changelog.product.web": {
     "defaultMessage": "Сайт"
   },
   "collection.label.private": {
-    "defaultMessage": "Приватный"
+    "defaultMessage": "Приватная"
   },
   "icon-select.edit": {
-    "defaultMessage": "Изменить иконку"
+    "defaultMessage": "Изменить значок"
   },
   "icon-select.remove": {
-    "defaultMessage": "Удалить иконку"
+    "defaultMessage": "Удалить значок"
   },
   "icon-select.replace": {
-    "defaultMessage": "Заменить иконку"
+    "defaultMessage": "Заменить значок"
   },
   "icon-select.select": {
-    "defaultMessage": "Выбрать иконку"
+    "defaultMessage": "Выбрать значок"
   },
   "input.search.placeholder": {
     "defaultMessage": "Поиск..."
@@ -213,7 +255,7 @@
     "defaultMessage": "Сервер"
   },
   "label.servers": {
-    "defaultMessage": "Сервера"
+    "defaultMessage": "Серверы"
   },
   "label.settings": {
     "defaultMessage": "Настройки"
@@ -222,7 +264,7 @@
     "defaultMessage": "Одиночная игра"
   },
   "label.title": {
-    "defaultMessage": "Заголовок"
+    "defaultMessage": "Название"
   },
   "label.unlisted": {
     "defaultMessage": "Скрыт"
@@ -231,13 +273,13 @@
     "defaultMessage": "Видимость"
   },
   "label.visit-your-profile": {
-    "defaultMessage": "Открыть ваш профиль"
+    "defaultMessage": "Открыть профиль"
   },
   "modal.add-payment-method.action": {
     "defaultMessage": "Добавить способ оплаты"
   },
   "modal.add-payment-method.title": {
-    "defaultMessage": "Добавления способа оплаты"
+    "defaultMessage": "Добавление способа оплаты"
   },
   "notification.error.title": {
     "defaultMessage": "Произошла ошибка"
@@ -246,13 +288,13 @@
     "defaultMessage": "Принят"
   },
   "omorphia.component.badge.label.approved": {
-    "defaultMessage": "Утверждён"
+    "defaultMessage": "Одобрен"
   },
   "omorphia.component.badge.label.archived": {
     "defaultMessage": "Архивирован"
   },
   "omorphia.component.badge.label.closed": {
-    "defaultMessage": "Закрыт"
+    "defaultMessage": "Закрыта"
   },
   "omorphia.component.badge.label.creator": {
     "defaultMessage": "Автор"
@@ -264,7 +306,7 @@
     "defaultMessage": "Ошибка"
   },
   "omorphia.component.badge.label.listed": {
-    "defaultMessage": "Опубликован"
+    "defaultMessage": "Размещён"
   },
   "omorphia.component.badge.label.moderator": {
     "defaultMessage": "Модератор"
@@ -300,7 +342,7 @@
     "defaultMessage": "На удержании"
   },
   "omorphia.component.copy.action.copy": {
-    "defaultMessage": "Скопировать код в буфер обмена"
+    "defaultMessage": "Копировать код"
   },
   "omorphia.component.environment-indicator.label.client": {
     "defaultMessage": "Клиент"
@@ -315,13 +357,13 @@
     "defaultMessage": "Сервер"
   },
   "omorphia.component.environment-indicator.label.type": {
-    "defaultMessage": "{type}"
+    "defaultMessage": "Тип: {type}"
   },
   "omorphia.component.environment-indicator.label.unsupported": {
     "defaultMessage": "Не поддерживается"
   },
   "omorphia.component.purchase_modal.payment_method_card_display": {
-    "defaultMessage": "{card_brand} заканчивается через {last_four}"
+    "defaultMessage": "{card_brand} ·· {last_four}"
   },
   "omorphia.component.purchase_modal.payment_method_type.amazon_pay": {
     "defaultMessage": "Amazon Pay"
@@ -435,7 +477,7 @@
     "defaultMessage": "Одиночная игра"
   },
   "project.about.compatibility.environments.singleplayer-only": {
-    "defaultMessage": "Только для одиночной игры"
+    "defaultMessage": "Только одиночная игра"
   },
   "project.about.compatibility.game.minecraftJava": {
     "defaultMessage": "Minecraft: Java Edition"
@@ -456,40 +498,40 @@
     "defaultMessage": "Создан {date}"
   },
   "project.about.details.licensed": {
-    "defaultMessage": "Лицензировано {license}"
+    "defaultMessage": "Лицензия: {license}"
   },
   "project.about.details.published": {
-    "defaultMessage": "Опубликовано {date}"
+    "defaultMessage": "Размещён {date}"
   },
   "project.about.details.submitted": {
-    "defaultMessage": "Выложено {date}"
+    "defaultMessage": "Отправлен {date}"
   },
   "project.about.details.title": {
-    "defaultMessage": "Детали"
+    "defaultMessage": "Сведения"
   },
   "project.about.details.updated": {
     "defaultMessage": "Обновлён {date}"
   },
   "project.about.links.discord": {
-    "defaultMessage": "Присоединиться на Discord сервер"
+    "defaultMessage": "Вступить в Discord"
   },
   "project.about.links.donate.bmac": {
     "defaultMessage": "Buy Me a Coffee"
   },
   "project.about.links.donate.generic": {
-    "defaultMessage": "Пожертвовать"
+    "defaultMessage": "Поддержать"
   },
   "project.about.links.donate.github": {
-    "defaultMessage": "Спонсируйте на GitHub"
+    "defaultMessage": "Спонсировать на GitHub"
   },
   "project.about.links.donate.kofi": {
-    "defaultMessage": "Пожертвуйте на Ko-fi"
+    "defaultMessage": "Поддержать на Ko-fi"
   },
   "project.about.links.donate.patreon": {
-    "defaultMessage": "Пожертвуйте на Patreon"
+    "defaultMessage": "Поддержать на Patreon"
   },
   "project.about.links.donate.paypal": {
-    "defaultMessage": "Пожертвуйте на PayPal"
+    "defaultMessage": "Поддержать на PayPal"
   },
   "project.about.links.issues": {
     "defaultMessage": "Сообщить о проблеме"
@@ -501,7 +543,7 @@
     "defaultMessage": "Ссылки"
   },
   "project.about.links.wiki": {
-    "defaultMessage": "Посетить вики"
+    "defaultMessage": "Открыть вики"
   },
   "project.settings.analytics.title": {
     "defaultMessage": "Аналитика"
@@ -510,37 +552,37 @@
     "defaultMessage": "Описание"
   },
   "project.settings.environment.client_and_server.description": {
-    "defaultMessage": "Имеет какую-либо функциональность как на клиенте, так и на сервере, хотя бы частично."
+    "defaultMessage": "Содержит функциональность как для клиента, так и для сервера, пусть даже частично."
   },
   "project.settings.environment.client_and_server.optional_both.title": {
-    "defaultMessage": "Опционально для обоих, работает одинаково если установлено на любой стороне"
+    "defaultMessage": "Необязателен для обоих; работает одинаково при установке на любую сторону"
   },
   "project.settings.environment.client_and_server.optional_both_prefers_both.title": {
-    "defaultMessage": "Опционально для обоих, работает лучше если установлено на обоих сторонах"
+    "defaultMessage": "Необязателен для обоих; работает лучше при установке на обе стороны"
   },
   "project.settings.environment.client_and_server.optional_client.title": {
-    "defaultMessage": "Опционально для клиента"
+    "defaultMessage": "Необязателен для клиента"
   },
   "project.settings.environment.client_and_server.optional_server.title": {
-    "defaultMessage": "Опционально для сервера"
+    "defaultMessage": "Необязателен для сервера"
   },
   "project.settings.environment.client_and_server.required_both.title": {
-    "defaultMessage": "Необходимо для обеих сторон"
+    "defaultMessage": "Обязателен для обоих"
   },
   "project.settings.environment.client_and_server.title": {
     "defaultMessage": "Клиент и сервер"
   },
   "project.settings.environment.client_only.description": {
-    "defaultMessage": "Все функции сделаны для клиента и совместимы с не модифицированными серверами."
+    "defaultMessage": "Вся функциональность сделана для клиента и совместима с немодифицированными серверами."
   },
   "project.settings.environment.client_only.title": {
     "defaultMessage": "Только для клиента"
   },
   "project.settings.environment.server_only.dedicated_only.title": {
-    "defaultMessage": "Только выделенный сервер"
+    "defaultMessage": "Только для выделенного сервера"
   },
   "project.settings.environment.server_only.description": {
-    "defaultMessage": "Все функции сделаны для сервера и совместимы с не модифицированными клиентами."
+    "defaultMessage": "Вся функциональность сделана для сервера и совместима с немодифицированными клиентами."
   },
   "project.settings.environment.server_only.supports_singleplayer.title": {
     "defaultMessage": "Также работает в одиночной игре"
@@ -549,7 +591,7 @@
     "defaultMessage": "Только для сервера"
   },
   "project.settings.environment.singleplayer.description": {
-    "defaultMessage": "Работает только в одиночной игре и когда не подключен к серверу."
+    "defaultMessage": "Работает только в одиночной игре или без подключения к сетевой игре."
   },
   "project.settings.environment.singleplayer.title": {
     "defaultMessage": "Только для одиночной игры"
@@ -558,7 +600,7 @@
     "defaultMessage": "{title}: {description}"
   },
   "project.settings.environment.suboption.accessibility-suboption-group-label": {
-    "defaultMessage": "Подпункты {option}"
+    "defaultMessage": "Подпункты варианта «{option}»"
   },
   "project.settings.environment.title": {
     "defaultMessage": "Среда"
@@ -567,7 +609,7 @@
     "defaultMessage": "Галерея"
   },
   "project.settings.general.title": {
-    "defaultMessage": "Основные"
+    "defaultMessage": "Общие"
   },
   "project.settings.license.title": {
     "defaultMessage": "Лицензия"
@@ -579,25 +621,25 @@
     "defaultMessage": "Участники"
   },
   "project.settings.notice.no-permission.description": {
-    "defaultMessage": "У вас нет прав, чтобы изменять это."
+    "defaultMessage": "У вас нет разрешения на изменение этих настроек."
   },
   "project.settings.notice.no-permission.title": {
-    "defaultMessage": "Нет прав"
+    "defaultMessage": "Недостаточно разрешений"
   },
   "project.settings.tags.title": {
     "defaultMessage": "Теги"
   },
   "project.settings.upload.title": {
-    "defaultMessage": "Загрузить"
+    "defaultMessage": "Добавление"
   },
   "project.settings.versions.title": {
     "defaultMessage": "Версии"
   },
   "project.settings.view.title": {
-    "defaultMessage": "Просмотреть"
+    "defaultMessage": "Просмотр"
   },
   "project.versions.channel.alpha.symbol": {
-    "defaultMessage": "A"
+    "defaultMessage": "А"
   },
   "project.versions.channel.beta.symbol": {
     "defaultMessage": "Б"
@@ -606,7 +648,7 @@
     "defaultMessage": "Р"
   },
   "project.visibility.archived": {
-    "defaultMessage": "Архивированно"
+    "defaultMessage": "Архивирован"
   },
   "project.visibility.draft": {
     "defaultMessage": "Черновик"
@@ -621,7 +663,7 @@
     "defaultMessage": "Отклонён"
   },
   "project.visibility.scheduled": {
-    "defaultMessage": "Запланировано"
+    "defaultMessage": "Отложен"
   },
   "project.visibility.under-review": {
     "defaultMessage": "На рассмотрении"
@@ -633,19 +675,19 @@
     "defaultMessage": "Скрыт"
   },
   "project.visibility.unlisted-by-staff": {
-    "defaultMessage": "Скрыто персоналом"
+    "defaultMessage": "Скрыт персоналом"
   },
   "search.filter.locked.default": {
     "defaultMessage": "Фильтр заблокирован"
   },
   "search.filter.locked.default.description": {
-    "defaultMessage": "Разблокировка этого фильтра может позволить вам установить несовместимый контент."
+    "defaultMessage": "Разблокировав фильтр, можно установить несовместимый контент."
   },
   "search.filter.locked.default.sync": {
-    "defaultMessage": "Фильтр синхронизации"
+    "defaultMessage": "Синхронизировать"
   },
   "search.filter.locked.default.title": {
-    "defaultMessage": "{type} заблокирован"
+    "defaultMessage": "Фильтр заблокирован"
   },
   "search.filter.locked.default.unlock": {
     "defaultMessage": "Разблокировать фильтр"
@@ -663,13 +705,13 @@
     "defaultMessage": "Версия игры"
   },
   "search.filter_type.game_version.all_versions": {
-    "defaultMessage": "Показать все версии"
+    "defaultMessage": "Показывать все версии"
   },
   "search.filter_type.license": {
     "defaultMessage": "Лицензия"
   },
   "search.filter_type.license.open_source": {
-    "defaultMessage": "Открытые исходники"
+    "defaultMessage": "Открытый исходный код"
   },
   "search.filter_type.mod_loader": {
     "defaultMessage": "Загрузчик"
@@ -717,31 +759,31 @@
     "defaultMessage": "Незакрываемое"
   },
   "servers.purchase.step.payment.description": {
-    "defaultMessage": "С вас пока что не будет взиматься плата."
+    "defaultMessage": "Средства пока не будут списаны."
   },
   "servers.purchase.step.payment.prompt": {
-    "defaultMessage": "Выберите метод оплаты"
+    "defaultMessage": "Выберите способ оплаты"
   },
   "servers.purchase.step.payment.title": {
-    "defaultMessage": "Метод оплаты"
+    "defaultMessage": "Способ оплаты"
   },
   "servers.purchase.step.plan.billed": {
-    "defaultMessage": "оплачивается {interval}"
+    "defaultMessage": "{interval, select, monthly {ежемесячно} quarterly {ежеквартально} yearly {ежегодно} other {{interval}}}"
   },
   "servers.purchase.step.plan.custom.desc": {
-    "defaultMessage": "Выберите настраиваемый план, только с теми характеристиками, которые вам нужны."
+    "defaultMessage": "Создайте свой план с нужными характеристиками."
   },
   "servers.purchase.step.plan.get-started": {
-    "defaultMessage": "Начать"
+    "defaultMessage": "Настроить план"
   },
   "servers.purchase.step.plan.large.desc": {
-    "defaultMessage": "Подходит для 15–25 игроков, сборок, либо требовательных модов."
+    "defaultMessage": "Для 15–25 игроков, сборок и тяжёлых модов."
   },
   "servers.purchase.step.plan.medium.desc": {
-    "defaultMessage": "Подходит для 6–15 игроков и нескольких модов."
+    "defaultMessage": "Для 6–15 игроков и нескольких модов."
   },
   "servers.purchase.step.plan.most-popular": {
-    "defaultMessage": "Самый популярный"
+    "defaultMessage": "Популярный"
   },
   "servers.purchase.step.plan.prompt": {
     "defaultMessage": "Выберите план"
@@ -750,10 +792,10 @@
     "defaultMessage": "Выбрать план"
   },
   "servers.purchase.step.plan.small.desc": {
-    "defaultMessage": "Подходит для компании из 1–5 друзей с несколькими модами."
+    "defaultMessage": "Для 1–5 друзей и пары лёгких модов."
   },
   "servers.purchase.step.plan.subtitle": {
-    "defaultMessage": "Подберите объём оперативной памяти и конфигурацию под свои задачи."
+    "defaultMessage": "Подберите объём памяти и характеристики под свои задачи."
   },
   "servers.purchase.step.plan.title": {
     "defaultMessage": "План"
@@ -762,28 +804,28 @@
     "defaultMessage": "Регион"
   },
   "servers.purchase.step.review.title": {
-    "defaultMessage": "Обзор"
+    "defaultMessage": "Проверка"
   },
   "servers.region.central-europe": {
     "defaultMessage": "Центральная Европа"
   },
   "servers.region.custom.prompt": {
-    "defaultMessage": "Какой объем оперативной памяти вы хотите иметь на своем сервере?"
+    "defaultMessage": "Сколько оперативной памяти вы хотите на сервере?"
   },
   "servers.region.north-america": {
     "defaultMessage": "Северная Америка"
   },
   "servers.region.prompt": {
-    "defaultMessage": "Где вы хотите, чтобы ваш сервер располагался?"
+    "defaultMessage": "Где вы хотите разместить свой сервер?"
   },
   "servers.region.region-unsupported": {
-    "defaultMessage": "Регион не в списке? <link>Дайте нам знать, где вы ещё хотите сервера Modrinth!</link>"
+    "defaultMessage": "Нет нужного региона? <link>Расскажите, где запустить Modrinth Servers дальше!</link>"
   },
   "servers.region.southeast-asia": {
     "defaultMessage": "Юго-Восточная Азия"
   },
   "servers.region.western-europe": {
-    "defaultMessage": "Восточная Европа"
+    "defaultMessage": "Западная Европа"
   },
   "settings.account.title": {
     "defaultMessage": "Данные и безопасность"
@@ -795,16 +837,16 @@
     "defaultMessage": "Ваши приложения"
   },
   "settings.authorized-apps.title": {
-    "defaultMessage": "Авторизованные приложения"
+    "defaultMessage": "Приложения с доступом"
   },
   "settings.billing.title": {
-    "defaultMessage": "Способы оплаты и подписки"
+    "defaultMessage": "Платежи и подписки"
   },
   "settings.display.theme.dark": {
     "defaultMessage": "Тёмная"
   },
   "settings.display.theme.description": {
-    "defaultMessage": "Выберите предпочитаемую тему Modrinth на этом устройстве."
+    "defaultMessage": "Выберите тему для Modrinth на этом устройстве."
   },
   "settings.display.theme.light": {
     "defaultMessage": "Светлая"
@@ -813,28 +855,28 @@
     "defaultMessage": "OLED"
   },
   "settings.display.theme.preferred-dark-theme": {
-    "defaultMessage": "Предпочитаемая темная тема"
+    "defaultMessage": "Основная тёмная тема"
   },
   "settings.display.theme.preferred-light-theme": {
-    "defaultMessage": "Предпочитаемая светлая тема"
+    "defaultMessage": "Основная светлая тема"
   },
   "settings.display.theme.retro": {
     "defaultMessage": "Ретро"
   },
   "settings.display.theme.system": {
-    "defaultMessage": "Системная"
+    "defaultMessage": "Как в системе"
   },
   "settings.display.theme.title": {
-    "defaultMessage": "Цвет темы"
+    "defaultMessage": "Тема"
   },
   "settings.language.title": {
     "defaultMessage": "Язык"
   },
   "settings.pats.title": {
-    "defaultMessage": "Персональные токены доступа"
+    "defaultMessage": "Токены доступа"
   },
   "settings.profile.title": {
-    "defaultMessage": "Профиль пользователя"
+    "defaultMessage": "Публичный профиль"
   },
   "settings.sessions.title": {
     "defaultMessage": "Сеансы"
@@ -843,7 +885,7 @@
     "defaultMessage": "{date, date, long} в {time, time, short}"
   },
   "ui.component.unsaved-changes-popup.body": {
-    "defaultMessage": "У вас есть несохраненные изменения."
+    "defaultMessage": "Имеются несохранённые изменения."
   }
 }
 
diff --git a/packages/ui/src/locales/tl-PH/index.json b/packages/ui/src/locales/tl-PH/index.json
index e0dc4caf..224b0ef4 100644
--- a/packages/ui/src/locales/tl-PH/index.json
+++ b/packages/ui/src/locales/tl-PH/index.json
@@ -1,18 +1,30 @@
 {
+  "badge.beta": {
+    "defaultMessage": "Beta"
+  },
+  "badge.new": {
+    "defaultMessage": "Bago"
+  },
   "button.back": {
     "defaultMessage": "Bumalik"
   },
   "button.cancel": {
     "defaultMessage": "Bawiin"
   },
+  "button.clear": {
+    "defaultMessage": "Linisin"
+  },
+  "button.close": {
+    "defaultMessage": "Ipinid"
+  },
   "button.continue": {
     "defaultMessage": "Magpatuloy"
   },
   "button.copy-id": {
-    "defaultMessage": "Kunin ang sipi ng pampakilala"
+    "defaultMessage": "Sipiin ang pampakilala"
   },
   "button.copy-permalink": {
-    "defaultMessage": "Kunin ang sipi ng lagiing kawingan"
+    "defaultMessage": "Sipiin ang lagiing kawingan"
   },
   "button.create-a-project": {
     "defaultMessage": "Lumikha ng panukala"
@@ -26,6 +38,9 @@
   "button.edit": {
     "defaultMessage": "Baguhin"
   },
+  "button.follow": {
+    "defaultMessage": "Sundan"
+  },
   "button.next": {
     "defaultMessage": "Susunod"
   },
@@ -47,12 +62,18 @@
   "button.report": {
     "defaultMessage": "Isumbong"
   },
+  "button.reset": {
+    "defaultMessage": "Isauli"
+  },
   "button.save": {
-    "defaultMessage": "Tandaan"
+    "defaultMessage": "Iimbak"
   },
   "button.save-changes": {
     "defaultMessage": "Tandaan ang mga pagbabago"
   },
+  "button.saving": {
+    "defaultMessage": "Iniimbak"
+  },
   "button.sign-in": {
     "defaultMessage": "Magsignin"
   },
@@ -75,7 +96,7 @@
     "defaultMessage": "App"
   },
   "changelog.product.servers": {
-    "defaultMessage": "Mga serber"
+    "defaultMessage": "Mga tagapagsilbi"
   },
   "changelog.product.web": {
     "defaultMessage": "Pahinarya"
@@ -89,6 +110,9 @@
   "icon-select.remove": {
     "defaultMessage": "Tanggalin ang lambana"
   },
+  "input.search.placeholder": {
+    "defaultMessage": "Maghanap..."
+  },
   "input.view.gallery": {
     "defaultMessage": "Tanghalang tanawin"
   },
@@ -99,16 +123,16 @@
     "defaultMessage": "Hanay na tanawin"
   },
   "instance.worlds.game_mode.adventure": {
-    "defaultMessage": "Panglakbayan"
+    "defaultMessage": "Paraang panglakbayan"
   },
   "instance.worlds.game_mode.creative": {
-    "defaultMessage": "Kalikhaan"
+    "defaultMessage": "Paraang kalikhaan"
   },
   "instance.worlds.game_mode.spectator": {
-    "defaultMessage": "Taganood"
+    "defaultMessage": "Paraang taganood"
   },
   "instance.worlds.game_mode.survival": {
-    "defaultMessage": "Kaligtasan"
+    "defaultMessage": "Paraang kaligtasan"
   },
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "Hindi kilalang paraan ng laro"
@@ -128,6 +152,9 @@
   "label.description": {
     "defaultMessage": "Paglalarawan"
   },
+  "label.error": {
+    "defaultMessage": "Kamalian"
+  },
   "label.followed-projects": {
     "defaultMessage": "Mga sinusundang panukala"
   },
@@ -140,6 +167,9 @@
   "label.notifications": {
     "defaultMessage": "Mga pabatid"
   },
+  "label.or": {
+    "defaultMessage": "o"
+  },
   "label.password": {
     "defaultMessage": "Lihim na salita"
   },
@@ -152,11 +182,17 @@
   "label.rejected": {
     "defaultMessage": "Tinanggihan"
   },
+  "label.saved": {
+    "defaultMessage": "Naimbak"
+  },
+  "label.scopes": {
+    "defaultMessage": "Mga Sakop"
+  },
   "label.server": {
-    "defaultMessage": "Serber"
+    "defaultMessage": "Tagapagsilbi"
   },
   "label.servers": {
-    "defaultMessage": "Mga serber"
+    "defaultMessage": "Mga tagapagsilbi"
   },
   "label.settings": {
     "defaultMessage": "Mga kagustuhan"
@@ -186,7 +222,7 @@
     "defaultMessage": "Inarkibo"
   },
   "omorphia.component.badge.label.closed": {
-    "defaultMessage": "Sarado"
+    "defaultMessage": "Pininid"
   },
   "omorphia.component.badge.label.creator": {
     "defaultMessage": "Tagalikha"
@@ -240,13 +276,13 @@
     "defaultMessage": "Kliyente"
   },
   "omorphia.component.environment-indicator.label.client-and-server": {
-    "defaultMessage": "Kliyente at serber"
+    "defaultMessage": "Kliyente at tagapagsilbi"
   },
   "omorphia.component.environment-indicator.label.client-or-server": {
-    "defaultMessage": "Kliyente o serber"
+    "defaultMessage": "Kliyente o tagapagsilbi"
   },
   "omorphia.component.environment-indicator.label.server": {
-    "defaultMessage": "Serber"
+    "defaultMessage": "Tagapagsilbi"
   },
   "omorphia.component.environment-indicator.label.type": {
     "defaultMessage": "Isang {type}"
@@ -269,17 +305,47 @@
   "omorphia.component.purchase_modal.payment_method_type.discover": {
     "defaultMessage": "Discover"
   },
+  "omorphia.component.purchase_modal.payment_method_type.eftpos": {
+    "defaultMessage": "EFTPOS"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.jcb": {
+    "defaultMessage": "JCB"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.paypal": {
+    "defaultMessage": "PayPal"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.unknown": {
+    "defaultMessage": "Hindi kilalang paraan ng pagbabayad"
+  },
+  "omorphia.component.purchase_modal.payment_method_type.visa": {
+    "defaultMessage": "Visa"
+  },
+  "project-type.all": {
+    "defaultMessage": "Lahat"
+  },
   "project-type.datapack.capital": {
-    "defaultMessage": "{count, plural, one {Balot ng Malak} other {Balot ng Malak}}"
+    "defaultMessage": "{count, plural, one {Balot ng Malak} other {Mga Balot ng Malak}}"
   },
   "project-type.datapack.category": {
     "defaultMessage": "Mga Balot ng Malak"
   },
   "project-type.datapack.lowercase": {
-    "defaultMessage": "{count, plural, one {balot ng malak} other {balot ng malak}}"
+    "defaultMessage": "{count, plural, one {balot ng malak} other {mga balot ng malak}}"
+  },
+  "project-type.mod.category": {
+    "defaultMessage": "Mga Pambago"
+  },
+  "project.about.compatibility.environments.singleplayer": {
+    "defaultMessage": "Pang-isahang laro"
+  },
+  "project.about.compatibility.environments.singleplayer-only": {
+    "defaultMessage": "Pang-isahang laro lamang"
   },
   "project.about.compatibility.game.minecraftJava": {
-    "defaultMessage": "Minecraft: Lathalang Java"
+    "defaultMessage": "Minecraft: Java Edition"
+  },
+  "project.about.compatibility.platforms": {
+    "defaultMessage": "Mga batyawan"
   },
   "project.about.creators.title": {
     "defaultMessage": "Mga tagalikha"
@@ -291,17 +357,44 @@
     "defaultMessage": "Inilathala {date}"
   },
   "project.about.details.updated": {
-    "defaultMessage": "Nagbago {date}"
+    "defaultMessage": "Naisapanahon {date}"
+  },
+  "project.about.links.donate.generic": {
+    "defaultMessage": "Magkaloob"
   },
   "project.about.links.issues": {
     "defaultMessage": "Mag-ulat ng mga isyu"
   },
+  "project.about.links.title": {
+    "defaultMessage": "Mga Kawingan"
+  },
+  "project.settings.environment.server_only.supports_singleplayer.title": {
+    "defaultMessage": "Gagana rin sa pang-isahang laro"
+  },
+  "project.settings.environment.singleplayer.description": {
+    "defaultMessage": "Gagana lamang sa Pang-isahang laro o kung hindi nakakonekta sa isang tagapagsilbing Pangmaramihang laro."
+  },
+  "project.settings.environment.singleplayer.title": {
+    "defaultMessage": "Pang-isahang laro lamang"
+  },
   "project.settings.environment.title": {
     "defaultMessage": "Kapaligiran"
   },
+  "project.settings.general.title": {
+    "defaultMessage": "Pangkalahatan"
+  },
+  "project.settings.links.title": {
+    "defaultMessage": "Mga Kawingan"
+  },
+  "project.settings.tags.title": {
+    "defaultMessage": "Mga Pananda"
+  },
   "project.settings.upload.title": {
     "defaultMessage": "Dalamtas"
   },
+  "project.settings.view.title": {
+    "defaultMessage": "Tingnan"
+  },
   "project.versions.channel.alpha.symbol": {
     "defaultMessage": "ᜀ"
   },
@@ -335,15 +428,69 @@
   "project.visibility.unknown": {
     "defaultMessage": "Hindi alam"
   },
+  "project.visibility.unlisted": {
+    "defaultMessage": "Hindi nakatala"
+  },
+  "project.visibility.unlisted-by-staff": {
+    "defaultMessage": "Pinahindi nakatala ng kawani"
+  },
   "search.filter_type.environment": {
     "defaultMessage": "Kapaligiran"
   },
+  "search.filter_type.environment.server": {
+    "defaultMessage": "Tagapagsilbi"
+  },
   "search.filter_type.license.open_source": {
     "defaultMessage": "Bukas na pinagmulan"
   },
+  "search.filter_type.mod_loader": {
+    "defaultMessage": "Tagadala"
+  },
+  "search.filter_type.modpack_loader": {
+    "defaultMessage": "Tagapagdala"
+  },
+  "search.filter_type.plugin_loader": {
+    "defaultMessage": "Tagapagdala"
+  },
+  "search.filter_type.plugin_platform": {
+    "defaultMessage": "Batyawan"
+  },
+  "search.filter_type.shader_loader": {
+    "defaultMessage": "Tagapagdala"
+  },
+  "servers.notice.heading.info": {
+    "defaultMessage": "Kaalaman"
+  },
+  "servers.notice.level.info.name": {
+    "defaultMessage": "Kaalaman"
+  },
+  "servers.notice.level.survey.name": {
+    "defaultMessage": "Siyasig"
+  },
+  "servers.purchase.step.plan.title": {
+    "defaultMessage": "Plano"
+  },
+  "servers.purchase.step.region.title": {
+    "defaultMessage": "Danay"
+  },
+  "servers.purchase.step.review.title": {
+    "defaultMessage": "Suriin"
+  },
+  "settings.display.theme.dark": {
+    "defaultMessage": "madilim"
+  },
   "settings.display.theme.description": {
     "defaultMessage": "Pumili ng iyong gugustohing paksang-kulay para sa Modrinth ng nitong pakasam."
   },
+  "settings.display.theme.light": {
+    "defaultMessage": "Liwanag"
+  },
+  "settings.display.theme.oled": {
+    "defaultMessage": "OLED"
+  },
+  "settings.display.theme.retro": {
+    "defaultMessage": "Retro"
+  },
   "settings.profile.title": {
     "defaultMessage": "Publiko"
   }
diff --git a/packages/ui/src/locales/tr-TR/index.json b/packages/ui/src/locales/tr-TR/index.json
index 73cce126..0f050820 100644
--- a/packages/ui/src/locales/tr-TR/index.json
+++ b/packages/ui/src/locales/tr-TR/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "İptal"
   },
+  "button.clear": {
+    "defaultMessage": "Temizle"
+  },
   "button.close": {
     "defaultMessage": "Kapat"
   },
diff --git a/packages/ui/src/locales/uk-UA/index.json b/packages/ui/src/locales/uk-UA/index.json
index 25fc9010..e4dbd973 100644
--- a/packages/ui/src/locales/uk-UA/index.json
+++ b/packages/ui/src/locales/uk-UA/index.json
@@ -1,4 +1,10 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Створити партнерське посилання"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Створити новий код партнера"
+  },
   "badge.beta": {
     "defaultMessage": "Бета"
   },
@@ -17,6 +23,9 @@
   "button.cancel": {
     "defaultMessage": "Скасувати"
   },
+  "button.clear": {
+    "defaultMessage": "Очистити"
+  },
   "button.close": {
     "defaultMessage": "Замкнути"
   },
diff --git a/packages/ui/src/locales/zh-CN/index.json b/packages/ui/src/locales/zh-CN/index.json
index 1c35c823..f3e95826 100644
--- a/packages/ui/src/locales/zh-CN/index.json
+++ b/packages/ui/src/locales/zh-CN/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "取消"
   },
+  "button.clear": {
+    "defaultMessage": "清除"
+  },
   "button.close": {
     "defaultMessage": "关闭"
   },
diff --git a/packages/ui/src/locales/zh-TW/index.json b/packages/ui/src/locales/zh-TW/index.json
index ed16cd9e..1bb46ae0 100644
--- a/packages/ui/src/locales/zh-TW/index.json
+++ b/packages/ui/src/locales/zh-TW/index.json
@@ -17,6 +17,9 @@
   "button.cancel": {
     "defaultMessage": "取消"
   },
+  "button.clear": {
+    "defaultMessage": "清除"
+  },
   "button.close": {
     "defaultMessage": "關閉"
   },

From cb47bc97c78336ee88dd07d1982c7938ef4a3d93 Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Fri, 7 Nov 2025 03:07:10 -0800
Subject: [PATCH 26/64] Logging hotfix for canceling Mural payout requests
 (#4730)

* Logging hotfix for canceling payout requests

* Remove Tombi CI step for now
---
 .github/workflows/check-generic.yml      | 15 ++++++++-------
 apps/labrinth/src/queue/payouts/mural.rs |  8 ++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/check-generic.yml b/.github/workflows/check-generic.yml
index 56df6b1c..35e99c13 100644
--- a/.github/workflows/check-generic.yml
+++ b/.github/workflows/check-generic.yml
@@ -15,10 +15,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: crate-ci/typos@master
 
-  tombi:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: tombi-toml/setup-tombi@v1
-      - run: tombi lint
-      - run: tombi fmt --check
+  # broken: <https://github.com/SchemaStore/schemastore/issues/5108>
+  # tombi:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: tombi-toml/setup-tombi@v1
+  #     - run: tombi lint
+  #     - run: tombi fmt --check
diff --git a/apps/labrinth/src/queue/payouts/mural.rs b/apps/labrinth/src/queue/payouts/mural.rs
index a91960bb..d7c08d7e 100644
--- a/apps/labrinth/src/queue/payouts/mural.rs
+++ b/apps/labrinth/src/queue/payouts/mural.rs
@@ -1,5 +1,5 @@
 use ariadne::ids::UserId;
-use eyre::Result;
+use eyre::{Result, eyre};
 use muralpay::{MuralError, TokenFeeRequest};
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
@@ -126,9 +126,9 @@ impl PayoutsQueue {
                 .client
                 .cancel_payout_request(payout_request.id)
                 .await
-                .wrap_internal_err(
-                    "failed to cancel unexecuted payout request",
-                )?;
+                .wrap_internal_err_with(|| {
+                    eyre!("failed to cancel unexecuted payout request\noriginal error: {err:#?}")
+                })?;
             return Err(ApiError::Internal(err));
         }
 

From fb1ba51a2b133b1051d30f0aa2574d1f504922a8 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Nov 2025 07:45:12 -0800
Subject: [PATCH 27/64] Revert "Reapply "fix: firefox backup download issues
 (#4679)" (#4683) (#4704)"

This reverts commit b11934054da97b6008e41d6758aa3da1b9b3d23a.
---
 .../src/components/ui/servers/BackupItem.vue  | 89 ++++---------------
 .../composables/servers/modules/backups.ts    | 83 -----------------
 apps/frontend/src/locales/en-US/index.json    |  6 --
 .../src/pages/servers/manage/[id]/backups.vue |  1 -
 4 files changed, 15 insertions(+), 164 deletions(-)

diff --git a/apps/frontend/src/components/ui/servers/BackupItem.vue b/apps/frontend/src/components/ui/servers/BackupItem.vue
index b8e170ca..6e910066 100644
--- a/apps/frontend/src/components/ui/servers/BackupItem.vue
+++ b/apps/frontend/src/components/ui/servers/BackupItem.vue
@@ -13,23 +13,14 @@ import {
 	TrashIcon,
 	XIcon,
 } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	commonMessages,
-	injectNotificationManager,
-	OverflowMenu,
-	ProgressBar,
-} from '@modrinth/ui'
+import { ButtonStyled, commonMessages, OverflowMenu, ProgressBar } from '@modrinth/ui'
 import type { Backup } from '@modrinth/utils'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import dayjs from 'dayjs'
-import { computed, ref } from 'vue'
-
-import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
+import { computed } from 'vue'
 
 const flags = useFeatureFlags()
 const { formatMessage } = useVIntl()
-const { addNotification } = injectNotificationManager()
 
 const emit = defineEmits<{
 	(e: 'download' | 'rename' | 'restore' | 'lock' | 'retry'): void
@@ -42,13 +33,11 @@ const props = withDefaults(
 		preview?: boolean
 		kyrosUrl?: string
 		jwt?: string
-		server?: ModrinthServer
 	}>(),
 	{
 		preview: false,
 		kyrosUrl: undefined,
 		jwt: undefined,
-		server: undefined,
 	},
 )
 
@@ -135,48 +124,7 @@ const messages = defineMessages({
 		id: 'servers.backups.item.retry',
 		defaultMessage: 'Retry',
 	},
-	downloadingBackup: {
-		id: 'servers.backups.item.downloading-backup',
-		defaultMessage: 'Downloading backup...',
-	},
-	downloading: {
-		id: 'servers.backups.item.downloading',
-		defaultMessage: 'Downloading',
-	},
 })
-
-const downloadingState = ref<{ progress: number; state: string } | undefined>(undefined)
-
-const downloading = computed(() => downloadingState.value)
-
-const handleDownload = async () => {
-	if (!props.server?.backups || downloading.value) {
-		return
-	}
-
-	downloadingState.value = { progress: 0, state: 'ongoing' }
-
-	try {
-		const download = props.server.backups.downloadBackup(props.backup.id, props.backup.name)
-
-		download.onProgress((p) => {
-			downloadingState.value = { progress: p.progress, state: 'ongoing' }
-		})
-
-		await download.promise
-
-		emit('download')
-	} catch (error) {
-		console.error('Failed to download backup:', error)
-		addNotification({
-			type: 'error',
-			title: 'Download failed',
-			text: error instanceof Error ? error.message : 'Failed to download backup',
-		})
-	} finally {
-		downloadingState.value = undefined
-	}
-}
 </script>
 <template>
 	<div
@@ -244,15 +192,6 @@ const handleDownload = async () => {
 				class="max-w-full"
 			/>
 		</div>
-		<div v-else-if="downloading" class="col-span-2 flex flex-col gap-3 text-blue">
-			{{ formatMessage(messages.downloadingBackup) }}
-			<ProgressBar
-				:progress="downloading.progress >= 0 ? downloading.progress : 0"
-				color="blue"
-				:waiting="downloading.progress <= 0"
-				class="max-w-full"
-			/>
-		</div>
 		<template v-else>
 			<div class="col-span-2">
 				{{ dayjs(backup.created_at).format('MMMM D, YYYY [at] h:mm A') }}
@@ -284,32 +223,34 @@ const handleDownload = async () => {
 				</button>
 			</ButtonStyled>
 			<template v-else>
-				<ButtonStyled v-show="!downloading">
-					<button :disabled="!server?.backups" @click="handleDownload">
+				<ButtonStyled>
+					<a
+						:class="{
+							disabled: !kyrosUrl || !jwt,
+						}"
+						:href="`https://${kyrosUrl}/modrinth/v0/backups/${backup.id}/download?auth=${jwt}`"
+						@click="() => emit('download')"
+					>
 						<DownloadIcon />
 						{{ formatMessage(commonMessages.downloadButton) }}
-					</button>
+					</a>
 				</ButtonStyled>
 				<ButtonStyled circular type="transparent">
 					<OverflowMenu
 						:options="[
-							{
-								id: 'rename',
-								action: () => emit('rename'),
-								disabled: !!restoring || !!downloading,
-							},
+							{ id: 'rename', action: () => emit('rename') },
 							{
 								id: 'restore',
 								action: () => emit('restore'),
-								disabled: !!restoring || !!downloading,
+								disabled: !!restoring,
 							},
-							{ id: 'lock', action: () => emit('lock'), disabled: !!restoring || !!downloading },
+							{ id: 'lock', action: () => emit('lock') },
 							{ divider: true },
 							{
 								id: 'delete',
 								color: 'red',
 								action: () => emit('delete'),
-								disabled: !!restoring || !!downloading,
+								disabled: !!restoring,
 							},
 						]"
 					>
diff --git a/apps/frontend/src/composables/servers/modules/backups.ts b/apps/frontend/src/composables/servers/modules/backups.ts
index ac011508..921b9a35 100644
--- a/apps/frontend/src/composables/servers/modules/backups.ts
+++ b/apps/frontend/src/composables/servers/modules/backups.ts
@@ -106,87 +106,4 @@ export class BackupsModule extends ServerModule {
 	async getAutoBackup(): Promise<AutoBackupSettings> {
 		return await useServersFetch(`servers/${this.serverId}/autobackup`)
 	}
-
-	downloadBackup(
-		backupId: string,
-		backupName: string,
-	): {
-		promise: Promise<void>
-		onProgress: (cb: (p: { loaded: number; total: number; progress: number }) => void) => void
-		cancel: () => void
-	} {
-		const progressSubject = new EventTarget()
-		const abortController = new AbortController()
-
-		const downloadPromise = new Promise<void>((resolve, reject) => {
-			const auth = this.server.general?.node
-			if (!auth?.instance || !auth?.token) {
-				reject(new Error('Missing authentication credentials'))
-				return
-			}
-
-			const xhr = new XMLHttpRequest()
-
-			xhr.addEventListener('progress', (e) => {
-				if (e.lengthComputable) {
-					const progress = e.loaded / e.total
-					progressSubject.dispatchEvent(
-						new CustomEvent('progress', {
-							detail: { loaded: e.loaded, total: e.total, progress },
-						}),
-					)
-				} else {
-					// progress = -1 to indicate indeterminate size
-					progressSubject.dispatchEvent(
-						new CustomEvent('progress', {
-							detail: { loaded: e.loaded, total: 0, progress: -1 },
-						}),
-					)
-				}
-			})
-
-			xhr.onload = () => {
-				if (xhr.status >= 200 && xhr.status < 300) {
-					try {
-						const blob = xhr.response
-						const url = window.URL.createObjectURL(blob)
-						const a = document.createElement('a')
-						a.href = url
-						a.download = `${backupName}.zip`
-						document.body.appendChild(a)
-						a.click()
-						document.body.removeChild(a)
-						window.URL.revokeObjectURL(url)
-						resolve()
-					} catch (error) {
-						reject(error)
-					}
-				} else {
-					reject(new Error(`Download failed with status ${xhr.status}`))
-				}
-			}
-
-			xhr.onerror = () => reject(new Error('Download failed'))
-			xhr.onabort = () => reject(new Error('Download cancelled'))
-
-			xhr.open(
-				'GET',
-				`https://${auth.instance}/modrinth/v0/backups/${backupId}/download?auth=${auth.token}`,
-			)
-			xhr.responseType = 'blob'
-			xhr.send()
-
-			abortController.signal.addEventListener('abort', () => xhr.abort())
-		})
-
-		return {
-			promise: downloadPromise,
-			onProgress: (cb: (p: { loaded: number; total: number; progress: number }) => void) => {
-				progressSubject.addEventListener('progress', ((e: CustomEvent) => {
-					cb(e.detail)
-				}) as EventListener)
-			},
-			cancel: () => abortController.abort(),
-		}
-	}
 }
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 3c571c9c..9884c3a3 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -2570,12 +2570,6 @@
   "servers.backups.item.creating-backup": {
     "message": "Creating backup..."
   },
-  "servers.backups.item.downloading": {
-    "message": "Downloading"
-  },
-  "servers.backups.item.downloading-backup": {
-    "message": "Downloading backup..."
-  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Failed to create backup"
   },
diff --git a/apps/frontend/src/pages/servers/manage/[id]/backups.vue b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
index 56d85946..091f036b 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/backups.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
@@ -105,7 +105,6 @@
 				v-for="backup in backups"
 				:key="`backup-${backup.id}`"
 				:backup="backup"
-				:server="props.server"
 				:kyros-url="props.server.general?.node.instance"
 				:jwt="props.server.general?.node.token"
 				@download="() => triggerDownloadAnimation()"

From 4289f8b52d2b1563a2ea559a34dfed3427d2c555 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Nov 2025 08:01:12 -0800
Subject: [PATCH 28/64] changelog

---
 packages/utils/changelog.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 069176fb..da8d2ffb 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,12 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-11-07T08:05:00-07:00`,
+		product: 'web',
+		body: `## Improvements
+- Fixed some further issues with the new withdrawal experience.`,
+	},
 	{
 		date: `2025-11-04T18:20:00-07:00`,
 		product: 'web',

From 67fb825937df81b5504ed53ccea52aae6c0085fc Mon Sep 17 00:00:00 2001
From: Airyzz <36567925+Airyzz@users.noreply.github.com>
Date: Sat, 8 Nov 2025 03:05:55 +1030
Subject: [PATCH 29/64] Make major box shadows toggleable with Advanced
 rendering setting (#4712)

* Update App.vue

* Update App.vue

* tone down light mode shadows, disable with advanced rendering disabled

---------

Co-authored-by: Calum H. <contact@cal.engineer>
Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 apps/app-frontend/src/App.vue | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index e281beb6..79243c3c 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -686,7 +686,11 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 <template>
 	<SplashScreen v-if="!stateFailed" ref="splashScreen" data-tauri-drag-region />
 	<div id="teleports"></div>
-	<div v-if="stateInitialized" class="app-grid-layout experimental-styles-within relative">
+	<div
+		v-if="stateInitialized"
+		class="app-grid-layout experimental-styles-within relative"
+		:class="{ 'disable-advanced-rendering': !themeStore.advancedRendering }"
+	>
 		<Suspense>
 			<Transition name="toast">
 				<UpdateToast
@@ -914,7 +918,10 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 	<div
 		v-if="stateInitialized"
 		class="app-contents experimental-styles-within"
-		:class="{ 'sidebar-enabled': sidebarVisible }"
+		:class="{
+			'sidebar-enabled': sidebarVisible,
+			'disable-advanced-rendering': !themeStore.advancedRendering,
+		}"
 	>
 		<div class="app-viewport flex-grow router-view">
 			<transition name="popup-survey">
@@ -1194,9 +1201,19 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 	display: none;
 }
 
+.disable-advanced-rendering {
+	.app-sidebar::before {
+		box-shadow: none;
+	}
+
+	&.app-contents::before {
+		box-shadow: none;
+	}
+}
+
 .app-sidebar::before {
 	content: '';
-	box-shadow: -15px 0 15px -15px rgba(0, 0, 0, 0.2) inset;
+	box-shadow: -15px 0 15px -15px rgba(0, 0, 0, 0.1) inset;
 	top: 0;
 	bottom: 0;
 	left: -2rem;
@@ -1221,9 +1238,10 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 	right: calc(-1 * var(--left-bar-width));
 	bottom: calc(-1 * var(--left-bar-width));
 	border-radius: var(--radius-xl);
-	box-shadow:
-		1px 1px 15px rgba(0, 0, 0, 0.2) inset,
-		inset 1px 1px 1px rgba(255, 255, 255, 0.23);
+	box-shadow: 1px 1px 15px rgba(0, 0, 0, 0.1) inset;
+	border-color: var(--surface-5);
+	border-width: 1px;
+	border-style: solid;
 	pointer-events: none;
 }
 

From 11a1918a2ee5731a6a03b168616b315ea0f474ac Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Nov 2025 08:47:54 -0800
Subject: [PATCH 30/64] fix advanced rendering toggle on web with NewModal
 Closes #2284 (#4733)

---
 apps/frontend/src/layouts/default.vue         | 9 ++++++++-
 packages/ui/src/components/modal/NewModal.vue | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index 834a08b8..ad84124a 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -26,7 +26,14 @@
 			</div>
 		</div>
 	</div>
-	<div ref="main_page" class="layout" :class="{ 'expanded-mobile-nav': isBrowseMenuOpen }">
+	<div
+		ref="main_page"
+		class="layout"
+		:class="{
+			'expanded-mobile-nav': isBrowseMenuOpen,
+			'modrinth-parent__no-modal-blurs': !cosmetics.advancedRendering,
+		}"
+	>
 		<PagewideBanner v-if="isRussia && !flags.hideRussiaCensorshipBanner" variant="error">
 			<template #title>
 				<div class="flex flex-col gap-1 text-contrast">
diff --git a/packages/ui/src/components/modal/NewModal.vue b/packages/ui/src/components/modal/NewModal.vue
index 03ec90ca..d4e1bccd 100644
--- a/packages/ui/src/components/modal/NewModal.vue
+++ b/packages/ui/src/components/modal/NewModal.vue
@@ -266,6 +266,12 @@ function handleKeyDown(event: KeyboardEvent) {
 	}
 }
 
+.modrinth-parent__no-modal-blurs {
+	.modal-overlay {
+		backdrop-filter: none;
+	}
+}
+
 .modal-container {
 	position: fixed;
 	top: 0;

From a261598e8997f9280eee1c5d7c9c93eebcfbaa80 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Nov 2025 09:26:51 -0800
Subject: [PATCH 31/64] changelog

---
 packages/utils/changelog.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index da8d2ffb..0d8b7376 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,23 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-11-07T09:30:00-07:00`,
+		product: 'app',
+		version: '0.10.17',
+		body: `## Improvements
+- Sorting and grouping options in the Library page are now persistent.
+- Instance content filters are now remembered until you close the app.
+- Improved performance when 'Advanced rendering' is disabled, especially on Linux.
+- Fixed account list not being scrollable.
+- Fixed glitchy text selection in Logs page.`,
+	},
+	{
+		date: `2025-11-07T09:30:00-07:00`,
+		product: 'web',
+		body: `## Improvements
+- Fixed 'Advanced rendering' toggle not working properly on many popups.`,
+	},
 	{
 		date: `2025-11-07T08:05:00-07:00`,
 		product: 'web',

From 608ab988f0f43a53a3b7adbad7359fb88cc3ba6c Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Fri, 7 Nov 2025 10:50:29 -0800
Subject: [PATCH 32/64] Fetch more data for moderation endpoints (#4727)

* Moderation endpoints fetch ownership data

* fix up endpoint configs

* add some docs
---
 apps/labrinth/src/lib.rs                      |   3 +-
 apps/labrinth/src/models/v3/projects.rs       |  31 ++-
 apps/labrinth/src/queue/moderation.rs         |  10 +-
 apps/labrinth/src/routes/internal/mod.rs      |  11 +-
 .../src/routes/internal/moderation.rs         | 190 +++++++++++++++---
 apps/labrinth/src/routes/v2/moderation.rs     |   3 +-
 6 files changed, 205 insertions(+), 43 deletions(-)

diff --git a/apps/labrinth/src/lib.rs b/apps/labrinth/src/lib.rs
index 672161b9..78a7489f 100644
--- a/apps/labrinth/src/lib.rs
+++ b/apps/labrinth/src/lib.rs
@@ -350,7 +350,8 @@ pub fn utoipa_app_config(
     cfg: &mut utoipa_actix_web::service_config::ServiceConfig,
     _labrinth_config: LabrinthConfig,
 ) {
-    cfg.configure(routes::v3::utoipa_config);
+    cfg.configure(routes::v3::utoipa_config)
+        .configure(routes::internal::utoipa_config);
 }
 
 // This is so that env vars not used immediately don't panic at runtime
diff --git a/apps/labrinth/src/models/v3/projects.rs b/apps/labrinth/src/models/v3/projects.rs
index 12cb6b2e..f70d806a 100644
--- a/apps/labrinth/src/models/v3/projects.rs
+++ b/apps/labrinth/src/models/v3/projects.rs
@@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};
 use validator::Validate;
 
 /// A project returned from the API
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct Project {
     /// The ID of the project, encoded as a base62 string.
     pub id: ProjectId,
@@ -370,7 +370,7 @@ impl Project {
     //     })
     // }
 }
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, utoipa::ToSchema)]
 pub struct GalleryItem {
     pub url: String,
     pub raw_url: String,
@@ -381,7 +381,7 @@ pub struct GalleryItem {
     pub ordering: i64,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, utoipa::ToSchema)]
 pub struct ModeratorMessage {
     pub message: String,
     pub body: Option<String>,
@@ -389,14 +389,23 @@ pub struct ModeratorMessage {
 
 pub const DEFAULT_LICENSE_ID: &str = "LicenseRef-All-Rights-Reserved";
 
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct License {
     pub id: String,
     pub name: String,
     pub url: Option<String>,
 }
 
-#[derive(Serialize, Deserialize, Validate, Clone, Eq, PartialEq)]
+#[derive(
+    Debug,
+    Clone,
+    Serialize,
+    Deserialize,
+    Validate,
+    Eq,
+    PartialEq,
+    utoipa::ToSchema,
+)]
 pub struct Link {
     pub platform: String,
     pub donation: bool,
@@ -425,7 +434,9 @@ impl From<LinkUrl> for Link {
 /// Processing - Project is not displayed on search, and not accessible by URL (Temporary state, project under review)
 /// Scheduled - Project is scheduled to be released in the future
 /// Private - Project is approved, but is not viewable to the public
-#[derive(Serialize, Deserialize, Copy, Clone, Eq, PartialEq, Debug)]
+#[derive(
+    Serialize, Deserialize, Copy, Clone, Eq, PartialEq, Debug, utoipa::ToSchema,
+)]
 #[serde(rename_all = "lowercase")]
 pub enum ProjectStatus {
     Approved,
@@ -564,7 +575,9 @@ impl ProjectStatus {
     }
 }
 
-#[derive(Serialize, Deserialize, Copy, Clone, Debug, Eq, PartialEq)]
+#[derive(
+    Serialize, Deserialize, Copy, Clone, Debug, Eq, PartialEq, utoipa::ToSchema,
+)]
 #[serde(rename_all = "kebab-case")]
 pub enum MonetizationStatus {
     ForceDemonetized,
@@ -599,7 +612,9 @@ impl MonetizationStatus {
 
 /// Represents the status of the manual review of the migration of side types of this
 /// project to the new environment field.
-#[derive(Serialize, Deserialize, Copy, Clone, Debug, Eq, PartialEq)]
+#[derive(
+    Serialize, Deserialize, Copy, Clone, Debug, Eq, PartialEq, utoipa::ToSchema,
+)]
 #[serde(rename_all = "kebab-case")]
 pub enum SideTypesMigrationReviewStatus {
     /// The project has been reviewed to use the new environment side types appropriately.
diff --git a/apps/labrinth/src/queue/moderation.rs b/apps/labrinth/src/queue/moderation.rs
index 58945604..cb17fe84 100644
--- a/apps/labrinth/src/queue/moderation.rs
+++ b/apps/labrinth/src/queue/moderation.rs
@@ -773,20 +773,20 @@ impl AutomatedModerationQueue {
     }
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct MissingMetadata {
     pub identified: HashMap<String, IdentifiedFile>,
     pub flame_files: HashMap<String, MissingMetadataFlame>,
     pub unknown_files: HashMap<String, String>,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct IdentifiedFile {
     pub file_name: String,
     pub status: ApprovalType,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct MissingMetadataFlame {
     pub title: String,
     pub file_name: String,
@@ -794,7 +794,9 @@ pub struct MissingMetadataFlame {
     pub id: u32,
 }
 
-#[derive(Deserialize, Serialize, Copy, Clone, PartialEq, Eq, Debug)]
+#[derive(
+    Deserialize, Serialize, Copy, Clone, PartialEq, Eq, Debug, utoipa::ToSchema,
+)]
 #[serde(rename_all = "kebab-case")]
 pub enum ApprovalType {
     Yes,
diff --git a/apps/labrinth/src/routes/internal/mod.rs b/apps/labrinth/src/routes/internal/mod.rs
index 8cca28c2..f15da09f 100644
--- a/apps/labrinth/src/routes/internal/mod.rs
+++ b/apps/labrinth/src/routes/internal/mod.rs
@@ -25,7 +25,6 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
             .configure(session::config)
             .configure(flows::config)
             .configure(pats::config)
-            .configure(moderation::config)
             .configure(billing::config)
             .configure(gdpr::config)
             .configure(gotenberg::config)
@@ -36,3 +35,13 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
             .configure(mural::config),
     );
 }
+
+pub fn utoipa_config(
+    cfg: &mut utoipa_actix_web::service_config::ServiceConfig,
+) {
+    cfg.service(
+        utoipa_actix_web::scope("/_internal/moderation")
+            .wrap(default_cors())
+            .configure(moderation::config),
+    );
+}
diff --git a/apps/labrinth/src/routes/internal/moderation.rs b/apps/labrinth/src/routes/internal/moderation.rs
index 049ce727..97318382 100644
--- a/apps/labrinth/src/routes/internal/moderation.rs
+++ b/apps/labrinth/src/routes/internal/moderation.rs
@@ -1,26 +1,32 @@
 use super::ApiError;
 use crate::database;
+use crate::database::models::{DBOrganization, DBTeamId, DBTeamMember, DBUser};
 use crate::database::redis::RedisPool;
-use crate::models::projects::ProjectStatus;
+use crate::models::ids::{OrganizationId, TeamId};
+use crate::models::projects::{Project, ProjectStatus};
 use crate::queue::moderation::{ApprovalType, IdentifiedFile, MissingMetadata};
 use crate::queue::session::AuthQueue;
+use crate::util::error::Context;
 use crate::{auth::check_is_moderator_from_headers, models::pats::Scopes};
-use actix_web::{HttpRequest, HttpResponse, web};
-use ariadne::ids::random_base62;
-use serde::Deserialize;
+use actix_web::{HttpRequest, get, post, web};
+use ariadne::ids::{UserId, random_base62};
+use eyre::eyre;
+use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 use std::collections::HashMap;
 
-pub fn config(cfg: &mut web::ServiceConfig) {
-    cfg.route("moderation/projects", web::get().to(get_projects));
-    cfg.route("moderation/project/{id}", web::get().to(get_project_meta));
-    cfg.route("moderation/project", web::post().to(set_project_meta));
+pub fn config(cfg: &mut utoipa_actix_web::service_config::ServiceConfig) {
+    cfg.service(get_projects)
+        .service(get_project_meta)
+        .service(set_project_meta);
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, utoipa::ToSchema)]
 pub struct ProjectsRequestOptions {
+    /// How many projects to fetch.
     #[serde(default = "default_count")]
     pub count: u16,
+    /// How many projects to skip.
     #[serde(default)]
     pub offset: u32,
 }
@@ -29,13 +35,63 @@ fn default_count() -> u16 {
     100
 }
 
-pub async fn get_projects(
+/// Project with extra information fetched from the database, to avoid having
+/// clients make more round trips.
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct FetchedProject {
+    /// Project info.
+    #[serde(flatten)]
+    pub project: Project,
+    /// Who owns the project.
+    pub ownership: Ownership,
+}
+
+/// Fetched information on who owns a project.
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(tag = "kind", rename_all = "snake_case")]
+pub enum Ownership {
+    /// Project is owned by a team, and this is the team owner.
+    User {
+        /// ID of the team owner.
+        id: UserId,
+        /// Name of the team owner.
+        name: String,
+        /// URL of the team owner's icon.
+        icon_url: Option<String>,
+    },
+    /// Project is owned by an organization.
+    Organization {
+        /// ID of the organization.
+        id: OrganizationId,
+        /// Name of the organization.
+        name: String,
+        /// URL of the organization's icon.
+        icon_url: Option<String>,
+    },
+}
+
+/// Fetch all projects which are in the moderation queue.
+#[utoipa::path(
+    responses((status = OK, body = inline(Vec<FetchedProject>)))
+)]
+#[get("/projects")]
+async fn get_projects(
     req: HttpRequest,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
     request_opts: web::Query<ProjectsRequestOptions>,
     session_queue: web::Data<AuthQueue>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<web::Json<Vec<FetchedProject>>, ApiError> {
+    get_projects_internal(req, pool, redis, request_opts, session_queue).await
+}
+
+pub async fn get_projects_internal(
+    req: HttpRequest,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    request_opts: web::Query<ProjectsRequestOptions>,
+    session_queue: web::Data<AuthQueue>,
+) -> Result<web::Json<Vec<FetchedProject>>, ApiError> {
     check_is_moderator_from_headers(
         &req,
         &**pool,
@@ -62,25 +118,100 @@ pub async fn get_projects(
     .fetch(&**pool)
     .map_ok(|m| database::models::DBProjectId(m.id))
     .try_collect::<Vec<database::models::DBProjectId>>()
-    .await?;
+    .await
+    .wrap_internal_err("failed to fetch projects awaiting review")?;
 
-    let projects: Vec<_> =
+    let projects =
         database::DBProject::get_many_ids(&project_ids, &**pool, &redis)
-            .await?
+            .await
+            .wrap_internal_err("failed to fetch projects")?
             .into_iter()
             .map(crate::models::projects::Project::from)
-            .collect();
+            .collect::<Vec<_>>();
 
-    Ok(HttpResponse::Ok().json(projects))
+    let team_ids = projects
+        .iter()
+        .map(|project| project.team_id)
+        .map(DBTeamId::from)
+        .collect::<Vec<_>>();
+    let org_ids = projects
+        .iter()
+        .filter_map(|project| project.organization)
+        .collect::<Vec<_>>();
+
+    let team_members =
+        DBTeamMember::get_from_team_full_many(&team_ids, &**pool, &redis)
+            .await
+            .wrap_internal_err("failed to fetch team members")?;
+    let users = DBUser::get_many_ids(
+        &team_members
+            .iter()
+            .map(|member| member.user_id)
+            .collect::<Vec<_>>(),
+        &**pool,
+        &redis,
+    )
+    .await
+    .wrap_internal_err("failed to fetch user data of team members")?;
+    let orgs = DBOrganization::get_many(&org_ids, &**pool, &redis)
+        .await
+        .wrap_internal_err("failed to fetch organizations")?;
+
+    let map_project = |project: Project| -> Result<FetchedProject, ApiError> {
+        let project_id = project.id;
+        let ownership = if let Some(org_id) = project.organization {
+            let org = orgs
+                    .iter()
+                    .find(|org| OrganizationId::from(org.id) == org_id)
+                    .wrap_internal_err_with(|| {
+                        eyre!(
+                            "project {project_id} is owned by an invalid organization {org_id}"
+                        )
+                    })?;
+
+            Ownership::Organization {
+                id: OrganizationId::from(org.id),
+                name: org.name.clone(),
+                icon_url: org.icon_url.clone(),
+            }
+        } else {
+            let team_id = project.team_id;
+            let team_owner = team_members.iter().find(|member| TeamId::from(member.team_id) == team_id && member.is_owner)
+                .wrap_internal_err_with(|| eyre!("project {project_id} is owned by a team {team_id} which has no valid owner"))?;
+            let team_owner_id = team_owner.user_id;
+            let user = users.iter().find(|user| user.id == team_owner_id)
+                .wrap_internal_err_with(|| eyre!("project {project_id} is owned by a team {team_id} which has owner {} which does not exist", UserId::from(team_owner_id)))?;
+
+            Ownership::User {
+                id: UserId::from(user.id),
+                name: user.username.clone(),
+                icon_url: user.avatar_url.clone(),
+            }
+        };
+
+        Ok(FetchedProject { ownership, project })
+    };
+
+    let projects = projects
+        .into_iter()
+        .map(map_project)
+        .collect::<Result<Vec<_>, _>>()?;
+
+    Ok(web::Json(projects))
 }
 
-pub async fn get_project_meta(
+/// Fetch moderation metadata for a specific project.
+#[utoipa::path(
+    responses((status = OK, body = inline(Vec<Project>)))
+)]
+#[get("/project/{id}")]
+async fn get_project_meta(
     req: HttpRequest,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
     info: web::Path<(String,)>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<web::Json<MissingMetadata>, ApiError> {
     check_is_moderator_from_headers(
         &req,
         &**pool,
@@ -202,13 +333,13 @@ pub async fn get_project_meta(
             }
         }
 
-        Ok(HttpResponse::Ok().json(merged))
+        Ok(web::Json(merged))
     } else {
         Err(ApiError::NotFound)
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum Judgement {
     Flame {
@@ -225,13 +356,16 @@ pub enum Judgement {
     },
 }
 
-pub async fn set_project_meta(
+/// Update moderation judgements for projects in the review queue.
+#[utoipa::path]
+#[post("/project")]
+async fn set_project_meta(
     req: HttpRequest,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
     judgements: web::Json<HashMap<String, Judgement>>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<(), ApiError> {
     check_is_moderator_from_headers(
         &req,
         &**pool,
@@ -302,11 +436,11 @@ pub async fn set_project_meta(
 
     sqlx::query(
         "
-            INSERT INTO moderation_external_files (sha1, external_license_id)
-            SELECT * FROM UNNEST ($1::bytea[], $2::bigint[])
-            ON CONFLICT (sha1)
-            DO NOTHING
-            ",
+        INSERT INTO moderation_external_files (sha1, external_license_id)
+        SELECT * FROM UNNEST ($1::bytea[], $2::bigint[])
+        ON CONFLICT (sha1)
+        DO NOTHING
+        ",
     )
     .bind(&file_hashes[..])
     .bind(&ids[..])
@@ -315,5 +449,5 @@ pub async fn set_project_meta(
 
     transaction.commit().await?;
 
-    Ok(HttpResponse::NoContent().finish())
+    Ok(())
 }
diff --git a/apps/labrinth/src/routes/v2/moderation.rs b/apps/labrinth/src/routes/v2/moderation.rs
index ff721e6c..f80970d1 100644
--- a/apps/labrinth/src/routes/v2/moderation.rs
+++ b/apps/labrinth/src/routes/v2/moderation.rs
@@ -30,7 +30,7 @@ pub async fn get_projects(
     count: web::Query<ResultCount>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let response = internal::moderation::get_projects(
+    let response = internal::moderation::get_projects_internal(
         req,
         pool.clone(),
         redis.clone(),
@@ -41,6 +41,7 @@ pub async fn get_projects(
         session_queue,
     )
     .await
+    .map(|resp| HttpResponse::Ok().json(resp))
     .or_else(v2_reroute::flatten_404_error)?;
 
     // Convert to V2 projects

From 8182b795de2246cdb0b6a717360f46b1ce57116c Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Nov 2025 11:54:59 -0800
Subject: [PATCH 33/64] Fix resource pack projects with multiple loaders not
 finding a release in Download modal (#4734)

---
 apps/frontend/src/pages/[type]/[id].vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index 54b1c6b3..be6eeb0a 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -1411,7 +1411,7 @@ const filteredVersions = computed(() => {
 	return versions.value.filter(
 		(x) =>
 			x.game_versions.includes(currentGameVersion.value) &&
-			x.loaders.includes(currentPlatform.value),
+			(x.loaders.includes(currentPlatform.value) || project.value.project_type === 'resourcepack'),
 	)
 })
 

From a694aeed32294380701dae2418361ebac6ba4dd2 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Nov 2025 11:55:16 -0800
Subject: [PATCH 34/64] Add frontend support for Geyser Extension plugin loader
 (#4735)

---
 packages/ui/src/utils/search.ts | 6 ++++--
 packages/utils/utils.ts         | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/utils/search.ts b/packages/ui/src/utils/search.ts
index 28e29e32..af186e4c 100644
--- a/packages/ui/src/utils/search.ts
+++ b/packages/ui/src/utils/search.ts
@@ -93,6 +93,8 @@ export interface SortType {
 	name: string
 }
 
+const PLUGIN_PLATFORMS = ['bungeecord', 'waterfall', 'velocity', 'geyser']
+
 export function useSearch(
 	projectTypes: Ref<ProjectType[]>,
 	tags: Ref<Tags>,
@@ -298,7 +300,7 @@ export function useSearch(
 					.filter(
 						(loader) =>
 							loader.supported_project_types.includes('plugin') &&
-							!['bungeecord', 'waterfall', 'velocity'].includes(loader.name),
+							!PLUGIN_PLATFORMS.includes(loader.name),
 					)
 					.map((loader) => {
 						return {
@@ -324,7 +326,7 @@ export function useSearch(
 				supports_negative_filter: true,
 				searchable: false,
 				options: tags.value.loaders
-					.filter((loader) => ['bungeecord', 'waterfall', 'velocity'].includes(loader.name))
+					.filter((loader) => PLUGIN_PLATFORMS.includes(loader.name))
 					.map((loader) => {
 						return {
 							id: loader.name,
diff --git a/packages/utils/utils.ts b/packages/utils/utils.ts
index 26481c67..e820c96e 100644
--- a/packages/utils/utils.ts
+++ b/packages/utils/utils.ts
@@ -191,6 +191,8 @@ export const formatCategory = (name) => {
 		return 'Resource Pack'
 	} else if (name === 'vanilla') {
 		return 'Vanilla Shader'
+	} else if (name === 'geyser') {
+		return 'Geyser Extension'
 	}
 	return capitalizeString(name)
 }

From 6a6adb3480a0ba4362e777f6817d932d65436dab Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Nov 2025 15:38:06 -0800
Subject: [PATCH 35/64] Updated changelog

---
 packages/utils/changelog.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 0d8b7376..e0898f40 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,12 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-11-07T15:45:00-07:00`,
+		product: 'web',
+		body: `## Improvements
+- Fixed download button pop-up on Resource Pack projects.`,
+	},
 	{
 		date: `2025-11-07T09:30:00-07:00`,
 		product: 'app',

From b998c713379d750cc709f04c721bc451d8bf3fb0 Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Sat, 8 Nov 2025 02:24:08 +0000
Subject: [PATCH 36/64] feat: add skript + mcfunction highlightjs support
 (#4739)

* feat: add skript + mcfunction highlightjs support

* fix: lint

* fix: dep

* lint

---------

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 .../src/components/ui/report/ReportInfo.vue   |   3 +-
 apps/frontend/src/helpers/highlight.js        |  65 --------
 .../src/pages/[type]/[id]/changelog.vue       |   3 +-
 .../pages/[type]/[id]/version/[version].vue   |   3 +-
 .../ui/src/components/base/MarkdownEditor.vue |   2 +-
 .../{highlight.ts => highlightjs/index.ts}    |   9 +-
 packages/utils/highlightjs/skript.ts          | 140 ++++++++++++++++++
 packages/utils/index.ts                       |   2 +-
 packages/utils/package.json                   |   1 +
 .../servers/errors/modrinth-server-error.ts   |   2 +-
 pnpm-lock.yaml                                |  10 ++
 11 files changed, 165 insertions(+), 75 deletions(-)
 delete mode 100644 apps/frontend/src/helpers/highlight.js
 rename packages/utils/{highlight.ts => highlightjs/index.ts} (84%)
 create mode 100644 packages/utils/highlightjs/skript.ts

diff --git a/apps/frontend/src/components/ui/report/ReportInfo.vue b/apps/frontend/src/components/ui/report/ReportInfo.vue
index c81fb4ea..46dc420a 100644
--- a/apps/frontend/src/components/ui/report/ReportInfo.vue
+++ b/apps/frontend/src/components/ui/report/ReportInfo.vue
@@ -105,10 +105,9 @@
 <script setup>
 import { ReportIcon, UnknownIcon, VersionIcon } from '@modrinth/assets'
 import { Avatar, Badge, CopyCode, useRelativeTime } from '@modrinth/ui'
-import { formatProjectType } from '@modrinth/utils'
+import { formatProjectType, renderHighlightedString } from '@modrinth/utils'
 
 import ThreadSummary from '~/components/ui/thread/ThreadSummary.vue'
-import { renderHighlightedString } from '~/helpers/highlight.js'
 import { getProjectTypeForUrl } from '~/helpers/projects.js'
 
 const formatRelativeTime = useRelativeTime()
diff --git a/apps/frontend/src/helpers/highlight.js b/apps/frontend/src/helpers/highlight.js
deleted file mode 100644
index ccb9f58b..00000000
--- a/apps/frontend/src/helpers/highlight.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Configs
-import { configuredXss, md } from '@modrinth/utils'
-import hljs from 'highlight.js/lib/core'
-import gradle from 'highlight.js/lib/languages/gradle'
-// Coding
-import groovy from 'highlight.js/lib/languages/groovy'
-import ini from 'highlight.js/lib/languages/ini'
-import java from 'highlight.js/lib/languages/java'
-// Scripting
-import javascript from 'highlight.js/lib/languages/javascript'
-import json from 'highlight.js/lib/languages/json'
-import kotlin from 'highlight.js/lib/languages/kotlin'
-import lua from 'highlight.js/lib/languages/lua'
-import properties from 'highlight.js/lib/languages/properties'
-import python from 'highlight.js/lib/languages/python'
-import scala from 'highlight.js/lib/languages/scala'
-import xml from 'highlight.js/lib/languages/xml'
-import yaml from 'highlight.js/lib/languages/yaml'
-
-/* REGISTRATION */
-// Scripting
-hljs.registerLanguage('javascript', javascript)
-hljs.registerLanguage('python', python)
-hljs.registerLanguage('lua', lua)
-// Coding
-hljs.registerLanguage('java', java)
-hljs.registerLanguage('kotlin', kotlin)
-hljs.registerLanguage('scala', scala)
-hljs.registerLanguage('groovy', groovy)
-// Configs
-hljs.registerLanguage('gradle', gradle)
-hljs.registerLanguage('json', json)
-hljs.registerLanguage('ini', ini)
-hljs.registerLanguage('yaml', yaml)
-hljs.registerLanguage('xml', xml)
-hljs.registerLanguage('properties', properties)
-
-/* ALIASES */
-// Scripting
-hljs.registerAliases(['js'], { languageName: 'javascript' })
-hljs.registerAliases(['py'], { languageName: 'python' })
-// Coding
-hljs.registerAliases(['kt'], { languageName: 'kotlin' })
-// Configs
-hljs.registerAliases(['json5'], { languageName: 'json' })
-hljs.registerAliases(['toml'], { languageName: 'ini' })
-hljs.registerAliases(['yml'], { languageName: 'yaml' })
-hljs.registerAliases(['html', 'htm', 'xhtml', 'mcui', 'fxml'], { languageName: 'xml' })
-
-export const renderHighlightedString = (string) =>
-	configuredXss.process(
-		md({
-			highlight: function (str, lang) {
-				if (lang && hljs.getLanguage(lang)) {
-					try {
-						return hljs.highlight(str, { language: lang }).value
-					} catch {
-						/* empty */
-					}
-				}
-
-				return ''
-			},
-		}).render(string),
-	)
diff --git a/apps/frontend/src/pages/[type]/[id]/changelog.vue b/apps/frontend/src/pages/[type]/[id]/changelog.vue
index 4dced874..54a28f8f 100644
--- a/apps/frontend/src/pages/[type]/[id]/changelog.vue
+++ b/apps/frontend/src/pages/[type]/[id]/changelog.vue
@@ -76,8 +76,7 @@
 import { DownloadIcon } from '@modrinth/assets'
 import { Pagination } from '@modrinth/ui'
 import VersionFilterControl from '@modrinth/ui/src/components/version/VersionFilterControl.vue'
-
-import { renderHighlightedString } from '~/helpers/highlight.js'
+import { renderHighlightedString } from '@modrinth/utils'
 
 const props = defineProps({
 	project: {
diff --git a/apps/frontend/src/pages/[type]/[id]/version/[version].vue b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
index 14557fa9..5c4f0082 100644
--- a/apps/frontend/src/pages/[type]/[id]/version/[version].vue
+++ b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
@@ -656,7 +656,7 @@ import {
 	injectNotificationManager,
 	MarkdownEditor,
 } from '@modrinth/ui'
-import { formatBytes, formatCategory } from '@modrinth/utils'
+import { formatBytes, formatCategory, renderHighlightedString } from '@modrinth/utils'
 import { Multiselect } from 'vue-multiselect'
 
 import AdPlaceholder from '~/components/ui/AdPlaceholder.vue'
@@ -666,7 +666,6 @@ import Modal from '~/components/ui/Modal.vue'
 import Categories from '~/components/ui/search/Categories.vue'
 import { useImageUpload } from '~/composables/image-upload.ts'
 import { acceptFileFromProjectType } from '~/helpers/fileUtils.js'
-import { renderHighlightedString } from '~/helpers/highlight.js'
 import { inferVersionInfo } from '~/helpers/infer.js'
 import { createDataPackVersion } from '~/helpers/package.js'
 import { reportVersion } from '~/utils/report-helpers.ts'
diff --git a/packages/ui/src/components/base/MarkdownEditor.vue b/packages/ui/src/components/base/MarkdownEditor.vue
index 602ed839..c60cf8ab 100644
--- a/packages/ui/src/components/base/MarkdownEditor.vue
+++ b/packages/ui/src/components/base/MarkdownEditor.vue
@@ -293,7 +293,7 @@ import {
 	YouTubeIcon,
 } from '@modrinth/assets'
 import { markdownCommands, modrinthMarkdownEditorKeymap } from '@modrinth/utils/codemirror'
-import { renderHighlightedString } from '@modrinth/utils/highlight'
+import { renderHighlightedString } from '@modrinth/utils/highlightjs'
 import { type Component, computed, onBeforeUnmount, onMounted, ref, toRef, watch } from 'vue'
 
 import Modal from '../modal/Modal.vue'
diff --git a/packages/utils/highlight.ts b/packages/utils/highlightjs/index.ts
similarity index 84%
rename from packages/utils/highlight.ts
rename to packages/utils/highlightjs/index.ts
index f82c64de..c8e7ba5c 100644
--- a/packages/utils/highlight.ts
+++ b/packages/utils/highlightjs/index.ts
@@ -15,14 +15,18 @@ import python from 'highlight.js/lib/languages/python'
 import scala from 'highlight.js/lib/languages/scala'
 import xml from 'highlight.js/lib/languages/xml'
 import yaml from 'highlight.js/lib/languages/yaml'
+import mcfunction from 'highlightjs-mcfunction'
 
-import { configuredXss, md } from './parse'
+import { configuredXss, md } from '../parse'
+import skript from './skript'
 
 /* REGISTRATION */
 // Scripting
 hljs.registerLanguage('javascript', javascript)
 hljs.registerLanguage('python', python)
 hljs.registerLanguage('lua', lua)
+hljs.registerLanguage('skript', skript)
+hljs.registerLanguage('mcfunction', mcfunction)
 // Coding
 hljs.registerLanguage('java', java)
 hljs.registerLanguage('kotlin', kotlin)
@@ -40,6 +44,9 @@ hljs.registerLanguage('properties', properties)
 // Scripting
 hljs.registerAliases(['js'], { languageName: 'javascript' })
 hljs.registerAliases(['py'], { languageName: 'python' })
+hljs.registerAliases(['sk'], { languageName: 'skript' })
+hljs.registerAliases(['command'], { languageName: 'mcfunction' })
+hljs.registerAliases(['kubejs'], { languageName: 'javascript' })
 // Coding
 hljs.registerAliases(['kt'], { languageName: 'kotlin' })
 // Configs
diff --git a/packages/utils/highlightjs/skript.ts b/packages/utils/highlightjs/skript.ts
new file mode 100644
index 00000000..f2b7de23
--- /dev/null
+++ b/packages/utils/highlightjs/skript.ts
@@ -0,0 +1,140 @@
+import type { HLJSApi } from 'highlight.js'
+
+/*
+Language: Skript
+Description: Skript language support for Minecraft server scripting
+Website: https:
+Category: scripting
+*/
+export default function (hljs: HLJSApi) {
+	const CONTROL_KEYWORDS = {
+		keyword: 'if else while loop return continue at stop cancel false true now',
+		built_in: 'parse do',
+	}
+
+	const ENTITIES = 'player players victim attacker sender loop-player shooter console'
+	const CONDITION_OPERATORS =
+		'contains has have is was were are does can cannot ' +
+		"hasn't haven't isn't wasn't weren't aren't doesn't can't"
+
+	return {
+		name: 'Skript',
+		aliases: ['sk'],
+		case_insensitive: true,
+		keywords: CONTROL_KEYWORDS,
+		contains: [
+			{
+				className: 'comment',
+				begin: '(?<!#)#(?!#)',
+				end: '$',
+				relevance: 0,
+			},
+			{
+				className: 'string',
+				begin: '"',
+				end: '"',
+				illegal: '\\n',
+				contains: [hljs.BACKSLASH_ESCAPE],
+			},
+
+			{
+				className: 'section',
+				begin: '\\bon\\s+',
+				end: ':',
+				excludeEnd: false,
+				keywords: 'on',
+				relevance: 10,
+			},
+
+			{
+				className: 'section',
+				begin: '\\bcommand\\s+/',
+				end: ':',
+				excludeEnd: false,
+				relevance: 10,
+			},
+
+			{
+				className: 'variable',
+				begin: '{',
+				end: '}',
+				contains: [
+					{
+						className: 'variable',
+						begin: ':+',
+						relevance: 0,
+					},
+				],
+			},
+
+			{
+				className: 'params',
+				begin: '<',
+				end: '>',
+				relevance: 5,
+			},
+
+			{
+				className: 'function',
+				begin: '\\b[a-zA-Z_][a-zA-Z0-9_]*(?=\\()',
+				relevance: 0,
+			},
+
+			{
+				className: 'variable',
+				begin: '\\b(loop|event)-[a-zA-Z]+\\b',
+				relevance: 5,
+			},
+
+			{
+				className: 'number',
+				variants: [
+					{ begin: '\\b\\d+(\\.\\d+)?\\s+(tick|second|minute|hour|day)s?\\b' },
+
+					{ begin: '\\ba\\s+(tick|second|minute|hour|day)s?\\b' },
+
+					{ begin: '\\b(minecraft|mc|real|rl|irl)\\s+(tick|second|minute|hour|day)s?\\b' },
+				],
+				relevance: 0,
+			},
+
+			hljs.NUMBER_MODE,
+
+			{
+				className: 'built_in',
+				begin: '\\b(' + ENTITIES + ')\\b',
+				relevance: 0,
+			},
+
+			{
+				className: 'built_in',
+				begin: "(uuid\\s+of|'s\\s+uuid|location\\s+of|'s\\s+location)",
+				relevance: 0,
+			},
+
+			{
+				className: 'operator',
+				begin: '\\b(' + CONDITION_OPERATORS.split(' ').join('|') + ')\\b',
+				relevance: 0,
+			},
+
+			{
+				className: 'operator',
+				begin: '::?',
+				relevance: 0,
+			},
+
+			{
+				className: 'literal',
+				begin: '\\b(true|false)\\b',
+				relevance: 0,
+			},
+
+			{
+				className: 'keyword',
+				begin: '\\b(stop|cancel|halt|enable|disable|trigger|server)\\b',
+				relevance: 5,
+			},
+		],
+	}
+}
diff --git a/packages/utils/index.ts b/packages/utils/index.ts
index 1555a9e9..8ddeeb39 100644
--- a/packages/utils/index.ts
+++ b/packages/utils/index.ts
@@ -1,7 +1,7 @@
 export * from './api'
 export * from './billing'
 export * from './changelog'
-export * from './highlight'
+export * from './highlightjs'
 export * from './licenses'
 export * from './parse'
 export * from './projects'
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 766bcae1..5c8a2924 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -21,6 +21,7 @@
 		"@types/three": "^0.172.0",
 		"dayjs": "^1.11.10",
 		"highlight.js": "^11.9.0",
+		"highlightjs-mcfunction": "github:modrinth/better-highlightjs-mcfunction",
 		"markdown-it": "^14.1.0",
 		"ofetch": "^1.3.4",
 		"three": "^0.172.0",
diff --git a/packages/utils/servers/errors/modrinth-server-error.ts b/packages/utils/servers/errors/modrinth-server-error.ts
index 6c7fe5d8..b5ced9ff 100644
--- a/packages/utils/servers/errors/modrinth-server-error.ts
+++ b/packages/utils/servers/errors/modrinth-server-error.ts
@@ -9,7 +9,7 @@ export class ModrinthServerError extends Error {
 		public readonly originalError?: Error,
 		public readonly module?: string,
 		public readonly v1Error?: V1ErrorInfo,
-		public readonly responseData?: any,
+		public readonly responseData?: unknown,
 	) {
 		let errorMessage = message
 		let method = 'GET'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 78f09b46..7be2c8cf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -652,6 +652,9 @@ importers:
       highlight.js:
         specifier: ^11.9.0
         version: 11.9.0
+      highlightjs-mcfunction:
+        specifier: github:modrinth/better-highlightjs-mcfunction
+        version: https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/68a27ae888cfc0e8737f4f2cf1abb67e82078166
       markdown-it:
         specifier: ^14.1.0
         version: 14.1.0
@@ -5022,6 +5025,10 @@ packages:
     resolution: {integrity: sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==}
     engines: {node: '>=12.0.0'}
 
+  highlightjs-mcfunction@https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/68a27ae888cfc0e8737f4f2cf1abb67e82078166:
+    resolution: {tarball: https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/68a27ae888cfc0e8737f4f2cf1abb67e82078166}
+    version: 1.0.0
+
   hookable@5.5.3:
     resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==}
 
@@ -7106,6 +7113,7 @@ packages:
   sitemap@8.0.0:
     resolution: {integrity: sha512-+AbdxhM9kJsHtruUF39bwS/B0Fytw6Fr1o4ZAIAEqA6cke2xcoO2GleBw9Zw7nRzILVEgz7zBM5GiTJjie1G9A==}
     engines: {node: '>=14.0.0', npm: '>=6.0.0'}
+    deprecated: 'SECURITY: Multiple vulnerabilities fixed in 8.0.1 (XML injection, path traversal, command injection, protocol injection). Upgrade immediately: npm install sitemap@8.0.1'
     hasBin: true
 
   slash@5.1.0:
@@ -13707,6 +13715,8 @@ snapshots:
 
   highlight.js@11.9.0: {}
 
+  highlightjs-mcfunction@https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/68a27ae888cfc0e8737f4f2cf1abb67e82078166: {}
+
   hookable@5.5.3: {}
 
   hosted-git-info@2.8.9: {}

From 1efdceacfde9c80355dd87aefa2c4489e1342ebf Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Nov 2025 21:06:54 -0800
Subject: [PATCH 37/64] changelog

---
 packages/utils/changelog.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index e0898f40..58b7e0e4 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,12 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-11-07T21:10:00-07:00`,
+		product: 'web',
+		body: `## Improvements
+- Enhanced syntax highlighting support for skript, mcfunction, and kubejs code blocks in Markdown descriptions.`,
+	},
 	{
 		date: `2025-11-07T15:45:00-07:00`,
 		product: 'web',

From f8a5a77daac26c6e47829794dab045cf26261e39 Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Sat, 8 Nov 2025 12:26:24 -0800
Subject: [PATCH 38/64] Expose test utils to Labrinth dependents (#4703)

* Expose test utils to Labrinth dependents

* Feature gate `labrinth::test`

* Unify db migrators

* Expose `NotificationBuilder::insert_many_deliveries`

* Add logging utils to common crate

* Remove unused console-subscriber layer

* fix CI
---
 .cargo/config.toml                            |   5 +-
 Cargo.lock                                    | 217 +-----------------
 Cargo.toml                                    |   1 -
 apps/labrinth/Cargo.toml                      |  10 +-
 .../src/database/models/notification_item.rs  |   2 +-
 apps/labrinth/src/lib.rs                      |   4 +-
 apps/labrinth/src/main.rs                     |  54 +----
 .../common => src/test}/api_common/generic.rs |  24 +-
 .../common => src/test}/api_common/mod.rs     |   8 +-
 .../common => src/test}/api_common/models.rs  |   8 +-
 .../test}/api_common/request_data.rs          |   4 +-
 .../{tests/common => src/test}/api_v2/mod.rs  |   8 +-
 .../common => src/test}/api_v2/project.rs     |  26 +--
 .../test}/api_v2/request_data.rs              |   6 +-
 .../{tests/common => src/test}/api_v2/tags.rs |  20 +-
 .../{tests/common => src/test}/api_v2/team.rs |  18 +-
 .../{tests/common => src/test}/api_v2/user.rs |   2 +-
 .../common => src/test}/api_v2/version.rs     |  22 +-
 .../common => src/test}/api_v3/collections.rs |   8 +-
 .../common => src/test}/api_v3/limits.rs      |  12 +-
 .../{tests/common => src/test}/api_v3/mod.rs  |   8 +-
 .../common => src/test}/api_v3/oauth.rs       |  14 +-
 .../test}/api_v3/oauth_clients.rs             |  18 +-
 .../test}/api_v3/organization.rs              |   8 +-
 .../common => src/test}/api_v3/project.rs     |  28 ++-
 .../test}/api_v3/request_data.rs              |   6 +-
 .../{tests/common => src/test}/api_v3/tags.rs |  24 +-
 .../{tests/common => src/test}/api_v3/team.rs |  18 +-
 .../{tests/common => src/test}/api_v3/user.rs |   2 +-
 .../common => src/test}/api_v3/version.rs     |  22 +-
 .../{tests/common => src/test}/asserts.rs     |  17 +-
 .../{tests/common => src/test}/database.rs    |  16 +-
 .../{tests/common => src/test}/dummy_data.rs  |  16 +-
 .../{tests/common => src/test}/environment.rs |   3 +-
 apps/labrinth/src/test/mod.rs                 |  75 ++++++
 .../{tests/common => src/test}/pats.rs        |   4 +-
 .../{tests/common => src/test}/permissions.rs |   4 +-
 .../{tests/common => src/test}/scopes.rs      |   2 +-
 .../{tests/common => src/test}/search.rs      |  12 +-
 apps/labrinth/tests/common.rs                 |  32 +++
 apps/labrinth/tests/common/mod.rs             |  75 ------
 apps/labrinth/tests/v2/error.rs               |   3 +-
 packages/modrinth-util/Cargo.toml             |   3 +
 packages/modrinth-util/src/lib.rs             |   2 +
 packages/modrinth-util/src/log.rs             |  74 ++++++
 45 files changed, 378 insertions(+), 567 deletions(-)
 rename apps/labrinth/{tests/common => src/test}/api_common/generic.rs (92%)
 rename apps/labrinth/{tests/common => src/test}/api_common/mod.rs (99%)
 rename apps/labrinth/{tests/common => src/test}/api_common/models.rs (99%)
 rename apps/labrinth/{tests/common => src/test}/api_common/request_data.rs (85%)
 rename apps/labrinth/{tests/common => src/test}/api_v2/mod.rs (85%)
 rename apps/labrinth/{tests/common => src/test}/api_v2/project.rs (97%)
 rename apps/labrinth/{tests/common => src/test}/api_v2/request_data.rs (96%)
 rename apps/labrinth/{tests/common => src/test}/api_v2/tags.rs (93%)
 rename apps/labrinth/{tests/common => src/test}/api_v2/team.rs (98%)
 rename apps/labrinth/{tests/common => src/test}/api_v2/user.rs (95%)
 rename apps/labrinth/{tests/common => src/test}/api_v2/version.rs (98%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/collections.rs (96%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/limits.rs (87%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/mod.rs (86%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/oauth.rs (97%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/oauth_clients.rs (97%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/organization.rs (96%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/project.rs (98%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/request_data.rs (96%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/tags.rs (91%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/team.rs (98%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/user.rs (95%)
 rename apps/labrinth/{tests/common => src/test}/api_v3/version.rs (98%)
 rename apps/labrinth/{tests/common => src/test}/asserts.rs (69%)
 rename apps/labrinth/{tests/common => src/test}/database.rs (95%)
 rename apps/labrinth/{tests/common => src/test}/dummy_data.rs (98%)
 rename apps/labrinth/{tests/common => src/test}/environment.rs (98%)
 rename apps/labrinth/{tests/common => src/test}/pats.rs (98%)
 rename apps/labrinth/{tests/common => src/test}/permissions.rs (99%)
 rename apps/labrinth/{tests/common => src/test}/scopes.rs (99%)
 rename apps/labrinth/{tests/common => src/test}/search.rs (97%)
 create mode 100644 apps/labrinth/tests/common.rs
 delete mode 100644 apps/labrinth/tests/common/mod.rs
 create mode 100644 packages/modrinth-util/src/log.rs

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 17380505..bdeac036 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,9 +1,6 @@
-[build]
-rustflags = ["--cfg", "tokio_unstable"]
-
 # Windows has stack overflows when calling from Tauri, so we increase the default stack size used by the compiler
 [target.'cfg(windows)']
-rustflags = ["--cfg", "tokio_unstable", "-C", "link-args=/STACK:16777220"]
+rustflags = ["-C", "link-args=/STACK:16777220"]
 
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld"
diff --git a/Cargo.lock b/Cargo.lock
index 792031ea..65d75c50 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -671,28 +671,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "async-stream"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "async-stripe"
 version = "0.41.0"
@@ -914,53 +892,6 @@ dependencies = [
  "thiserror 2.0.17",
 ]
 
-[[package]]
-name = "axum"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
-dependencies = [
- "async-trait",
- "axum-core",
- "bytes",
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "sync_wrapper",
- "tower 0.5.2",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "mime",
- "pin-project-lite",
- "rustversion",
- "sync_wrapper",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "backtrace"
 version = "0.3.76"
@@ -1697,45 +1628,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "console-api"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857"
-dependencies = [
- "futures-core",
- "prost",
- "prost-types",
- "tonic",
- "tracing-core",
-]
-
-[[package]]
-name = "console-subscriber"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6539aa9c6a4cd31f4b1c040f860a1eac9aa80e7df6b05d506a6e7179936d6a01"
-dependencies = [
- "console-api",
- "crossbeam-channel",
- "crossbeam-utils",
- "futures-task",
- "hdrhistogram",
- "humantime",
- "hyper-util",
- "prost",
- "prost-types",
- "serde",
- "serde_json",
- "thread_local",
- "tokio",
- "tokio-stream",
- "tonic",
- "tracing",
- "tracing-core",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -3647,19 +3539,6 @@ dependencies = [
  "hashbrown 0.15.5",
 ]
 
-[[package]]
-name = "hdrhistogram"
-version = "7.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
-dependencies = [
- "base64 0.21.7",
- "byteorder",
- "flate2",
- "nom 7.1.3",
- "num-traits",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -3875,12 +3754,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
-[[package]]
-name = "humantime"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
-
 [[package]]
 name = "hyper"
 version = "0.14.32"
@@ -3962,19 +3835,6 @@ dependencies = [
  "webpki-roots 1.0.3",
 ]
 
-[[package]]
-name = "hyper-timeout"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
-dependencies = [
- "hyper 1.7.0",
- "hyper-util",
- "pin-project-lite",
- "tokio",
- "tower-service",
-]
-
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -4660,7 +4520,6 @@ dependencies = [
  "clickhouse",
  "color-eyre",
  "color-thief",
- "console-subscriber",
  "const_format",
  "dashmap",
  "deadpool-redis",
@@ -4679,9 +4538,11 @@ dependencies = [
  "itertools 0.14.0",
  "jemalloc_pprof",
  "json-patch 4.1.0",
+ "labrinth",
  "lettre",
  "meilisearch-sdk",
  "modrinth-maxmind",
+ "modrinth-util",
  "muralpay",
  "murmur2",
  "paste",
@@ -4715,8 +4576,6 @@ dependencies = [
  "totp-rs",
  "tracing",
  "tracing-actix-web",
- "tracing-ecs",
- "tracing-subscriber",
  "url",
  "urlencoding",
  "utoipa",
@@ -5030,12 +4889,6 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
-[[package]]
-name = "matchit"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
-
 [[package]]
 name = "maxminddb"
 version = "0.26.0"
@@ -5230,6 +5083,9 @@ dependencies = [
  "dotenvy",
  "eyre",
  "serde",
+ "tracing",
+ "tracing-ecs",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -6743,15 +6599,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "prost-types"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
-dependencies = [
- "prost",
-]
-
 [[package]]
 name = "protobuf"
 version = "3.7.2"
@@ -7332,7 +7179,7 @@ dependencies = [
  "tokio-native-tls",
  "tokio-rustls 0.26.4",
  "tokio-util",
- "tower 0.5.2",
+ "tower",
  "tower-http",
  "tower-service",
  "url",
@@ -10029,36 +9876,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
 
-[[package]]
-name = "tonic"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
-dependencies = [
- "async-stream",
- "async-trait",
- "axum",
- "base64 0.22.1",
- "bytes",
- "h2 0.4.12",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.7.0",
- "hyper-timeout",
- "hyper-util",
- "percent-encoding",
- "pin-project",
- "prost",
- "socket2 0.5.10",
- "tokio",
- "tokio-stream",
- "tower 0.4.13",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "totp-rs"
 version = "5.7.0"
@@ -10073,26 +9890,6 @@ dependencies = [
  "sha2",
 ]
 
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "indexmap 1.9.3",
- "pin-project",
- "pin-project-lite",
- "rand 0.8.5",
- "slab",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "tower"
 version = "0.5.2"
@@ -10121,7 +9918,7 @@ dependencies = [
  "http-body 1.0.1",
  "iri-string",
  "pin-project-lite",
- "tower 0.5.2",
+ "tower",
  "tower-layer",
  "tower-service",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 0db90446..cbabe426 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -55,7 +55,6 @@ clap = "4.5.48"
 clickhouse = "0.14.0"
 color-eyre = "0.6.5"
 color-thief = "0.2.2"
-console-subscriber = "0.4.1"
 const_format = "0.2.34"
 daedalus = { path = "packages/daedalus" }
 dashmap = "6.1.0"
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index 9502fbdc..bed033df 100644
--- a/apps/labrinth/Cargo.toml
+++ b/apps/labrinth/Cargo.toml
@@ -12,6 +12,7 @@ path = "src/main.rs"
 [dependencies]
 actix-cors = { workspace = true }
 actix-files = { workspace = true }
+actix-http = { workspace = true, optional = true }
 actix-multipart = { workspace = true }
 actix-rt = { workspace = true }
 actix-web = { workspace = true }
@@ -36,7 +37,6 @@ clap = { workspace = true, features = ["derive"] }
 clickhouse = { workspace = true, features = ["time", "uuid"] }
 color-eyre = { workspace = true }
 color-thief = { workspace = true }
-console-subscriber = { workspace = true }
 const_format = { workspace = true }
 dashmap = { workspace = true }
 deadpool-redis.workspace = true
@@ -71,6 +71,7 @@ json-patch = { workspace = true }
 lettre = { workspace = true }
 meilisearch-sdk = { workspace = true, features = ["reqwest"] }
 modrinth-maxmind = { workspace = true }
+modrinth-util = { workspace = true }
 muralpay = { workspace = true, features = ["utoipa"] }
 murmur2 = { workspace = true }
 paste = { workspace = true }
@@ -119,8 +120,6 @@ tokio-stream = { workspace = true }
 totp-rs = { workspace = true, features = ["gen_secret"] }
 tracing = { workspace = true }
 tracing-actix-web = { workspace = true }
-tracing-ecs = { workspace = true }
-tracing-subscriber = { workspace = true }
 url = { workspace = true }
 urlencoding = { workspace = true }
 utoipa = { workspace = true }
@@ -135,7 +134,7 @@ zip = { workspace = true }
 zxcvbn = { workspace = true }
 
 [dev-dependencies]
-actix-http = { workspace = true }
+labrinth = { path = ".", features = ["test"] }
 
 [build-dependencies]
 chrono = { workspace = true }
@@ -150,5 +149,8 @@ tikv-jemallocator = { workspace = true, features = [
   "unprefixed_malloc_on_supported_platforms",
 ] }
 
+[features]
+test = ["dep:actix-http"]
+
 [lints]
 workspace = true
diff --git a/apps/labrinth/src/database/models/notification_item.rs b/apps/labrinth/src/database/models/notification_item.rs
index bf3d5e7d..ce3d627d 100644
--- a/apps/labrinth/src/database/models/notification_item.rs
+++ b/apps/labrinth/src/database/models/notification_item.rs
@@ -160,7 +160,7 @@ impl NotificationBuilder {
         Ok(())
     }
 
-    async fn insert_many_deliveries(
+    pub async fn insert_many_deliveries(
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
         notification_ids: &[i64],
diff --git a/apps/labrinth/src/lib.rs b/apps/labrinth/src/lib.rs
index 78a7489f..992fa385 100644
--- a/apps/labrinth/src/lib.rs
+++ b/apps/labrinth/src/lib.rs
@@ -37,10 +37,12 @@ pub mod routes;
 pub mod scheduler;
 pub mod search;
 pub mod sync;
-pub mod test;
 pub mod util;
 pub mod validate;
 
+#[cfg(feature = "test")]
+pub mod test;
+
 #[derive(Clone)]
 pub struct Pepper {
     pub pepper: String,
diff --git a/apps/labrinth/src/main.rs b/apps/labrinth/src/main.rs
index 799a202d..210f5a52 100644
--- a/apps/labrinth/src/main.rs
+++ b/apps/labrinth/src/main.rs
@@ -17,15 +17,9 @@ use labrinth::util::ratelimit::rate_limit_middleware;
 use labrinth::utoipa_app_config;
 use labrinth::{check_env_vars, clickhouse, database, file_hosting};
 use std::ffi::CStr;
-use std::str::FromStr;
 use std::sync::Arc;
-use tracing::level_filters::LevelFilter;
 use tracing::{Instrument, error, info, info_span};
 use tracing_actix_web::TracingLogger;
-use tracing_ecs::ECSLayerBuilder;
-use tracing_subscriber::EnvFilter;
-use tracing_subscriber::layer::SubscriberExt;
-use tracing_subscriber::util::SubscriberInitExt;
 use utoipa::OpenApi;
 use utoipa_actix_web::AppExt;
 use utoipa_swagger_ui::SwaggerUi;
@@ -59,59 +53,13 @@ struct Args {
     run_background_task: Option<BackgroundTask>,
 }
 
-#[derive(Debug, Clone, Default, PartialEq, Eq)]
-enum OutputFormat {
-    #[default]
-    Human,
-    Json,
-}
-
-impl FromStr for OutputFormat {
-    type Err = ();
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "human" => Ok(Self::Human),
-            "json" => Ok(Self::Json),
-            _ => Err(()),
-        }
-    }
-}
-
 #[actix_rt::main]
 async fn main() -> std::io::Result<()> {
     let args = Args::parse();
 
     color_eyre::install().expect("failed to install `color-eyre`");
     dotenvy::dotenv().ok();
-    let console_layer = console_subscriber::spawn();
-    let env_filter = EnvFilter::builder()
-        .with_default_directive(LevelFilter::INFO.into())
-        .from_env_lossy();
-
-    let output_format =
-        dotenvy::var("LABRINTH_FORMAT").map_or(OutputFormat::Human, |format| {
-            format
-                .parse::<OutputFormat>()
-                .unwrap_or_else(|_| panic!("invalid output format '{format}'"))
-        });
-
-    match output_format {
-        OutputFormat::Human => {
-            tracing_subscriber::registry()
-                .with(console_layer)
-                .with(env_filter)
-                .with(tracing_subscriber::fmt::layer())
-                .init();
-        }
-        OutputFormat::Json => {
-            tracing_subscriber::registry()
-                .with(console_layer)
-                .with(env_filter)
-                .with(ECSLayerBuilder::default().stdout())
-                .init();
-        }
-    }
+    modrinth_util::log::init().expect("failed to initialize logging");
 
     if check_env_vars() {
         error!("Some environment variables are missing!");
diff --git a/apps/labrinth/tests/common/api_common/generic.rs b/apps/labrinth/src/test/api_common/generic.rs
similarity index 92%
rename from apps/labrinth/tests/common/api_common/generic.rs
rename to apps/labrinth/src/test/api_common/generic.rs
index 2c1ca2a9..9b044b1d 100644
--- a/apps/labrinth/tests/common/api_common/generic.rs
+++ b/apps/labrinth/src/test/api_common/generic.rs
@@ -1,13 +1,13 @@
 use std::collections::HashMap;
 
-use crate::common::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile};
-use actix_web::dev::ServiceResponse;
-use async_trait::async_trait;
-use labrinth::models::ids::ProjectId;
-use labrinth::models::{
+use crate::models::ids::ProjectId;
+use crate::models::{
     projects::VersionType,
     teams::{OrganizationPermissions, ProjectPermissions},
 };
+use crate::test::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile};
+use actix_web::dev::ServiceResponse;
+use async_trait::async_trait;
 
 use super::{
     Api, ApiProject, ApiTags, ApiTeams, ApiUser, ApiVersion,
@@ -81,7 +81,7 @@ delegate_api_variant!(
         [add_gallery_item, ServiceResponse, id_or_slug: &str, image: ImageData,  featured: bool, title: Option<String>, description: Option<String>, ordering: Option<i32>, pat: Option<&str>],
         [remove_gallery_item, ServiceResponse, id_or_slug: &str, image_url: &str, pat: Option<&str>],
         [edit_gallery_item, ServiceResponse, id_or_slug: &str, image_url: &str, patch: HashMap<String, String>, pat: Option<&str>],
-        [create_report, ServiceResponse, report_type: &str, id: &str, item_type: crate::common::api_common::models::CommonItemType, body: &str, pat: Option<&str>],
+        [create_report, ServiceResponse, report_type: &str, id: &str, item_type: crate::test::api_common::models::CommonItemType, body: &str, pat: Option<&str>],
         [get_report, ServiceResponse, id: &str, pat: Option<&str>],
         [get_reports, ServiceResponse, ids: &[&str], pat: Option<&str>],
         [get_user_reports, ServiceResponse, pat: Option<&str>],
@@ -100,9 +100,9 @@ delegate_api_variant!(
     #[async_trait(?Send)]
     impl ApiTags for GenericApi {
         [get_loaders, ServiceResponse,],
-        [get_loaders_deserialized_common, Vec<crate::common::api_common::models::CommonLoaderData>,],
+        [get_loaders_deserialized_common, Vec<crate::test::api_common::models::CommonLoaderData>,],
         [get_categories, ServiceResponse,],
-        [get_categories_deserialized_common, Vec<crate::common::api_common::models::CommonCategoryData>,],
+        [get_categories_deserialized_common, Vec<crate::test::api_common::models::CommonCategoryData>,],
     }
 );
 
@@ -110,18 +110,18 @@ delegate_api_variant!(
     #[async_trait(?Send)]
     impl ApiTeams for GenericApi {
         [get_team_members, ServiceResponse, team_id: &str, pat: Option<&str>],
-        [get_team_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, team_id: &str, pat: Option<&str>],
+        [get_team_members_deserialized_common, Vec<crate::test::api_common::models::CommonTeamMember>, team_id: &str, pat: Option<&str>],
         [get_teams_members, ServiceResponse, ids: &[&str], pat: Option<&str>],
         [get_project_members, ServiceResponse, id_or_slug: &str, pat: Option<&str>],
-        [get_project_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, id_or_slug: &str, pat: Option<&str>],
+        [get_project_members_deserialized_common, Vec<crate::test::api_common::models::CommonTeamMember>, id_or_slug: &str, pat: Option<&str>],
         [get_organization_members, ServiceResponse, id_or_title: &str, pat: Option<&str>],
-        [get_organization_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, id_or_title: &str, pat: Option<&str>],
+        [get_organization_members_deserialized_common, Vec<crate::test::api_common::models::CommonTeamMember>, id_or_title: &str, pat: Option<&str>],
         [join_team, ServiceResponse, team_id: &str, pat: Option<&str>],
         [remove_from_team, ServiceResponse, team_id: &str, user_id: &str, pat: Option<&str>],
         [edit_team_member, ServiceResponse, team_id: &str, user_id: &str, patch: serde_json::Value, pat: Option<&str>],
         [transfer_team_ownership, ServiceResponse, team_id: &str, user_id: &str, pat: Option<&str>],
         [get_user_notifications, ServiceResponse, user_id: &str, pat: Option<&str>],
-        [get_user_notifications_deserialized_common, Vec<crate::common::api_common::models::CommonNotification>, user_id: &str, pat: Option<&str>],
+        [get_user_notifications_deserialized_common, Vec<crate::test::api_common::models::CommonNotification>, user_id: &str, pat: Option<&str>],
         [get_notification, ServiceResponse, notification_id: &str, pat: Option<&str>],
         [get_notifications, ServiceResponse, ids: &[&str], pat: Option<&str>],
         [mark_notification_read, ServiceResponse, notification_id: &str, pat: Option<&str>],
diff --git a/apps/labrinth/tests/common/api_common/mod.rs b/apps/labrinth/src/test/api_common/mod.rs
similarity index 99%
rename from apps/labrinth/tests/common/api_common/mod.rs
rename to apps/labrinth/src/test/api_common/mod.rs
index 3ac17328..d24eb794 100644
--- a/apps/labrinth/tests/common/api_common/mod.rs
+++ b/apps/labrinth/src/test/api_common/mod.rs
@@ -6,16 +6,16 @@ use self::models::{
 };
 use self::request_data::{ImageData, ProjectCreationRequestData};
 use super::dummy_data::TestFile;
-use actix_web::dev::ServiceResponse;
-use async_trait::async_trait;
-use labrinth::models::ids::ProjectId;
-use labrinth::{
+use crate::models::ids::ProjectId;
+use crate::{
     LabrinthConfig,
     models::{
         projects::VersionType,
         teams::{OrganizationPermissions, ProjectPermissions},
     },
 };
+use actix_web::dev::ServiceResponse;
+use async_trait::async_trait;
 
 pub mod generic;
 pub mod models;
diff --git a/apps/labrinth/tests/common/api_common/models.rs b/apps/labrinth/src/test/api_common/models.rs
similarity index 99%
rename from apps/labrinth/tests/common/api_common/models.rs
rename to apps/labrinth/src/test/api_common/models.rs
index 454983c2..4c80e1b1 100644
--- a/apps/labrinth/tests/common/api_common/models.rs
+++ b/apps/labrinth/src/test/api_common/models.rs
@@ -1,10 +1,8 @@
-use ariadne::ids::UserId;
-use chrono::{DateTime, Utc};
-use labrinth::models::ids::{
+use crate::models::ids::{
     ImageId, NotificationId, OrganizationId, ProjectId, ReportId, TeamId,
     ThreadId, ThreadMessageId, VersionId,
 };
-use labrinth::{
+use crate::{
     auth::AuthProvider,
     models::{
         projects::{
@@ -16,6 +14,8 @@ use labrinth::{
         users::{Badges, Role, User, UserPayoutData},
     },
 };
+use ariadne::ids::UserId;
+use chrono::{DateTime, Utc};
 use rust_decimal::Decimal;
 use serde::Deserialize;
 // Fields shared by every version of the API.
diff --git a/apps/labrinth/tests/common/api_common/request_data.rs b/apps/labrinth/src/test/api_common/request_data.rs
similarity index 85%
rename from apps/labrinth/tests/common/api_common/request_data.rs
rename to apps/labrinth/src/test/api_common/request_data.rs
index 3bfc886a..d85b0884 100644
--- a/apps/labrinth/tests/common/api_common/request_data.rs
+++ b/apps/labrinth/src/test/api_common/request_data.rs
@@ -1,9 +1,9 @@
 // The structures for project/version creation.
 // These are created differently, but are essentially the same between versions.
 
-use labrinth::util::actix::MultipartSegment;
+use crate::util::actix::MultipartSegment;
 
-use crate::common::dummy_data::TestFile;
+use crate::test::dummy_data::TestFile;
 
 pub struct ProjectCreationRequestData {
     pub slug: String,
diff --git a/apps/labrinth/tests/common/api_v2/mod.rs b/apps/labrinth/src/test/api_v2/mod.rs
similarity index 85%
rename from apps/labrinth/tests/common/api_v2/mod.rs
rename to apps/labrinth/src/test/api_v2/mod.rs
index e197c4b7..67b7ecb8 100644
--- a/apps/labrinth/tests/common/api_v2/mod.rs
+++ b/apps/labrinth/src/test/api_v2/mod.rs
@@ -2,9 +2,9 @@ use super::{
     api_common::{Api, ApiBuildable},
     environment::LocalService,
 };
+use crate::LabrinthConfig;
 use actix_web::{App, dev::ServiceResponse, test};
 use async_trait::async_trait;
-use labrinth::LabrinthConfig;
 use std::rc::Rc;
 use utoipa_actix_web::AppExt;
 
@@ -26,12 +26,10 @@ impl ApiBuildable for ApiV2 {
         let app = App::new()
             .into_utoipa_app()
             .configure(|cfg| {
-                labrinth::utoipa_app_config(cfg, labrinth_config.clone())
+                crate::utoipa_app_config(cfg, labrinth_config.clone())
             })
             .into_app()
-            .configure(|cfg| {
-                labrinth::app_config(cfg, labrinth_config.clone())
-            });
+            .configure(|cfg| crate::app_config(cfg, labrinth_config.clone()));
         let test_app: Rc<dyn LocalService> =
             Rc::new(test::init_service(app).await);
 
diff --git a/apps/labrinth/tests/common/api_v2/project.rs b/apps/labrinth/src/test/api_v2/project.rs
similarity index 97%
rename from apps/labrinth/tests/common/api_v2/project.rs
rename to apps/labrinth/src/test/api_v2/project.rs
index d27eb9ad..476889b1 100644
--- a/apps/labrinth/tests/common/api_v2/project.rs
+++ b/apps/labrinth/src/test/api_v2/project.rs
@@ -1,15 +1,17 @@
 use std::{collections::HashMap, fmt::Write};
 
-use crate::{
-    assert_status,
-    common::{
-        api_common::{
-            Api, ApiProject, AppendsOptionalPat,
-            models::{CommonItemType, CommonProject, CommonVersion},
-            request_data::{ImageData, ProjectCreationRequestData},
-        },
-        dummy_data::TestFile,
+use crate::test::asserts::assert_status;
+use crate::test::{
+    api_common::{
+        Api, ApiProject, AppendsOptionalPat,
+        models::{CommonItemType, CommonProject, CommonVersion},
+        request_data::{ImageData, ProjectCreationRequestData},
     },
+    dummy_data::TestFile,
+};
+use crate::{
+    models::v2::{projects::LegacyProject, search::LegacySearchResults},
+    util::actix::AppendsMultipart,
 };
 use actix_http::StatusCode;
 use actix_web::{
@@ -18,13 +20,9 @@ use actix_web::{
 };
 use async_trait::async_trait;
 use bytes::Bytes;
-use labrinth::{
-    models::v2::{projects::LegacyProject, search::LegacySearchResults},
-    util::actix::AppendsMultipart,
-};
 use serde_json::json;
 
-use crate::common::database::MOD_USER_PAT;
+use crate::test::database::MOD_USER_PAT;
 
 use super::{
     ApiV2,
diff --git a/apps/labrinth/tests/common/api_v2/request_data.rs b/apps/labrinth/src/test/api_v2/request_data.rs
similarity index 96%
rename from apps/labrinth/tests/common/api_v2/request_data.rs
rename to apps/labrinth/src/test/api_v2/request_data.rs
index 11841ead..e2e7156c 100644
--- a/apps/labrinth/tests/common/api_v2/request_data.rs
+++ b/apps/labrinth/src/test/api_v2/request_data.rs
@@ -1,13 +1,13 @@
 use serde_json::json;
 
-use crate::common::{
+use crate::models::ids::ProjectId;
+use crate::test::{
     api_common::request_data::{
         ProjectCreationRequestData, VersionCreationRequestData,
     },
     dummy_data::TestFile,
 };
-use labrinth::models::ids::ProjectId;
-use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
+use crate::util::actix::{MultipartSegment, MultipartSegmentData};
 
 pub fn get_public_project_creation_data(
     slug: &str,
diff --git a/apps/labrinth/tests/common/api_v2/tags.rs b/apps/labrinth/src/test/api_v2/tags.rs
similarity index 93%
rename from apps/labrinth/tests/common/api_v2/tags.rs
rename to apps/labrinth/src/test/api_v2/tags.rs
index c68aed17..4184832d 100644
--- a/apps/labrinth/tests/common/api_v2/tags.rs
+++ b/apps/labrinth/src/test/api_v2/tags.rs
@@ -1,22 +1,20 @@
+use crate::routes::v2::tags::{
+    CategoryData, DonationPlatformQueryData, GameVersionQueryData, LoaderData,
+};
 use actix_http::StatusCode;
 use actix_web::{
     dev::ServiceResponse,
     test::{self, TestRequest},
 };
 use async_trait::async_trait;
-use labrinth::routes::v2::tags::{
-    CategoryData, DonationPlatformQueryData, GameVersionQueryData, LoaderData,
-};
 
-use crate::{
-    assert_status,
-    common::{
-        api_common::{
-            Api, ApiTags, AppendsOptionalPat,
-            models::{CommonCategoryData, CommonLoaderData},
-        },
-        database::ADMIN_USER_PAT,
+use crate::test::asserts::assert_status;
+use crate::test::{
+    api_common::{
+        Api, ApiTags, AppendsOptionalPat,
+        models::{CommonCategoryData, CommonLoaderData},
     },
+    database::ADMIN_USER_PAT,
 };
 
 use super::ApiV2;
diff --git a/apps/labrinth/tests/common/api_v2/team.rs b/apps/labrinth/src/test/api_v2/team.rs
similarity index 98%
rename from apps/labrinth/tests/common/api_v2/team.rs
rename to apps/labrinth/src/test/api_v2/team.rs
index eeb70342..ff251e7c 100644
--- a/apps/labrinth/tests/common/api_v2/team.rs
+++ b/apps/labrinth/src/test/api_v2/team.rs
@@ -1,19 +1,17 @@
-use actix_http::StatusCode;
-use actix_web::{dev::ServiceResponse, test};
-use async_trait::async_trait;
-use labrinth::models::{
+use crate::models::{
     teams::{OrganizationPermissions, ProjectPermissions},
     v2::{notifications::LegacyNotification, teams::LegacyTeamMember},
 };
+use actix_http::StatusCode;
+use actix_web::{dev::ServiceResponse, test};
+use async_trait::async_trait;
 use serde_json::json;
 
-use crate::{
-    assert_status,
-    common::api_common::{
-        Api, ApiTeams, AppendsOptionalPat,
-        models::{CommonNotification, CommonTeamMember},
-    },
+use crate::test::api_common::{
+    Api, ApiTeams, AppendsOptionalPat,
+    models::{CommonNotification, CommonTeamMember},
 };
+use crate::test::asserts::assert_status;
 
 use super::ApiV2;
 
diff --git a/apps/labrinth/tests/common/api_v2/user.rs b/apps/labrinth/src/test/api_v2/user.rs
similarity index 95%
rename from apps/labrinth/tests/common/api_v2/user.rs
rename to apps/labrinth/src/test/api_v2/user.rs
index d0da67c6..5262e38e 100644
--- a/apps/labrinth/tests/common/api_v2/user.rs
+++ b/apps/labrinth/src/test/api_v2/user.rs
@@ -1,5 +1,5 @@
 use super::ApiV2;
-use crate::common::api_common::{Api, ApiUser, AppendsOptionalPat};
+use crate::test::api_common::{Api, ApiUser, AppendsOptionalPat};
 use actix_web::{dev::ServiceResponse, test};
 use async_trait::async_trait;
 
diff --git a/apps/labrinth/tests/common/api_v2/version.rs b/apps/labrinth/src/test/api_v2/version.rs
similarity index 98%
rename from apps/labrinth/tests/common/api_v2/version.rs
rename to apps/labrinth/src/test/api_v2/version.rs
index 92b73d44..a544dba9 100644
--- a/apps/labrinth/tests/common/api_v2/version.rs
+++ b/apps/labrinth/src/test/api_v2/version.rs
@@ -5,14 +5,16 @@ use super::{
     ApiV2,
     request_data::{self, get_public_version_creation_data},
 };
+use crate::models::ids::ProjectId;
+use crate::test::asserts::assert_status;
+use crate::test::{
+    api_common::{Api, ApiVersion, AppendsOptionalPat, models::CommonVersion},
+    dummy_data::TestFile,
+};
 use crate::{
-    assert_status,
-    common::{
-        api_common::{
-            Api, ApiVersion, AppendsOptionalPat, models::CommonVersion,
-        },
-        dummy_data::TestFile,
-    },
+    models::{projects::VersionType, v2::projects::LegacyVersion},
+    routes::v2::version_file::FileUpdateData,
+    util::actix::AppendsMultipart,
 };
 use actix_http::StatusCode;
 use actix_web::{
@@ -20,12 +22,6 @@ use actix_web::{
     test::{self, TestRequest},
 };
 use async_trait::async_trait;
-use labrinth::models::ids::ProjectId;
-use labrinth::{
-    models::{projects::VersionType, v2::projects::LegacyVersion},
-    routes::v2::version_file::FileUpdateData,
-    util::actix::AppendsMultipart,
-};
 use serde_json::json;
 
 pub fn url_encode_json_serialized_vec(elements: &[String]) -> String {
diff --git a/apps/labrinth/tests/common/api_v3/collections.rs b/apps/labrinth/src/test/api_v3/collections.rs
similarity index 96%
rename from apps/labrinth/tests/common/api_v3/collections.rs
rename to apps/labrinth/src/test/api_v3/collections.rs
index 38fce969..41dfc313 100644
--- a/apps/labrinth/tests/common/api_v3/collections.rs
+++ b/apps/labrinth/src/test/api_v3/collections.rs
@@ -1,16 +1,16 @@
+use crate::models::{collections::Collection, v3::projects::Project};
 use actix_http::StatusCode;
 use actix_web::{
     dev::ServiceResponse,
     test::{self, TestRequest},
 };
 use bytes::Bytes;
-use labrinth::models::{collections::Collection, v3::projects::Project};
 use serde_json::json;
 
-use crate::{
-    assert_status,
-    common::api_common::{Api, AppendsOptionalPat, request_data::ImageData},
+use crate::test::api_common::{
+    Api, AppendsOptionalPat, request_data::ImageData,
 };
+use crate::test::asserts::assert_status;
 
 use super::ApiV3;
 
diff --git a/apps/labrinth/tests/common/api_v3/limits.rs b/apps/labrinth/src/test/api_v3/limits.rs
similarity index 87%
rename from apps/labrinth/tests/common/api_v3/limits.rs
rename to apps/labrinth/src/test/api_v3/limits.rs
index 3e2aa670..8237068a 100644
--- a/apps/labrinth/tests/common/api_v3/limits.rs
+++ b/apps/labrinth/src/test/api_v3/limits.rs
@@ -1,13 +1,11 @@
+use crate::models::v3::user_limits::UserLimits;
 use actix_http::StatusCode;
 use actix_web::test;
-use labrinth::models::v3::user_limits::UserLimits;
 
-use crate::{
-    assert_status,
-    common::{
-        api_common::{Api, AppendsOptionalPat},
-        api_v3::ApiV3,
-    },
+use crate::test::asserts::assert_status;
+use crate::test::{
+    api_common::{Api, AppendsOptionalPat},
+    api_v3::ApiV3,
 };
 
 impl ApiV3 {
diff --git a/apps/labrinth/tests/common/api_v3/mod.rs b/apps/labrinth/src/test/api_v3/mod.rs
similarity index 86%
rename from apps/labrinth/tests/common/api_v3/mod.rs
rename to apps/labrinth/src/test/api_v3/mod.rs
index 1f28896d..fa99718f 100644
--- a/apps/labrinth/tests/common/api_v3/mod.rs
+++ b/apps/labrinth/src/test/api_v3/mod.rs
@@ -2,9 +2,9 @@ use super::{
     api_common::{Api, ApiBuildable},
     environment::LocalService,
 };
+use crate::LabrinthConfig;
 use actix_web::{App, dev::ServiceResponse, test};
 use async_trait::async_trait;
-use labrinth::LabrinthConfig;
 use std::rc::Rc;
 use utoipa_actix_web::AppExt;
 
@@ -31,12 +31,10 @@ impl ApiBuildable for ApiV3 {
         let app = App::new()
             .into_utoipa_app()
             .configure(|cfg| {
-                labrinth::utoipa_app_config(cfg, labrinth_config.clone())
+                crate::utoipa_app_config(cfg, labrinth_config.clone())
             })
             .into_app()
-            .configure(|cfg| {
-                labrinth::app_config(cfg, labrinth_config.clone())
-            });
+            .configure(|cfg| crate::app_config(cfg, labrinth_config.clone()));
         let test_app: Rc<dyn LocalService> =
             Rc::new(test::init_service(app).await);
 
diff --git a/apps/labrinth/tests/common/api_v3/oauth.rs b/apps/labrinth/src/test/api_v3/oauth.rs
similarity index 97%
rename from apps/labrinth/tests/common/api_v3/oauth.rs
rename to apps/labrinth/src/test/api_v3/oauth.rs
index 434f6aff..48343ad4 100644
--- a/apps/labrinth/tests/common/api_v3/oauth.rs
+++ b/apps/labrinth/src/test/api_v3/oauth.rs
@@ -1,20 +1,18 @@
 use std::collections::HashMap;
 
+use crate::auth::oauth::{
+    OAuthClientAccessRequest, RespondToOAuthClientScopes, TokenRequest,
+    TokenResponse,
+};
 use actix_http::StatusCode;
 use actix_web::http::header::{AUTHORIZATION, LOCATION};
 use actix_web::{
     dev::ServiceResponse,
     test::{self, TestRequest},
 };
-use labrinth::auth::oauth::{
-    OAuthClientAccessRequest, RespondToOAuthClientScopes, TokenRequest,
-    TokenResponse,
-};
 
-use crate::{
-    assert_status,
-    common::api_common::{Api, AppendsOptionalPat},
-};
+use crate::test::api_common::{Api, AppendsOptionalPat};
+use crate::test::asserts::assert_status;
 
 use super::ApiV3;
 
diff --git a/apps/labrinth/tests/common/api_v3/oauth_clients.rs b/apps/labrinth/src/test/api_v3/oauth_clients.rs
similarity index 97%
rename from apps/labrinth/tests/common/api_v3/oauth_clients.rs
rename to apps/labrinth/src/test/api_v3/oauth_clients.rs
index 2afedb10..db83f019 100644
--- a/apps/labrinth/tests/common/api_v3/oauth_clients.rs
+++ b/apps/labrinth/src/test/api_v3/oauth_clients.rs
@@ -1,21 +1,19 @@
-use actix_http::StatusCode;
-use actix_web::{
-    dev::ServiceResponse,
-    test::{self, TestRequest},
-};
-use labrinth::{
+use crate::{
     models::{
         oauth_clients::{OAuthClient, OAuthClientAuthorization},
         pats::Scopes,
     },
     routes::v3::oauth_clients::OAuthClientEdit,
 };
+use actix_http::StatusCode;
+use actix_web::{
+    dev::ServiceResponse,
+    test::{self, TestRequest},
+};
 use serde_json::json;
 
-use crate::{
-    assert_status,
-    common::api_common::{Api, AppendsOptionalPat},
-};
+use crate::test::api_common::{Api, AppendsOptionalPat};
+use crate::test::asserts::assert_status;
 
 use super::ApiV3;
 
diff --git a/apps/labrinth/tests/common/api_v3/organization.rs b/apps/labrinth/src/test/api_v3/organization.rs
similarity index 96%
rename from apps/labrinth/tests/common/api_v3/organization.rs
rename to apps/labrinth/src/test/api_v3/organization.rs
index b208db21..f98ae20d 100644
--- a/apps/labrinth/tests/common/api_v3/organization.rs
+++ b/apps/labrinth/src/test/api_v3/organization.rs
@@ -1,7 +1,8 @@
-use crate::{
-    assert_status,
-    common::api_common::{Api, AppendsOptionalPat, request_data::ImageData},
+use crate::models::{organizations::Organization, v3::projects::Project};
+use crate::test::api_common::{
+    Api, AppendsOptionalPat, request_data::ImageData,
 };
+use crate::test::asserts::assert_status;
 use actix_http::StatusCode;
 use actix_web::{
     dev::ServiceResponse,
@@ -9,7 +10,6 @@ use actix_web::{
 };
 use ariadne::ids::UserId;
 use bytes::Bytes;
-use labrinth::models::{organizations::Organization, v3::projects::Project};
 use serde_json::json;
 
 use super::ApiV3;
diff --git a/apps/labrinth/tests/common/api_v3/project.rs b/apps/labrinth/src/test/api_v3/project.rs
similarity index 98%
rename from apps/labrinth/tests/common/api_v3/project.rs
rename to apps/labrinth/src/test/api_v3/project.rs
index 0513206f..58121dfd 100644
--- a/apps/labrinth/tests/common/api_v3/project.rs
+++ b/apps/labrinth/src/test/api_v3/project.rs
@@ -1,5 +1,10 @@
 use std::{collections::HashMap, fmt::Write};
 
+use crate::{
+    models::{organizations::Organization, projects::Project},
+    search::SearchResults,
+    util::actix::AppendsMultipart,
+};
 use actix_http::StatusCode;
 use actix_web::{
     dev::ServiceResponse,
@@ -8,25 +13,18 @@ use actix_web::{
 use async_trait::async_trait;
 use bytes::Bytes;
 use chrono::{DateTime, Utc};
-use labrinth::{
-    models::{organizations::Organization, projects::Project},
-    search::SearchResults,
-    util::actix::AppendsMultipart,
-};
 use rust_decimal::Decimal;
 use serde_json::json;
 
-use crate::{
-    assert_status,
-    common::{
-        api_common::{
-            Api, ApiProject, AppendsOptionalPat,
-            models::{CommonItemType, CommonProject, CommonVersion},
-            request_data::{ImageData, ProjectCreationRequestData},
-        },
-        database::MOD_USER_PAT,
-        dummy_data::TestFile,
+use crate::test::asserts::assert_status;
+use crate::test::{
+    api_common::{
+        Api, ApiProject, AppendsOptionalPat,
+        models::{CommonItemType, CommonProject, CommonVersion},
+        request_data::{ImageData, ProjectCreationRequestData},
     },
+    database::MOD_USER_PAT,
+    dummy_data::TestFile,
 };
 
 use super::{
diff --git a/apps/labrinth/tests/common/api_v3/request_data.rs b/apps/labrinth/src/test/api_v3/request_data.rs
similarity index 96%
rename from apps/labrinth/tests/common/api_v3/request_data.rs
rename to apps/labrinth/src/test/api_v3/request_data.rs
index c9774dd0..a3bc0eb4 100644
--- a/apps/labrinth/tests/common/api_v3/request_data.rs
+++ b/apps/labrinth/src/test/api_v3/request_data.rs
@@ -1,13 +1,13 @@
 use serde_json::json;
 
-use crate::common::{
+use crate::models::ids::ProjectId;
+use crate::test::{
     api_common::request_data::{
         ProjectCreationRequestData, VersionCreationRequestData,
     },
     dummy_data::TestFile,
 };
-use labrinth::models::ids::ProjectId;
-use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
+use crate::util::actix::{MultipartSegment, MultipartSegmentData};
 
 pub fn get_public_project_creation_data(
     slug: &str,
diff --git a/apps/labrinth/tests/common/api_v3/tags.rs b/apps/labrinth/src/test/api_v3/tags.rs
similarity index 91%
rename from apps/labrinth/tests/common/api_v3/tags.rs
rename to apps/labrinth/src/test/api_v3/tags.rs
index b2eda4ac..7100d5ad 100644
--- a/apps/labrinth/tests/common/api_v3/tags.rs
+++ b/apps/labrinth/src/test/api_v3/tags.rs
@@ -1,24 +1,22 @@
+use crate::routes::v3::tags::{GameData, LoaderData};
+use crate::{
+    database::models::loader_fields::LoaderFieldEnumValue,
+    routes::v3::tags::CategoryData,
+};
 use actix_http::StatusCode;
 use actix_web::{
     dev::ServiceResponse,
     test::{self, TestRequest},
 };
 use async_trait::async_trait;
-use labrinth::routes::v3::tags::{GameData, LoaderData};
-use labrinth::{
-    database::models::loader_fields::LoaderFieldEnumValue,
-    routes::v3::tags::CategoryData,
-};
 
-use crate::{
-    assert_status,
-    common::{
-        api_common::{
-            Api, ApiTags, AppendsOptionalPat,
-            models::{CommonCategoryData, CommonLoaderData},
-        },
-        database::ADMIN_USER_PAT,
+use crate::test::asserts::assert_status;
+use crate::test::{
+    api_common::{
+        Api, ApiTags, AppendsOptionalPat,
+        models::{CommonCategoryData, CommonLoaderData},
     },
+    database::ADMIN_USER_PAT,
 };
 
 use super::ApiV3;
diff --git a/apps/labrinth/tests/common/api_v3/team.rs b/apps/labrinth/src/test/api_v3/team.rs
similarity index 98%
rename from apps/labrinth/tests/common/api_v3/team.rs
rename to apps/labrinth/src/test/api_v3/team.rs
index 4bae4702..770f1889 100644
--- a/apps/labrinth/tests/common/api_v3/team.rs
+++ b/apps/labrinth/src/test/api_v3/team.rs
@@ -1,19 +1,17 @@
-use actix_http::StatusCode;
-use actix_web::{dev::ServiceResponse, test};
-use async_trait::async_trait;
-use labrinth::models::{
+use crate::models::{
     notifications::Notification,
     teams::{OrganizationPermissions, ProjectPermissions, TeamMember},
 };
+use actix_http::StatusCode;
+use actix_web::{dev::ServiceResponse, test};
+use async_trait::async_trait;
 use serde_json::json;
 
-use crate::{
-    assert_status,
-    common::api_common::{
-        Api, ApiTeams, AppendsOptionalPat,
-        models::{CommonNotification, CommonTeamMember},
-    },
+use crate::test::api_common::{
+    Api, ApiTeams, AppendsOptionalPat,
+    models::{CommonNotification, CommonTeamMember},
 };
+use crate::test::asserts::assert_status;
 
 use super::ApiV3;
 
diff --git a/apps/labrinth/tests/common/api_v3/user.rs b/apps/labrinth/src/test/api_v3/user.rs
similarity index 95%
rename from apps/labrinth/tests/common/api_v3/user.rs
rename to apps/labrinth/src/test/api_v3/user.rs
index dbfe3bc2..56bee189 100644
--- a/apps/labrinth/tests/common/api_v3/user.rs
+++ b/apps/labrinth/src/test/api_v3/user.rs
@@ -1,7 +1,7 @@
 use actix_web::{dev::ServiceResponse, test};
 use async_trait::async_trait;
 
-use crate::common::api_common::{Api, ApiUser, AppendsOptionalPat};
+use crate::test::api_common::{Api, ApiUser, AppendsOptionalPat};
 
 use super::ApiV3;
 
diff --git a/apps/labrinth/tests/common/api_v3/version.rs b/apps/labrinth/src/test/api_v3/version.rs
similarity index 98%
rename from apps/labrinth/tests/common/api_v3/version.rs
rename to apps/labrinth/src/test/api_v3/version.rs
index d3eeb7c4..2060e3a4 100644
--- a/apps/labrinth/tests/common/api_v3/version.rs
+++ b/apps/labrinth/src/test/api_v3/version.rs
@@ -5,14 +5,16 @@ use super::{
     ApiV3,
     request_data::{self, get_public_version_creation_data},
 };
+use crate::models::ids::ProjectId;
+use crate::test::asserts::assert_status;
+use crate::test::{
+    api_common::{Api, ApiVersion, AppendsOptionalPat, models::CommonVersion},
+    dummy_data::TestFile,
+};
 use crate::{
-    assert_status,
-    common::{
-        api_common::{
-            Api, ApiVersion, AppendsOptionalPat, models::CommonVersion,
-        },
-        dummy_data::TestFile,
-    },
+    models::{projects::VersionType, v3::projects::Version},
+    routes::v3::version_file::FileUpdateData,
+    util::actix::AppendsMultipart,
 };
 use actix_http::StatusCode;
 use actix_web::{
@@ -20,12 +22,6 @@ use actix_web::{
     test::{self, TestRequest},
 };
 use async_trait::async_trait;
-use labrinth::models::ids::ProjectId;
-use labrinth::{
-    models::{projects::VersionType, v3::projects::Version},
-    routes::v3::version_file::FileUpdateData,
-    util::actix::AppendsMultipart,
-};
 use serde_json::json;
 
 pub fn url_encode_json_serialized_vec(elements: &[String]) -> String {
diff --git a/apps/labrinth/tests/common/asserts.rs b/apps/labrinth/src/test/asserts.rs
similarity index 69%
rename from apps/labrinth/tests/common/asserts.rs
rename to apps/labrinth/src/test/asserts.rs
index b2849055..e8412dfa 100644
--- a/apps/labrinth/tests/common/asserts.rs
+++ b/apps/labrinth/src/test/asserts.rs
@@ -1,10 +1,9 @@
-use crate::common::get_json_val_str;
+use crate::models::v3::projects::Version;
+use crate::test::get_json_val_str;
 use itertools::Itertools;
-use labrinth::models::v3::projects::Version;
 
 use super::api_common::models::CommonVersion;
 
-#[macro_export]
 macro_rules! assert_status {
     ($response:expr, $status:expr) => {
         assert_eq!(
@@ -16,17 +15,7 @@ macro_rules! assert_status {
     };
 }
 
-#[macro_export]
-macro_rules! assert_any_status_except {
-    ($response:expr, $status:expr) => {
-        assert_ne!(
-            $response.status(),
-            $status,
-            "{:#?}",
-            $response.response().body()
-        );
-    };
-}
+pub(crate) use assert_status;
 
 pub fn assert_version_ids(versions: &[Version], expected_ids: Vec<String>) {
     let version_ids = versions
diff --git a/apps/labrinth/tests/common/database.rs b/apps/labrinth/src/test/database.rs
similarity index 95%
rename from apps/labrinth/tests/common/database.rs
rename to apps/labrinth/src/test/database.rs
index d4877d01..9da2bda9 100644
--- a/apps/labrinth/tests/common/database.rs
+++ b/apps/labrinth/src/test/database.rs
@@ -1,11 +1,11 @@
-use labrinth::database::ReadOnlyPgPool;
-use labrinth::database::redis::RedisPool;
-use labrinth::search;
+use crate::database::redis::RedisPool;
+use crate::database::{MIGRATOR, ReadOnlyPgPool};
+use crate::search;
 use sqlx::{PgPool, postgres::PgPoolOptions};
 use std::time::Duration;
 use url::Url;
 
-use crate::common::{dummy_data, environment::TestEnvironment};
+use crate::test::{dummy_data, environment::TestEnvironment};
 
 use super::{api_v3::ApiV3, dummy_data::DUMMY_DATA_UPDATE};
 
@@ -40,7 +40,7 @@ pub struct TemporaryDatabase {
     pub pool: PgPool,
     pub ro_pool: ReadOnlyPgPool,
     pub redis_pool: RedisPool,
-    pub search_config: labrinth::search::SearchConfig,
+    pub search_config: crate::search::SearchConfig,
     pub database_name: String,
 }
 
@@ -82,8 +82,7 @@ impl TemporaryDatabase {
         println!("Running migrations on temporary database");
 
         // Performs migrations
-        let migrations = sqlx::migrate!("./migrations");
-        migrations.run(&pool).await.expect("Migrations failed");
+        MIGRATOR.run(&pool).await.expect("Migrations failed");
 
         println!("Migrations complete");
 
@@ -182,8 +181,7 @@ impl TemporaryDatabase {
                 }
 
                 // Run migrations on the template
-                let migrations = sqlx::migrate!("./migrations");
-                migrations.run(&pool).await.expect("Migrations failed");
+                MIGRATOR.run(&pool).await.expect("Migrations failed");
 
                 if !dummy_data_exists {
                     // Add dummy data
diff --git a/apps/labrinth/tests/common/dummy_data.rs b/apps/labrinth/src/test/dummy_data.rs
similarity index 98%
rename from apps/labrinth/tests/common/dummy_data.rs
rename to apps/labrinth/src/test/dummy_data.rs
index d44bd839..3211f32e 100644
--- a/apps/labrinth/tests/common/dummy_data.rs
+++ b/apps/labrinth/src/test/dummy_data.rs
@@ -1,17 +1,15 @@
 use std::io::{Cursor, Write};
 
-use crate::{
-    assert_status,
-    common::{api_common::Api, api_v3, database::USER_USER_PAT},
-};
-use actix_http::StatusCode;
-use actix_web::test::{self, TestRequest};
-use labrinth::models::ids::ProjectId;
-use labrinth::models::{
+use crate::models::ids::ProjectId;
+use crate::models::{
     oauth_clients::OAuthClient,
     organizations::Organization,
     projects::{Project, Version},
 };
+use crate::test::asserts::assert_status;
+use crate::test::{api_common::Api, api_v3, database::USER_USER_PAT};
+use actix_http::StatusCode;
+use actix_web::test::{self, TestRequest};
 use serde_json::json;
 use zip::{CompressionMethod, ZipWriter, write::FileOptions};
 
@@ -289,7 +287,7 @@ pub async fn add_dummy_data(api: &ApiV3, db: TemporaryDatabase) -> DummyData {
     // Adds basic dummy data to the database directly with sql (user, pats)
     let pool = &db.pool.clone();
 
-    labrinth::test::db::add_dummy_data(pool).await.unwrap();
+    crate::test::db::add_dummy_data(pool).await.unwrap();
 
     let (alpha_project, alpha_version) = add_project_alpha(api).await;
     let (beta_project, beta_version) = add_project_beta(api).await;
diff --git a/apps/labrinth/tests/common/environment.rs b/apps/labrinth/src/test/environment.rs
similarity index 98%
rename from apps/labrinth/tests/common/environment.rs
rename to apps/labrinth/src/test/environment.rs
index ec407991..d3ed3966 100644
--- a/apps/labrinth/tests/common/environment.rs
+++ b/apps/labrinth/src/test/environment.rs
@@ -5,7 +5,8 @@ use super::{
     database::{FRIEND_USER_ID, TemporaryDatabase, USER_USER_PAT},
     dummy_data,
 };
-use crate::{assert_status, common::setup};
+use crate::test::asserts::assert_status;
+use crate::test::setup;
 use actix_http::StatusCode;
 use actix_web::dev::ServiceResponse;
 use futures::Future;
diff --git a/apps/labrinth/src/test/mod.rs b/apps/labrinth/src/test/mod.rs
index dec10232..1a10812e 100644
--- a/apps/labrinth/src/test/mod.rs
+++ b/apps/labrinth/src/test/mod.rs
@@ -1 +1,76 @@
+use crate::queue::email::EmailQueue;
+use crate::util::anrok;
+use crate::util::gotenberg::GotenbergClient;
+use crate::{LabrinthConfig, file_hosting};
+use crate::{check_env_vars, clickhouse};
+use modrinth_maxmind::MaxMind;
+use std::sync::Arc;
+
+pub mod api_common;
+pub mod api_v2;
+pub mod api_v3;
+pub mod asserts;
+pub mod database;
 pub mod db;
+pub mod dummy_data;
+pub mod environment;
+pub mod pats;
+pub mod permissions;
+pub mod scopes;
+pub mod search;
+
+// Testing equivalent to 'setup' function, producing a LabrinthConfig
+// If making a test, you should probably use environment::TestEnvironment::build() (which calls this)
+pub async fn setup(db: &database::TemporaryDatabase) -> LabrinthConfig {
+    println!("Setting up labrinth config");
+
+    dotenvy::dotenv().ok();
+
+    if check_env_vars() {
+        println!("Some environment variables are missing!");
+    }
+
+    let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
+
+    let pool = db.pool.clone();
+    let ro_pool = db.ro_pool.clone();
+    let redis_pool = db.redis_pool.clone();
+    let search_config = db.search_config.clone();
+    let file_host: Arc<dyn file_hosting::FileHost + Send + Sync> =
+        Arc::new(file_hosting::MockHost::new());
+    let mut clickhouse = clickhouse::init_client().await.unwrap();
+
+    let maxmind_reader = MaxMind::new().await;
+
+    let stripe_client =
+        stripe::Client::new(dotenvy::var("STRIPE_API_KEY").unwrap());
+
+    let anrok_client = anrok::Client::from_env().unwrap();
+    let email_queue =
+        EmailQueue::init(pool.clone(), redis_pool.clone()).unwrap();
+    let gotenberg_client =
+        GotenbergClient::from_env().expect("Failed to create Gotenberg client");
+
+    crate::app_setup(
+        pool.clone(),
+        ro_pool.clone(),
+        redis_pool.clone(),
+        search_config,
+        &mut clickhouse,
+        file_host.clone(),
+        maxmind_reader,
+        stripe_client,
+        anrok_client,
+        email_queue,
+        gotenberg_client,
+        false,
+    )
+}
+
+pub fn get_json_val_str(val: impl serde::Serialize) -> String {
+    serde_json::to_value(val)
+        .unwrap()
+        .as_str()
+        .unwrap()
+        .to_string()
+}
diff --git a/apps/labrinth/tests/common/pats.rs b/apps/labrinth/src/test/pats.rs
similarity index 98%
rename from apps/labrinth/tests/common/pats.rs
rename to apps/labrinth/src/test/pats.rs
index 75691817..aab5dbc8 100644
--- a/apps/labrinth/tests/common/pats.rs
+++ b/apps/labrinth/src/test/pats.rs
@@ -1,8 +1,8 @@
-use chrono::Utc;
-use labrinth::{
+use crate::{
     database::{self, models::generate_pat_id},
     models::pats::Scopes,
 };
+use chrono::Utc;
 
 use super::database::TemporaryDatabase;
 
diff --git a/apps/labrinth/tests/common/permissions.rs b/apps/labrinth/src/test/permissions.rs
similarity index 99%
rename from apps/labrinth/tests/common/permissions.rs
rename to apps/labrinth/src/test/permissions.rs
index dc5eaeba..651322f7 100644
--- a/apps/labrinth/tests/common/permissions.rs
+++ b/apps/labrinth/src/test/permissions.rs
@@ -1,11 +1,11 @@
+use crate::models::teams::{OrganizationPermissions, ProjectPermissions};
 use actix_http::StatusCode;
 use actix_web::{dev::ServiceResponse, test};
 use futures::Future;
 use itertools::Itertools;
-use labrinth::models::teams::{OrganizationPermissions, ProjectPermissions};
 use serde_json::json;
 
-use crate::common::{
+use crate::test::{
     api_common::ApiTeams,
     database::{ADMIN_USER_PAT, generate_random_name},
 };
diff --git a/apps/labrinth/tests/common/scopes.rs b/apps/labrinth/src/test/scopes.rs
similarity index 99%
rename from apps/labrinth/tests/common/scopes.rs
rename to apps/labrinth/src/test/scopes.rs
index 5d74db60..24f0aefc 100644
--- a/apps/labrinth/tests/common/scopes.rs
+++ b/apps/labrinth/src/test/scopes.rs
@@ -1,6 +1,6 @@
+use crate::models::pats::Scopes;
 use actix_web::{dev::ServiceResponse, test};
 use futures::Future;
-use labrinth::models::pats::Scopes;
 
 use super::{
     api_common::Api, database::USER_USER_ID_PARSED,
diff --git a/apps/labrinth/tests/common/search.rs b/apps/labrinth/src/test/search.rs
similarity index 97%
rename from apps/labrinth/tests/common/search.rs
rename to apps/labrinth/src/test/search.rs
index c6c0035e..45ce34f7 100644
--- a/apps/labrinth/tests/common/search.rs
+++ b/apps/labrinth/src/test/search.rs
@@ -3,13 +3,11 @@ use std::{collections::HashMap, sync::Arc};
 use actix_http::StatusCode;
 use serde_json::json;
 
-use crate::{
-    assert_status,
-    common::{
-        api_common::{Api, ApiProject, ApiVersion},
-        database::{FRIEND_USER_PAT, MOD_USER_PAT, USER_USER_PAT},
-        dummy_data::{DUMMY_CATEGORIES, TestFile},
-    },
+use crate::test::asserts::assert_status;
+use crate::test::{
+    api_common::{Api, ApiProject, ApiVersion},
+    database::{FRIEND_USER_PAT, MOD_USER_PAT, USER_USER_PAT},
+    dummy_data::{DUMMY_CATEGORIES, TestFile},
 };
 
 use super::{api_v3::ApiV3, environment::TestEnvironment};
diff --git a/apps/labrinth/tests/common.rs b/apps/labrinth/tests/common.rs
new file mode 100644
index 00000000..e07d5b1c
--- /dev/null
+++ b/apps/labrinth/tests/common.rs
@@ -0,0 +1,32 @@
+//! Re-exports all [`labrinth::test`] items for compatibility.
+//!
+//! Previously, tests used `mod common` and `common::item` imports for testing.
+//! This has been moved into [`labrinth::test`] under a feature flag, and this
+//! module remains for backwards compatibility with tests which expect the
+//! `common` module.
+
+pub use labrinth::test::*;
+
+#[macro_export]
+macro_rules! assert_status {
+    ($response:expr, $status:expr) => {
+        assert_eq!(
+            $response.status(),
+            $status,
+            "{:#?}",
+            $response.response().body()
+        );
+    };
+}
+
+#[macro_export]
+macro_rules! assert_any_status_except {
+    ($response:expr, $status:expr) => {
+        assert_ne!(
+            $response.status(),
+            $status,
+            "{:#?}",
+            $response.response().body()
+        );
+    };
+}
diff --git a/apps/labrinth/tests/common/mod.rs b/apps/labrinth/tests/common/mod.rs
deleted file mode 100644
index 79958f7a..00000000
--- a/apps/labrinth/tests/common/mod.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use labrinth::queue::email::EmailQueue;
-use labrinth::util::anrok;
-use labrinth::util::gotenberg::GotenbergClient;
-use labrinth::{LabrinthConfig, file_hosting};
-use labrinth::{check_env_vars, clickhouse};
-use modrinth_maxmind::MaxMind;
-use std::sync::Arc;
-
-pub mod api_common;
-pub mod api_v2;
-pub mod api_v3;
-pub mod asserts;
-pub mod database;
-pub mod dummy_data;
-pub mod environment;
-pub mod pats;
-pub mod permissions;
-pub mod scopes;
-pub mod search;
-
-// Testing equivalent to 'setup' function, producing a LabrinthConfig
-// If making a test, you should probably use environment::TestEnvironment::build() (which calls this)
-pub async fn setup(db: &database::TemporaryDatabase) -> LabrinthConfig {
-    println!("Setting up labrinth config");
-
-    dotenvy::dotenv().ok();
-
-    if check_env_vars() {
-        println!("Some environment variables are missing!");
-    }
-
-    let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
-
-    let pool = db.pool.clone();
-    let ro_pool = db.ro_pool.clone();
-    let redis_pool = db.redis_pool.clone();
-    let search_config = db.search_config.clone();
-    let file_host: Arc<dyn file_hosting::FileHost + Send + Sync> =
-        Arc::new(file_hosting::MockHost::new());
-    let mut clickhouse = clickhouse::init_client().await.unwrap();
-
-    let maxmind_reader = MaxMind::new().await;
-
-    let stripe_client =
-        stripe::Client::new(dotenvy::var("STRIPE_API_KEY").unwrap());
-
-    let anrok_client = anrok::Client::from_env().unwrap();
-    let email_queue =
-        EmailQueue::init(pool.clone(), redis_pool.clone()).unwrap();
-    let gotenberg_client =
-        GotenbergClient::from_env().expect("Failed to create Gotenberg client");
-
-    labrinth::app_setup(
-        pool.clone(),
-        ro_pool.clone(),
-        redis_pool.clone(),
-        search_config,
-        &mut clickhouse,
-        file_host.clone(),
-        maxmind_reader,
-        stripe_client,
-        anrok_client,
-        email_queue,
-        gotenberg_client,
-        false,
-    )
-}
-
-pub fn get_json_val_str(val: impl serde::Serialize) -> String {
-    serde_json::to_value(val)
-        .unwrap()
-        .as_str()
-        .unwrap()
-        .to_string()
-}
diff --git a/apps/labrinth/tests/v2/error.rs b/apps/labrinth/tests/v2/error.rs
index da98df47..8cafa91a 100644
--- a/apps/labrinth/tests/v2/error.rs
+++ b/apps/labrinth/tests/v2/error.rs
@@ -1,15 +1,16 @@
-use crate::assert_status;
 use crate::common::api_common::ApiProject;
 
 use actix_http::StatusCode;
 use actix_web::test;
 use bytes::Bytes;
 
+use crate::assert_status;
 use crate::common::database::USER_USER_PAT;
 use crate::common::{
     api_v2::ApiV2,
     environment::{TestEnvironment, with_test_environment},
 };
+
 #[actix_rt::test]
 pub async fn error_404_empty() {
     with_test_environment(
diff --git a/packages/modrinth-util/Cargo.toml b/packages/modrinth-util/Cargo.toml
index 1c453c4c..a5af7bc7 100644
--- a/packages/modrinth-util/Cargo.toml
+++ b/packages/modrinth-util/Cargo.toml
@@ -10,6 +10,9 @@ derive_more = { workspace = true, features = ["display", "error", "from"] }
 dotenvy = { workspace = true }
 eyre = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
+tracing = { workspace = true }
+tracing-ecs = { workspace = true }
+tracing-subscriber = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/packages/modrinth-util/src/lib.rs b/packages/modrinth-util/src/lib.rs
index ca934079..bb0c8c76 100644
--- a/packages/modrinth-util/src/lib.rs
+++ b/packages/modrinth-util/src/lib.rs
@@ -1,6 +1,8 @@
 #![doc = include_str!("../README.md")]
 
 mod error;
+pub mod log;
+
 pub use error::*;
 
 use eyre::{Result, eyre};
diff --git a/packages/modrinth-util/src/log.rs b/packages/modrinth-util/src/log.rs
new file mode 100644
index 00000000..0cd80687
--- /dev/null
+++ b/packages/modrinth-util/src/log.rs
@@ -0,0 +1,74 @@
+//! Service logging utilities.
+
+use std::str::FromStr;
+
+use eyre::{Result, eyre};
+use tracing::level_filters::LevelFilter;
+use tracing_ecs::ECSLayerBuilder;
+use tracing_subscriber::{
+    EnvFilter, layer::SubscriberExt, util::SubscriberInitExt,
+};
+
+use crate::{Context, env_var};
+
+/// How this service will output logs to the terminal output.
+///
+/// See [`init`].
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
+enum OutputFormat {
+    /// Human-readable format using [`tracing_subscriber::fmt::layer`].
+    #[default]
+    Human,
+    /// Elastic Common Schema JSON output using [`ECSLayerBuilder`].
+    Json,
+}
+
+impl FromStr for OutputFormat {
+    type Err = ();
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "human" => Ok(Self::Human),
+            "json" => Ok(Self::Json),
+            _ => Err(()),
+        }
+    }
+}
+
+/// Key for the environment variable that determines the output format.
+pub const OUTPUT_FORMAT_ENV_VAR: &str = "MODRINTH_OUTPUT_FORMAT";
+
+/// Initializes logging for Modrinth services.
+///
+/// This uses [`OUTPUT_FORMAT_ENV_VAR`] to determine the [`OutputFormat`] to
+/// use - see that type for details of each possible format.
+///
+/// # Errors
+///
+/// Errors if logging could not be initialized.
+pub fn init() -> Result<()> {
+    let output_format = match env_var(OUTPUT_FORMAT_ENV_VAR) {
+        Ok(format) => format
+            .parse::<OutputFormat>()
+            .map_err(|_| eyre!("invalid output format '{format}'"))?,
+        Err(_) => OutputFormat::Human,
+    };
+
+    let env_filter = EnvFilter::builder()
+        .with_default_directive(LevelFilter::INFO.into())
+        .from_env_lossy();
+
+    let result = match output_format {
+        OutputFormat::Human => tracing_subscriber::registry()
+            .with(env_filter)
+            .with(tracing_subscriber::fmt::layer())
+            .try_init(),
+        OutputFormat::Json => tracing_subscriber::registry()
+            .with(env_filter)
+            .with(ECSLayerBuilder::default().stdout())
+            .try_init(),
+    };
+    result.wrap_err("failed to initialize tracing registry")?;
+
+    Ok(())
+}

From 9706f1597ba05a527168dc2bedbaaa254a4e369f Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Sat, 8 Nov 2025 15:27:31 -0800
Subject: [PATCH 39/64] Supporting documents for Mural payouts (#4721)

* wip: gotenberg

* Generate and provide supporting docs for Mural payouts

* Correct docs

* shear

* update cargo lock because r-a complains otherwise

* Remove local Gotenberg queue and use Redis instead

* Store platform_id in database correctly

* Address PR comments

* Fix up CI

* fix rebase

* Add timeout to default env vars
---
 Cargo.toml                                    |   1 +
 apps/labrinth/.env.docker-compose             |   1 +
 apps/labrinth/.env.local                      |   6 +-
 apps/labrinth/src/database/redis.rs           |  29 ++++-
 apps/labrinth/src/lib.rs                      |   1 +
 apps/labrinth/src/main.rs                     |   4 +-
 apps/labrinth/src/queue/payouts/mod.rs        |   2 +-
 apps/labrinth/src/queue/payouts/mural.rs      |  84 +++++++++++-
 .../labrinth/src/routes/internal/gotenberg.rs | 123 ++++++++++++++----
 apps/labrinth/src/routes/v3/payouts.rs        |  81 ++++++++----
 apps/labrinth/src/test/mod.rs                 |   4 +-
 apps/labrinth/src/util/gotenberg.rs           |  96 ++++++++++++--
 docker-compose.yml                            |  23 +++-
 packages/muralpay/examples/muralpay.rs        |  11 +-
 packages/muralpay/src/payout.rs               |  24 +++-
 15 files changed, 409 insertions(+), 81 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index cbabe426..c6afc79c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -249,6 +249,7 @@ redundant_clone = "warn"
 redundant_feature_names = "warn"
 redundant_type_annotations = "warn"
 todo = "warn"
+too_many_arguments = "allow"
 uninlined_format_args = "warn"
 unnested_or_patterns = "warn"
 wildcard_dependencies = "warn"
diff --git a/apps/labrinth/.env.docker-compose b/apps/labrinth/.env.docker-compose
index 2368726e..6271bd3c 100644
--- a/apps/labrinth/.env.docker-compose
+++ b/apps/labrinth/.env.docker-compose
@@ -144,6 +144,7 @@ ANROK_API_URL=none
 
 GOTENBERG_URL=http://labrinth-gotenberg:13000
 GOTENBERG_CALLBACK_BASE=http://host.docker.internal:8000/_internal/gotenberg
+GOTENBERG_TIMEOUT=30000
 
 ARCHON_URL=none
 
diff --git a/apps/labrinth/.env.local b/apps/labrinth/.env.local
index 37358ad8..f4115b4c 100644
--- a/apps/labrinth/.env.local
+++ b/apps/labrinth/.env.local
@@ -19,7 +19,10 @@ MEILISEARCH_KEY=modrinth
 REDIS_URL=redis://localhost
 REDIS_MAX_CONNECTIONS=10000
 
-BIND_ADDR=127.0.0.1:8000
+# Must bind to broadcast, not localhost, because some
+# Docker services (Gotenberg) must be able to reach the backend
+# from a different network interface
+BIND_ADDR=0.0.0.0:8000
 SELF_ADDR=http://127.0.0.1:8000
 
 MODERATION_SLACK_WEBHOOK=
@@ -145,6 +148,7 @@ ANROK_API_URL=none
 
 GOTENBERG_URL=http://localhost:13000
 GOTENBERG_CALLBACK_BASE=http://host.docker.internal:8000/_internal/gotenberg
+GOTENBERG_TIMEOUT=30000
 
 ARCHON_URL=none
 
diff --git a/apps/labrinth/src/database/redis.rs b/apps/labrinth/src/database/redis.rs
index cc01b0b2..5d299f8a 100644
--- a/apps/labrinth/src/database/redis.rs
+++ b/apps/labrinth/src/database/redis.rs
@@ -5,7 +5,10 @@ use dashmap::DashMap;
 use deadpool_redis::{Config, Runtime};
 use futures::future::Either;
 use prometheus::{IntGauge, Registry};
-use redis::{Cmd, ExistenceCheck, SetExpiry, SetOptions, cmd};
+use redis::{
+    AsyncTypedCommands, Cmd, ExistenceCheck, SetExpiry, SetOptions,
+    ToRedisArgs, cmd,
+};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -680,6 +683,30 @@ impl RedisConnection {
 
         Ok(())
     }
+
+    pub async fn lpush(
+        &mut self,
+        namespace: &str,
+        key: &str,
+        value: impl ToRedisArgs + Send + Sync,
+    ) -> Result<(), DatabaseError> {
+        let key = format!("{}_{namespace}:{key}", self.meta_namespace);
+        self.connection.lpush(key, value).await?;
+        Ok(())
+    }
+
+    pub async fn brpop(
+        &mut self,
+        namespace: &str,
+        key: &str,
+        timeout: Option<f64>,
+    ) -> Result<Option<[String; 2]>, DatabaseError> {
+        let key = format!("{}_{namespace}:{key}", self.meta_namespace);
+        // a timeout of 0 is infinite
+        let timeout = timeout.unwrap_or(0.0);
+        let values = self.connection.brpop(key, timeout).await?;
+        Ok(values)
+    }
 }
 
 #[derive(Serialize, Deserialize)]
diff --git a/apps/labrinth/src/lib.rs b/apps/labrinth/src/lib.rs
index 992fa385..a66e1426 100644
--- a/apps/labrinth/src/lib.rs
+++ b/apps/labrinth/src/lib.rs
@@ -503,6 +503,7 @@ pub fn check_env_vars() -> bool {
 
     failed |= check_var::<String>("GOTENBERG_URL");
     failed |= check_var::<String>("GOTENBERG_CALLBACK_BASE");
+    failed |= check_var::<String>("GOTENBERG_TIMEOUT");
 
     failed |= check_var::<String>("STRIPE_API_KEY");
     failed |= check_var::<String>("STRIPE_WEBHOOK_SECRET");
diff --git a/apps/labrinth/src/main.rs b/apps/labrinth/src/main.rs
index 210f5a52..a02e8bd2 100644
--- a/apps/labrinth/src/main.rs
+++ b/apps/labrinth/src/main.rs
@@ -153,8 +153,8 @@ async fn main() -> std::io::Result<()> {
     let email_queue =
         EmailQueue::init(pool.clone(), redis_pool.clone()).unwrap();
 
-    let gotenberg_client =
-        GotenbergClient::from_env().expect("Failed to create Gotenberg client");
+    let gotenberg_client = GotenbergClient::from_env(redis_pool.clone())
+        .expect("Failed to create Gotenberg client");
 
     if let Some(task) = args.run_background_task {
         info!("Running task {task:?} and exiting");
diff --git a/apps/labrinth/src/queue/payouts/mod.rs b/apps/labrinth/src/queue/payouts/mod.rs
index d40a7d91..44d96f2b 100644
--- a/apps/labrinth/src/queue/payouts/mod.rs
+++ b/apps/labrinth/src/queue/payouts/mod.rs
@@ -726,7 +726,7 @@ impl PayoutsQueue {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub struct PayoutFees {
     /// Fee which is taken by the underlying method we're using.
     ///
diff --git a/apps/labrinth/src/queue/payouts/mural.rs b/apps/labrinth/src/queue/payouts/mural.rs
index d7c08d7e..2bb719ca 100644
--- a/apps/labrinth/src/queue/payouts/mural.rs
+++ b/apps/labrinth/src/queue/payouts/mural.rs
@@ -1,13 +1,18 @@
 use ariadne::ids::UserId;
+use chrono::Utc;
 use eyre::{Result, eyre};
 use muralpay::{MuralError, TokenFeeRequest};
-use rust_decimal::Decimal;
+use rust_decimal::{Decimal, prelude::ToPrimitive};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    queue::payouts::{AccountBalance, PayoutsQueue},
+    database::models::DBPayoutId,
+    queue::payouts::{AccountBalance, PayoutFees, PayoutsQueue},
     routes::ApiError,
-    util::error::Context,
+    util::{
+        error::Context,
+        gotenberg::{GotenbergClient, PaymentStatement},
+    },
 };
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
@@ -54,10 +59,13 @@ impl PayoutsQueue {
 
     pub async fn create_muralpay_payout_request(
         &self,
+        payout_id: DBPayoutId,
         user_id: UserId,
-        amount: muralpay::TokenAmount,
+        gross_amount: Decimal,
+        fees: PayoutFees,
         payout_details: MuralPayoutRequest,
         recipient_info: muralpay::PayoutRecipientInfo,
+        gotenberg: &GotenbergClient,
     ) -> Result<muralpay::PayoutRequest, ApiError> {
         let muralpay = self.muralpay.load();
         let muralpay = muralpay
@@ -86,11 +94,71 @@ impl PayoutsQueue {
             }
         };
 
+        // Mural takes `fees.method_fee` off the top of the amount we tell them to send
+        let sent_to_method = gross_amount - fees.platform_fee;
+        // ..so the net is `gross - platform_fee - method_fee`
+        let net_amount = gross_amount - fees.total_fee();
+
+        let recipient_address = recipient_info.physical_address();
+        let recipient_email = recipient_info.email().to_string();
+        let gross_amount_cents = gross_amount * Decimal::from(100);
+        let net_amount_cents = net_amount * Decimal::from(100);
+        let fees_cents = fees.total_fee() * Decimal::from(100);
+        let address_line_3 = format!(
+            "{}, {}, {}",
+            recipient_address.city,
+            recipient_address.state,
+            recipient_address.zip
+        );
+
+        let payment_statement = PaymentStatement {
+            payment_id: payout_id.into(),
+            recipient_address_line_1: Some(recipient_address.address1.clone()),
+            recipient_address_line_2: recipient_address.address2.clone(),
+            recipient_address_line_3: Some(address_line_3),
+            recipient_email,
+            payment_date: Utc::now(),
+            gross_amount_cents: gross_amount_cents
+                .to_i64()
+                .wrap_internal_err_with(|| eyre!("gross amount of cents `{gross_amount_cents}` cannot be expressed as an `i64`"))?,
+            net_amount_cents: net_amount_cents
+                .to_i64()
+                .wrap_internal_err_with(|| eyre!("net amount of cents `{net_amount_cents}` cannot be expressed as an `i64`"))?,
+            fees_cents: fees_cents
+                .to_i64()
+                .wrap_internal_err_with(|| eyre!("fees amount of cents `{fees_cents}` cannot be expressed as an `i64`"))?,
+            currency_code: "USD".into(),
+        };
+        let payment_statement_doc = gotenberg
+            .wait_for_payment_statement(&payment_statement)
+            .await
+            .wrap_internal_err("failed to generate payment statement")?;
+
+        // TODO
+        // std::fs::write(
+        //     "/tmp/modrinth-payout-statement.pdf",
+        //     base64::Engine::decode(
+        //         &base64::engine::general_purpose::STANDARD,
+        //         &payment_statement_doc.body,
+        //     )
+        //     .unwrap(),
+        // )
+        // .unwrap();
+
         let payout = muralpay::CreatePayout {
-            amount,
+            amount: muralpay::TokenAmount {
+                token_amount: sent_to_method,
+                token_symbol: muralpay::USDC.into(),
+            },
             payout_details,
             recipient_info,
-            supporting_details: None,
+            supporting_details: Some(muralpay::SupportingDetails {
+                supporting_document: Some(format!(
+                    "data:application/pdf;base64,{}",
+                    payment_statement_doc.body
+                )),
+                payout_purpose: Some(muralpay::PayoutPurpose::VendorPayment),
+            }),
         };
 
         let payout_request = muralpay
@@ -103,7 +171,9 @@ impl PayoutsQueue {
             .await
             .map_err(|err| match err {
                 MuralError::Api(err) => ApiError::Request(err.into()),
-                err => ApiError::Internal(err.into()),
+                err => ApiError::Internal(
+                    eyre!(err).wrap_err("failed to create payout request"),
+                ),
             })?;
 
         // try to immediately execute the payout request...
diff --git a/apps/labrinth/src/routes/internal/gotenberg.rs b/apps/labrinth/src/routes/internal/gotenberg.rs
index 744a1256..149b2545 100644
--- a/apps/labrinth/src/routes/internal/gotenberg.rs
+++ b/apps/labrinth/src/routes/internal/gotenberg.rs
@@ -1,21 +1,35 @@
-use actix_web::{
-    HttpMessage, HttpResponse, error::ParseError, http::header, post, web,
-};
-use serde::Deserialize;
+use std::fmt;
+
+use actix_web::{HttpMessage, error::ParseError, http::header, post, web};
+use ariadne::ids::base62_impl::parse_base62;
+use base64::Engine;
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
 use tracing::trace;
 
+use crate::database::redis::RedisPool;
+use crate::models::ids::PayoutId;
 use crate::routes::ApiError;
+use crate::util::error::Context;
 use crate::util::gotenberg::{
     GeneratedPdfType, MODRINTH_GENERATED_PDF_TYPE, MODRINTH_PAYMENT_ID,
+    PAYMENT_STATEMENTS_NAMESPACE,
 };
 use crate::util::guards::internal_network_guard;
 
+/// Document generated by Gotenberg and returned to us.
+#[derive(Debug, Serialize, Deserialize)]
+pub struct GotenbergDocument {
+    /// Body of the document as a base 64 string.
+    pub body: String,
+}
+
 pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
-    cfg.service(success).service(error);
+    cfg.service(success_callback).service(error_callback);
 }
 
 #[post("/gotenberg/success", guard = "internal_network_guard")]
-pub async fn success(
+pub async fn success_callback(
     web::Header(header::ContentDisposition {
         disposition,
         parameters: disposition_parameters,
@@ -26,7 +40,8 @@ pub async fn success(
     >,
     maybe_payment_id: Option<web::Header<ModrinthPaymentId>>,
     body: web::Bytes,
-) -> Result<HttpResponse, ApiError> {
+    redis: web::Data<RedisPool>,
+) -> Result<(), ApiError> {
     trace!(
         %trace,
         %disposition,
@@ -37,25 +52,65 @@ pub async fn success(
         "Received Gotenberg generated PDF"
     );
 
-    Ok(HttpResponse::Ok().finish())
+    let payout_id = maybe_payment_id
+        .wrap_request_err("no payout ID for document")?
+        .0
+        .0;
+
+    let mut redis = redis
+        .connect()
+        .await
+        .wrap_internal_err("failed to get Redis connection")?;
+
+    let body = base64::engine::general_purpose::STANDARD.encode(&body);
+
+    let redis_msg = serde_json::to_string(&Ok::<
+        GotenbergDocument,
+        GotenbergError,
+    >(GotenbergDocument { body }))
+    .wrap_internal_err("failed to serialize document to JSON")?;
+
+    redis
+        .lpush(
+            PAYMENT_STATEMENTS_NAMESPACE,
+            &payout_id.to_string(),
+            &redis_msg,
+        )
+        .await
+        .wrap_internal_err("failed to send document over Redis")?;
+
+    Ok(())
 }
 
-#[allow(dead_code)]
-#[derive(Debug, Deserialize)]
-pub struct ErrorBody {
-    status: Option<String>,
-    message: Option<String>,
+#[derive(Debug, Clone, Serialize, Deserialize, Error)]
+pub struct GotenbergError {
+    pub status: Option<String>,
+    pub message: Option<String>,
+}
+
+impl fmt::Display for GotenbergError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match (&self.status, &self.message) {
+            (None, None) => write!(f, "(unknown error)"),
+            (Some(status), None) => write!(f, "status {status}"),
+            (None, Some(message)) => write!(f, "(no status) {message}"),
+            (Some(status), Some(message)) => {
+                write!(f, "status {status}: {message}")
+            }
+        }
+    }
 }
 
 #[post("/gotenberg/error", guard = "internal_network_guard")]
-pub async fn error(
+pub async fn error_callback(
     web::Header(GotenbergTrace(trace)): web::Header<GotenbergTrace>,
     web::Header(ModrinthGeneratedPdfType(r#type)): web::Header<
         ModrinthGeneratedPdfType,
     >,
     maybe_payment_id: Option<web::Header<ModrinthPaymentId>>,
-    web::Json(error_body): web::Json<ErrorBody>,
-) -> Result<HttpResponse, ApiError> {
+    web::Json(error_body): web::Json<GotenbergError>,
+    redis: web::Data<RedisPool>,
+) -> Result<(), ApiError> {
     trace!(
         %trace,
         r#type = r#type.as_str(),
@@ -64,7 +119,31 @@ pub async fn error(
         "Received Gotenberg error webhook"
     );
 
-    Ok(HttpResponse::Ok().finish())
+    let payout_id = maybe_payment_id
+        .wrap_request_err("no payout ID for document")?
+        .0
+        .0;
+    let mut redis = redis
+        .connect()
+        .await
+        .wrap_internal_err("failed to get Redis connection")?;
+
+    let redis_msg = serde_json::to_string(&Err::<
+        GotenbergDocument,
+        GotenbergError,
+    >(error_body))
+    .wrap_internal_err("failed to serialize error to JSON")?;
+
+    redis
+        .lpush(
+            PAYMENT_STATEMENTS_NAMESPACE,
+            &payout_id.to_string(),
+            &redis_msg,
+        )
+        .await
+        .wrap_internal_err("failed to send error over Redis")?;
+
+    Ok(())
 }
 
 #[derive(Debug)]
@@ -122,14 +201,14 @@ impl header::Header for ModrinthGeneratedPdfType {
     }
 }
 
-#[derive(Debug)]
-struct ModrinthPaymentId(String);
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ModrinthPaymentId(pub PayoutId);
 
 impl header::TryIntoHeaderValue for ModrinthPaymentId {
     type Error = header::InvalidHeaderValue;
 
     fn try_into_value(self) -> Result<header::HeaderValue, Self::Error> {
-        header::HeaderValue::from_str(&self.0)
+        header::HeaderValue::from_str(&self.0.to_string())
     }
 }
 
@@ -144,7 +223,7 @@ impl header::Header for ModrinthPaymentId {
             .ok_or(ParseError::Header)?
             .to_str()
             .map_err(|_| ParseError::Header)
-            .map(ToOwned::to_owned)
-            .map(ModrinthPaymentId)
+            .and_then(|s| parse_base62(s).map_err(|_| ParseError::Header))
+            .map(|id| Self(PayoutId(id)))
     }
 }
diff --git a/apps/labrinth/src/routes/v3/payouts.rs b/apps/labrinth/src/routes/v3/payouts.rs
index 75b4d0c9..00384e92 100644
--- a/apps/labrinth/src/routes/v3/payouts.rs
+++ b/apps/labrinth/src/routes/v3/payouts.rs
@@ -10,11 +10,12 @@ use crate::models::payouts::{
     MuralPayDetails, PayoutMethodRequest, PayoutMethodType, PayoutStatus,
     TremendousDetails, TremendousForexResponse,
 };
-use crate::queue::payouts::PayoutsQueue;
+use crate::queue::payouts::{PayoutFees, PayoutsQueue};
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::util::avalara1099;
 use crate::util::error::Context;
+use crate::util::gotenberg::GotenbergClient;
 use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use chrono::{DateTime, Duration, Utc};
 use eyre::eyre;
@@ -476,6 +477,7 @@ pub async fn create_payout(
     body: web::Json<Withdrawal>,
     session_queue: web::Data<AuthQueue>,
     payouts_queue: web::Data<PayoutsQueue>,
+    gotenberg: web::Data<GotenbergClient>,
 ) -> Result<(), ApiError> {
     let (scopes, user) = get_user_record_from_bearer_token(
         &req,
@@ -609,6 +611,8 @@ pub async fn create_payout(
         body: &body,
         user: &user,
         payout_id,
+        gross_amount: body.amount,
+        fees,
         amount_minus_fee,
         total_fee: fees.total_fee(),
         sent_to_method,
@@ -623,7 +627,7 @@ pub async fn create_payout(
             tremendous_payout(payout_cx, method_details).await?
         }
         PayoutMethodRequest::MuralPay { method_details } => {
-            mural_pay_payout(payout_cx, method_details).await?
+            mural_pay_payout(payout_cx, method_details, &gotenberg).await?
         }
     };
 
@@ -648,6 +652,8 @@ struct PayoutContext<'a> {
     body: &'a Withdrawal,
     user: &'a DBUser,
     payout_id: DBPayoutId,
+    gross_amount: Decimal,
+    fees: PayoutFees,
     /// Set as the [`DBPayout::amount`] field.
     amount_minus_fee: Decimal,
     /// Set as the [`DBPayout::fee`] field.
@@ -674,6 +680,8 @@ async fn tremendous_payout(
         body,
         user,
         payout_id,
+        gross_amount: _,
+        fees: _,
         amount_minus_fee,
         total_fee,
         sent_to_method,
@@ -686,18 +694,6 @@ async fn tremendous_payout(
 ) -> Result<DBPayout, ApiError> {
     let user_email = get_verified_email(user)?;
 
-    let mut payout_item = DBPayout {
-        id: payout_id,
-        user_id: user.id,
-        created: Utc::now(),
-        status: PayoutStatus::InTransit,
-        amount: amount_minus_fee,
-        fee: Some(total_fee),
-        method: Some(PayoutMethodType::Tremendous),
-        method_address: Some(user_email.to_string()),
-        platform_id: None,
-    };
-
     #[derive(Deserialize)]
     struct Reward {
         pub id: String,
@@ -766,36 +762,47 @@ async fn tremendous_payout(
         )
         .await?;
 
-    if let Some(reward) = res.order.rewards.first() {
-        payout_item.platform_id = Some(reward.id.clone())
-    }
+    let platform_id = res.order.rewards.first().map(|reward| reward.id.clone());
 
-    Ok(payout_item)
+    Ok(DBPayout {
+        id: payout_id,
+        user_id: user.id,
+        created: Utc::now(),
+        status: PayoutStatus::InTransit,
+        amount: amount_minus_fee,
+        fee: Some(total_fee),
+        method: Some(PayoutMethodType::Tremendous),
+        method_address: Some(user_email.to_string()),
+        platform_id,
+    })
 }
 
 async fn mural_pay_payout(
     PayoutContext {
-        body: _body,
+        body: _,
         user,
         payout_id,
+        gross_amount,
+        fees,
         amount_minus_fee,
         total_fee,
-        sent_to_method,
+        sent_to_method: _,
         payouts_queue,
     }: PayoutContext<'_>,
     details: &MuralPayDetails,
+    gotenberg: &GotenbergClient,
 ) -> Result<DBPayout, ApiError> {
     let user_email = get_verified_email(user)?;
 
     let payout_request = payouts_queue
         .create_muralpay_payout_request(
+            payout_id,
             user.id.into(),
-            muralpay::TokenAmount {
-                token_symbol: muralpay::USDC.into(),
-                token_amount: sent_to_method,
-            },
+            gross_amount,
+            fees,
             details.payout_details.clone(),
             details.recipient_info.clone(),
+            gotenberg,
         )
         .await?;
 
@@ -817,6 +824,8 @@ async fn paypal_payout(
         body,
         user,
         payout_id,
+        gross_amount: _,
+        fees: _,
         amount_minus_fee,
         total_fee,
         sent_to_method,
@@ -948,18 +957,39 @@ async fn paypal_payout(
 pub enum TransactionItem {
     /// User withdrew some of their available payout.
     Withdrawal {
+        /// ID of the payout.
         id: PayoutId,
+        /// Status of this payout.
         status: PayoutStatus,
+        /// When the payout was created.
         created: DateTime<Utc>,
+        /// How much the user got from this payout, excluding fees.
         amount: Decimal,
+        /// How much the user paid in fees for this payout, on top of `amount`.
         fee: Option<Decimal>,
+        /// What payout method type was used for this.
         method_type: Option<PayoutMethodType>,
+        /// Payout-method-specific ID for the type of payout the user got.
+        ///
+        /// - Tremendous: the rewarded gift card ID.
+        /// - Mural: the payment rail used, i.e. crypto USDC or fiat USD.
+        /// - PayPal: `paypal_us`
+        /// - Venmo: `venmo`
+        ///
+        /// For legacy transactions, this may be [`None`] as we did not always
+        /// store this payout info.
+        method_id: Option<String>,
+        /// Payout-method-specific address which the payout was sent to, like
+        /// an email address.
         method_address: Option<String>,
     },
     /// User got a payout available for them to withdraw.
     PayoutAvailable {
+        /// When this payout was made available for the user to withdraw.
         created: DateTime<Utc>,
+        /// Where this payout came from.
         payout_source: PayoutSource,
+        /// How much the payout was worth.
         amount: Decimal,
     },
 }
@@ -1031,6 +1061,9 @@ pub async fn transaction_history(
                 amount: payout.amount,
                 fee: payout.fee,
                 method_type: payout.method,
+                // TODO: store the `method_id` in the database, and return it here
+                // don't use the `platform_id`, that's something else
+                method_id: None,
                 method_address: payout.method_address,
             });
 
diff --git a/apps/labrinth/src/test/mod.rs b/apps/labrinth/src/test/mod.rs
index 1a10812e..45cb2463 100644
--- a/apps/labrinth/src/test/mod.rs
+++ b/apps/labrinth/src/test/mod.rs
@@ -48,8 +48,8 @@ pub async fn setup(db: &database::TemporaryDatabase) -> LabrinthConfig {
     let anrok_client = anrok::Client::from_env().unwrap();
     let email_queue =
         EmailQueue::init(pool.clone(), redis_pool.clone()).unwrap();
-    let gotenberg_client =
-        GotenbergClient::from_env().expect("Failed to create Gotenberg client");
+    let gotenberg_client = GotenbergClient::from_env(redis_pool.clone())
+        .expect("Failed to create Gotenberg client");
 
     crate::app_setup(
         pool.clone(),
diff --git a/apps/labrinth/src/util/gotenberg.rs b/apps/labrinth/src/util/gotenberg.rs
index ec8c6b3d..8fd55362 100644
--- a/apps/labrinth/src/util/gotenberg.rs
+++ b/apps/labrinth/src/util/gotenberg.rs
@@ -1,22 +1,29 @@
+use crate::database::redis::RedisPool;
+use crate::models::ids::PayoutId;
 use crate::routes::ApiError;
+use crate::routes::internal::gotenberg::{GotenbergDocument, GotenbergError};
+use crate::util::env::env_var;
 use crate::util::error::Context;
 use actix_web::http::header::HeaderName;
+use chrono::{DateTime, Datelike, Utc};
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
+use std::time::Duration;
 
 pub const MODRINTH_GENERATED_PDF_TYPE: HeaderName =
     HeaderName::from_static("modrinth-generated-pdf-type");
 pub const MODRINTH_PAYMENT_ID: HeaderName =
     HeaderName::from_static("modrinth-payment-id");
+pub const PAYMENT_STATEMENTS_NAMESPACE: &str = "payment_statements";
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct PaymentStatement {
-    pub payment_id: String,
+    pub payment_id: PayoutId,
     pub recipient_address_line_1: Option<String>,
     pub recipient_address_line_2: Option<String>,
     pub recipient_address_line_3: Option<String>,
     pub recipient_email: String,
-    pub payment_date: String,
+    pub payment_date: DateTime<Utc>,
     pub gross_amount_cents: i64,
     pub net_amount_cents: i64,
     pub fees_cents: i64,
@@ -53,28 +60,27 @@ pub struct GotenbergClient {
     gotenberg_url: String,
     site_url: String,
     callback_base: String,
+    redis: RedisPool,
 }
 
 impl GotenbergClient {
     /// Initialize the client from environment variables.
-    pub fn from_env() -> Result<Self, ApiError> {
+    pub fn from_env(redis: RedisPool) -> eyre::Result<Self> {
         let client = reqwest::Client::builder()
             .user_agent("Modrinth")
             .build()
-            .wrap_internal_err("failed to build reqwest client")?;
+            .wrap_err("failed to build reqwest client")?;
 
-        let gotenberg_url = dotenvy::var("GOTENBERG_URL")
-            .wrap_internal_err("GOTENBERG_URL is not set")?;
-        let site_url = dotenvy::var("SITE_URL")
-            .wrap_internal_err("SITE_URL is not set")?;
-        let callback_base = dotenvy::var("GOTENBERG_CALLBACK_BASE")
-            .wrap_internal_err("GOTENBERG_CALLBACK_BASE is not set")?;
+        let gotenberg_url = env_var("GOTENBERG_URL")?;
+        let site_url = env_var("SITE_URL")?;
+        let callback_base = env_var("GOTENBERG_CALLBACK_BASE")?;
 
         Ok(Self {
             client,
             gotenberg_url: gotenberg_url.trim_end_matches('/').to_owned(),
             site_url: site_url.trim_end_matches('/').to_owned(),
             callback_base: callback_base.trim_end_matches('/').to_owned(),
+            redis,
         })
     }
 
@@ -140,7 +146,7 @@ impl GotenbergClient {
             )
             .header(
                 "Modrinth-Payment-Id",
-                &statement.payment_id,
+                statement.payment_id.to_string(),
             )
             .header(
                 "Gotenberg-Output-Filename",
@@ -155,11 +161,67 @@ impl GotenbergClient {
 
         Ok(())
     }
+
+    /// Tells Gotenberg to generate a payment statement PDF, and waits until we
+    /// get a response for that PDF.
+    ///
+    /// This submits the PDF via [`GotenbergClient::generate_payment_statement`]
+    /// then waits until some Labrinth instance receives a response on the
+    /// Gotenberg webhook, sends the response over Redis to our instance, and
+    /// returns that from this function.
+    ///
+    /// In a local environment, the Labrinth instance that receives the webhook
+    /// response will be the same one that is waiting on the response, so the
+    /// Redis step is unnecessary, but in a real deployment, we have multiple
+    /// Labrinth instances so we need Redis in between.
+    ///
+    /// If Gotenberg does not return a response to us within `GOTENBERG_TIMEOUT`
+    /// number of milliseconds, this will fail.
+    pub async fn wait_for_payment_statement(
+        &self,
+        statement: &PaymentStatement,
+    ) -> Result<GotenbergDocument, ApiError> {
+        let mut redis = self
+            .redis
+            .connect()
+            .await
+            .wrap_internal_err("failed to get Redis connection")?;
+
+        self.generate_payment_statement(statement).await?;
+
+        let timeout_ms = env_var("GOTENBERG_TIMEOUT")
+            .map_err(ApiError::Internal)?
+            .parse::<u64>()
+            .wrap_internal_err(
+                "`GOTENBERG_TIMEOUT` is not a valid number of milliseconds",
+            )?;
+
+        let [_key, document] = tokio::time::timeout(
+            Duration::from_millis(timeout_ms),
+            redis.brpop(
+                PAYMENT_STATEMENTS_NAMESPACE,
+                &statement.payment_id.to_string(),
+                None,
+            ),
+        )
+        .await
+        .wrap_internal_err("Gotenberg document generation timed out")?
+        .wrap_internal_err("failed to get document over Redis")?
+        .wrap_internal_err("no document was returned from Redis")?;
+
+        let document = serde_json::from_str::<
+            Result<GotenbergDocument, GotenbergError>,
+        >(&document)
+        .wrap_internal_err("failed to deserialize Redis document response")?
+        .wrap_internal_err("Gotenberg document generation failed")?;
+
+        Ok(document)
+    }
 }
 
 fn fill_statement_template(html: &str, s: &PaymentStatement) -> String {
     let variables: Vec<(&str, String)> = vec![
-        ("statement.payment_id", s.payment_id.clone()),
+        ("statement.payment_id", s.payment_id.to_string()),
         (
             "statement.recipient_address_line_1",
             s.recipient_address_line_1.clone().unwrap_or_default(),
@@ -173,7 +235,15 @@ fn fill_statement_template(html: &str, s: &PaymentStatement) -> String {
             s.recipient_address_line_3.clone().unwrap_or_default(),
         ),
         ("statement.recipient_email", s.recipient_email.clone()),
-        ("statement.payment_date", s.payment_date.clone()),
+        (
+            "statement.payment_date",
+            format!(
+                "{:04}-{:02}-{:02}",
+                s.payment_date.year(),
+                s.payment_date.month(),
+                s.payment_date.day()
+            ),
+        ),
         (
             "statement.gross_amount",
             format_money(s.gross_amount_cents, &s.currency_code),
diff --git a/docker-compose.yml b/docker-compose.yml
index ebca3de9..965599fd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       POSTGRES_PASSWORD: labrinth
       POSTGRES_HOST_AUTH_METHOD: trust
     healthcheck:
-      test: [ 'CMD', 'pg_isready' ]
+      test: ['CMD', 'pg_isready']
       interval: 3s
       timeout: 5s
       retries: 3
@@ -28,7 +28,7 @@ services:
       MEILI_MASTER_KEY: modrinth
       MEILI_HTTP_PAYLOAD_SIZE_LIMIT: 107374182400
     healthcheck:
-      test: [ 'CMD', 'curl', '--fail', 'http://localhost:7700/health' ]
+      test: ['CMD', 'curl', '--fail', 'http://localhost:7700/health']
       interval: 3s
       timeout: 5s
       retries: 3
@@ -41,7 +41,7 @@ services:
     volumes:
       - redis-data:/data
     healthcheck:
-      test: [ 'CMD', 'redis-cli', 'PING' ]
+      test: ['CMD', 'redis-cli', 'PING']
       interval: 3s
       timeout: 5s
       retries: 3
@@ -54,7 +54,7 @@ services:
       CLICKHOUSE_USER: default
       CLICKHOUSE_PASSWORD: default
     healthcheck:
-      test: [ 'CMD-SHELL', 'clickhouse-client --query "SELECT 1"' ]
+      test: ['CMD-SHELL', 'clickhouse-client --query "SELECT 1"']
       interval: 3s
       timeout: 5s
       retries: 3
@@ -67,7 +67,14 @@ services:
     environment:
       MP_ENABLE_SPAMASSASSIN: postmark
     healthcheck:
-      test: [ 'CMD', 'wget', '-q', '-O/dev/null', 'http://localhost:8025/api/v1/info' ]
+      test:
+        [
+          'CMD',
+          'wget',
+          '-q',
+          '-O/dev/null',
+          'http://localhost:8025/api/v1/info',
+        ]
       interval: 3s
       timeout: 5s
       retries: 3
@@ -75,7 +82,11 @@ services:
     image: gotenberg/gotenberg:8
     container_name: labrinth-gotenberg
     ports:
-      - "3000:13000"
+      - '13000:3000'
+    extra_hosts:
+      # Gotenberg must send a message on a webhook to our backend,
+      # so it must have access to our local network
+      - 'host.docker.internal:host-gateway'
   labrinth:
     profiles:
       - with-labrinth
diff --git a/packages/muralpay/examples/muralpay.rs b/packages/muralpay/examples/muralpay.rs
index d3ae1afb..1af7f7bb 100644
--- a/packages/muralpay/examples/muralpay.rs
+++ b/packages/muralpay/examples/muralpay.rs
@@ -5,7 +5,8 @@ use muralpay::{
     AccountId, CounterpartyId, CreatePayout, CreatePayoutDetails, Dob,
     FiatAccountType, FiatAndRailCode, FiatAndRailDetails, FiatFeeRequest,
     FiatPayoutFee, MuralPay, PayoutMethodId, PayoutRecipientInfo,
-    PhysicalAddress, TokenAmount, TokenFeeRequest, TokenPayoutFee, UsdSymbol,
+    PayoutRequestId, PhysicalAddress, TokenAmount, TokenFeeRequest,
+    TokenPayoutFee, UsdSymbol,
 };
 use rust_decimal::{Decimal, dec};
 use serde::Serialize;
@@ -54,6 +55,11 @@ enum PayoutCommand {
     /// List all payout requests
     #[clap(alias = "ls")]
     List,
+    /// Get details for a single payout request
+    Get {
+        /// ID of the payout request
+        payout_request_id: PayoutRequestId,
+    },
     /// Create a payout request
     Create {
         /// ID of the Mural account to send from
@@ -140,6 +146,9 @@ async fn main() -> Result<()> {
         Command::Payout {
             command: PayoutCommand::List,
         } => run(of, muralpay.search_payout_requests(None, None).await?),
+        Command::Payout {
+            command: PayoutCommand::Get { payout_request_id },
+        } => run(of, muralpay.get_payout_request(payout_request_id).await?),
         Command::Payout {
             command:
                 PayoutCommand::Create {
diff --git a/packages/muralpay/src/payout.rs b/packages/muralpay/src/payout.rs
index 063035de..876a1870 100644
--- a/packages/muralpay/src/payout.rs
+++ b/packages/muralpay/src/payout.rs
@@ -32,6 +32,8 @@ impl MuralPay {
         #[derive(Debug, Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Body {
+            // if we submit `null`, Mural errors; we have to explicitly exclude this field
+            #[serde(skip_serializing_if = "Option::is_none")]
             filter: Option<PayoutStatusFilter>,
         }
 
@@ -48,7 +50,7 @@ impl MuralPay {
         &self,
         id: PayoutRequestId,
     ) -> Result<PayoutRequest, MuralError> {
-        self.http_get(|base| format!("{base}/api/payouts/{id}"))
+        self.http_get(|base| format!("{base}/api/payouts/payout/{id}"))
             .send_mural()
             .await
     }
@@ -606,6 +608,26 @@ pub enum PayoutRecipientInfo {
     },
 }
 
+impl PayoutRecipientInfo {
+    pub fn email(&self) -> &str {
+        match self {
+            PayoutRecipientInfo::Individual { email, .. } => email,
+            PayoutRecipientInfo::Business { email, .. } => email,
+        }
+    }
+
+    pub fn physical_address(&self) -> &PhysicalAddress {
+        match self {
+            PayoutRecipientInfo::Individual {
+                physical_address, ..
+            } => physical_address,
+            PayoutRecipientInfo::Business {
+                physical_address, ..
+            } => physical_address,
+        }
+    }
+}
+
 #[derive(Debug, Display, Clone, Copy, SerializeDisplay, DeserializeFromStr)]
 #[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[display("{year:04}-{month:02}-{day:02}")]

From 98b4970680462e0e5472ae925ee8040cd7a8a83f Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Mon, 10 Nov 2025 08:41:06 -0800
Subject: [PATCH 40/64] Store method ID for payouts (#4752)

* Store method ID for payouts

* Fixes
---
 ...7c70a245b0cc48ae3f4883393bfd57a685f1.json} |  14 ++-
 ...1049791dab817ac07708873ac57986c17e2c.json} |   5 +-
 ...0251108210105_add_method_id_to_payouts.sql |   2 +
 .../src/database/models/payout_item.rs        |  12 ++-
 apps/labrinth/src/models/v3/payouts.rs        |  12 ++-
 apps/labrinth/src/routes/v3/payouts.rs        | 102 ++++++++++--------
 6 files changed, 95 insertions(+), 52 deletions(-)
 rename apps/labrinth/.sqlx/{query-83f8d3fcc4ba1544f593abaf29c79157bc35e3fca79cc93f6512ca01acd8e5ce.json => query-2aa9704c9ead520fb61b4ca1e94c7c70a245b0cc48ae3f4883393bfd57a685f1.json} (79%)
 rename apps/labrinth/.sqlx/{query-285c089b43bf0225ba03e279f7a227c3483bae818d077efdc54e588b858c8760.json => query-c82bf13a2567f772a4c6eb3329971049791dab817ac07708873ac57986c17e2c.json} (53%)
 create mode 100644 apps/labrinth/migrations/20251108210105_add_method_id_to_payouts.sql

diff --git a/apps/labrinth/.sqlx/query-83f8d3fcc4ba1544f593abaf29c79157bc35e3fca79cc93f6512ca01acd8e5ce.json b/apps/labrinth/.sqlx/query-2aa9704c9ead520fb61b4ca1e94c7c70a245b0cc48ae3f4883393bfd57a685f1.json
similarity index 79%
rename from apps/labrinth/.sqlx/query-83f8d3fcc4ba1544f593abaf29c79157bc35e3fca79cc93f6512ca01acd8e5ce.json
rename to apps/labrinth/.sqlx/query-2aa9704c9ead520fb61b4ca1e94c7c70a245b0cc48ae3f4883393bfd57a685f1.json
index ac2af681..d0dabd44 100644
--- a/apps/labrinth/.sqlx/query-83f8d3fcc4ba1544f593abaf29c79157bc35e3fca79cc93f6512ca01acd8e5ce.json
+++ b/apps/labrinth/.sqlx/query-2aa9704c9ead520fb61b4ca1e94c7c70a245b0cc48ae3f4883393bfd57a685f1.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT id, user_id, created, amount, status, method, method_address, platform_id, fee\n            FROM payouts\n            WHERE id = ANY($1)\n            ",
+  "query": "\n            SELECT id, user_id, created, amount, status, method, method_id, method_address, platform_id, fee\n            FROM payouts\n            WHERE id = ANY($1)\n            ",
   "describe": {
     "columns": [
       {
@@ -35,16 +35,21 @@
       },
       {
         "ordinal": 6,
-        "name": "method_address",
+        "name": "method_id",
         "type_info": "Text"
       },
       {
         "ordinal": 7,
-        "name": "platform_id",
+        "name": "method_address",
         "type_info": "Text"
       },
       {
         "ordinal": 8,
+        "name": "platform_id",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 9,
         "name": "fee",
         "type_info": "Numeric"
       }
@@ -63,8 +68,9 @@
       true,
       true,
       true,
+      true,
       true
     ]
   },
-  "hash": "83f8d3fcc4ba1544f593abaf29c79157bc35e3fca79cc93f6512ca01acd8e5ce"
+  "hash": "2aa9704c9ead520fb61b4ca1e94c7c70a245b0cc48ae3f4883393bfd57a685f1"
 }
diff --git a/apps/labrinth/.sqlx/query-285c089b43bf0225ba03e279f7a227c3483bae818d077efdc54e588b858c8760.json b/apps/labrinth/.sqlx/query-c82bf13a2567f772a4c6eb3329971049791dab817ac07708873ac57986c17e2c.json
similarity index 53%
rename from apps/labrinth/.sqlx/query-285c089b43bf0225ba03e279f7a227c3483bae818d077efdc54e588b858c8760.json
rename to apps/labrinth/.sqlx/query-c82bf13a2567f772a4c6eb3329971049791dab817ac07708873ac57986c17e2c.json
index 0b54267b..44fbfc3a 100644
--- a/apps/labrinth/.sqlx/query-285c089b43bf0225ba03e279f7a227c3483bae818d077efdc54e588b858c8760.json
+++ b/apps/labrinth/.sqlx/query-c82bf13a2567f772a4c6eb3329971049791dab817ac07708873ac57986c17e2c.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO payouts (\n                id, amount, fee, user_id, status, method, method_address, platform_id\n            )\n            VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8\n            )\n            ",
+  "query": "\n            INSERT INTO payouts (\n                id, amount, fee, user_id, status, method, method_id, method_address, platform_id\n            )\n            VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9\n            )\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -12,10 +12,11 @@
         "Varchar",
         "Text",
         "Text",
+        "Text",
         "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "285c089b43bf0225ba03e279f7a227c3483bae818d077efdc54e588b858c8760"
+  "hash": "c82bf13a2567f772a4c6eb3329971049791dab817ac07708873ac57986c17e2c"
 }
diff --git a/apps/labrinth/migrations/20251108210105_add_method_id_to_payouts.sql b/apps/labrinth/migrations/20251108210105_add_method_id_to_payouts.sql
new file mode 100644
index 00000000..47ae8b83
--- /dev/null
+++ b/apps/labrinth/migrations/20251108210105_add_method_id_to_payouts.sql
@@ -0,0 +1,2 @@
+ALTER TABLE payouts
+ADD COLUMN method_id TEXT;
diff --git a/apps/labrinth/src/database/models/payout_item.rs b/apps/labrinth/src/database/models/payout_item.rs
index d8d82b05..102f4f4d 100644
--- a/apps/labrinth/src/database/models/payout_item.rs
+++ b/apps/labrinth/src/database/models/payout_item.rs
@@ -15,7 +15,11 @@ pub struct DBPayout {
 
     pub fee: Option<Decimal>,
     pub method: Option<PayoutMethodType>,
+    /// See [`crate::models::v3::payouts::Payout::method_id`].
+    pub method_id: Option<String>,
+    /// See [`crate::models::v3::payouts::Payout::method_address`].
     pub method_address: Option<String>,
+    /// See [`crate::models::v3::payouts::Payout::platform_id`].
     pub platform_id: Option<String>,
 }
 
@@ -27,10 +31,10 @@ impl DBPayout {
         sqlx::query!(
             "
             INSERT INTO payouts (
-                id, amount, fee, user_id, status, method, method_address, platform_id
+                id, amount, fee, user_id, status, method, method_id, method_address, platform_id
             )
             VALUES (
-                $1, $2, $3, $4, $5, $6, $7, $8
+                $1, $2, $3, $4, $5, $6, $7, $8, $9
             )
             ",
             self.id.0,
@@ -39,6 +43,7 @@ impl DBPayout {
             self.user_id.0,
             self.status.as_str(),
             self.method.as_ref().map(|x| x.as_str()),
+            self.method_id,
             self.method_address,
             self.platform_id,
         )
@@ -71,7 +76,7 @@ impl DBPayout {
 
         let results = sqlx::query!(
             "
-            SELECT id, user_id, created, amount, status, method, method_address, platform_id, fee
+            SELECT id, user_id, created, amount, status, method, method_id, method_address, platform_id, fee
             FROM payouts
             WHERE id = ANY($1)
             ",
@@ -85,6 +90,7 @@ impl DBPayout {
             status: PayoutStatus::from_string(&r.status),
             amount: r.amount,
             method: r.method.and_then(|x| PayoutMethodType::from_string(&x)),
+            method_id: r.method_id,
             method_address: r.method_address,
             platform_id: r.platform_id,
             fee: r.fee,
diff --git a/apps/labrinth/src/models/v3/payouts.rs b/apps/labrinth/src/models/v3/payouts.rs
index 24330525..46af53f6 100644
--- a/apps/labrinth/src/models/v3/payouts.rs
+++ b/apps/labrinth/src/models/v3/payouts.rs
@@ -18,8 +18,17 @@ pub struct Payout {
     #[serde(with = "rust_decimal::serde::float_option")]
     pub fee: Option<Decimal>,
     pub method: Option<PayoutMethodType>,
-    /// the address this payout was sent to: ex: email, paypal email, venmo handle
+    /// Platform-dependent identifier for the submethod.
+    ///
+    /// See [`crate::routes::v3::payouts::TransactionItem::Withdrawal::method_id`].
+    pub method_id: Option<String>,
+    /// Address this payout was sent to: ex: email, paypal email, venmo handle.
     pub method_address: Option<String>,
+    /// Platform-provided opaque identifier for the transaction linked to this payout.
+    ///
+    /// - Tremendous: reward ID
+    /// - Mural: payout request UUID
+    /// - PayPal/Venmo: transaction ID
     pub platform_id: Option<String>,
 }
 
@@ -33,6 +42,7 @@ impl Payout {
             amount: data.amount,
             fee: data.fee,
             method: data.method,
+            method_id: data.method_id,
             method_address: data.method_address,
             platform_id: data.platform_id,
         }
diff --git a/apps/labrinth/src/routes/v3/payouts.rs b/apps/labrinth/src/routes/v3/payouts.rs
index 00384e92..3a33f771 100644
--- a/apps/labrinth/src/routes/v3/payouts.rs
+++ b/apps/labrinth/src/routes/v3/payouts.rs
@@ -10,6 +10,7 @@ use crate::models::payouts::{
     MuralPayDetails, PayoutMethodRequest, PayoutMethodType, PayoutStatus,
     TremendousDetails, TremendousForexResponse,
 };
+use crate::queue::payouts::mural::MuralPayoutRequest;
 use crate::queue::payouts::{PayoutFees, PayoutsQueue};
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
@@ -772,6 +773,7 @@ async fn tremendous_payout(
         amount: amount_minus_fee,
         fee: Some(total_fee),
         method: Some(PayoutMethodType::Tremendous),
+        method_id: Some(body.method_id.clone()),
         method_address: Some(user_email.to_string()),
         platform_id,
     })
@@ -806,6 +808,16 @@ async fn mural_pay_payout(
         )
         .await?;
 
+    let method_id = match &details.payout_details {
+        MuralPayoutRequest::Blockchain { .. } => {
+            "blockchain-usdc-polygon".to_string()
+        }
+        MuralPayoutRequest::Fiat {
+            fiat_and_rail_details,
+            ..
+        } => fiat_and_rail_details.code().to_string(),
+    };
+
     Ok(DBPayout {
         id: payout_id,
         user_id: user.id,
@@ -814,6 +826,7 @@ async fn mural_pay_payout(
         amount: amount_minus_fee,
         fee: Some(total_fee),
         method: Some(PayoutMethodType::MuralPay),
+        method_id: Some(method_id),
         method_address: Some(user_email.to_string()),
         platform_id: Some(payout_request.id.to_string()),
     })
@@ -883,18 +896,6 @@ async fn paypal_payout(
         pub links: Vec<PayPalLink>,
     }
 
-    let mut payout_item = crate::database::models::payout_item::DBPayout {
-        id: payout_id,
-        user_id: user.id,
-        created: Utc::now(),
-        status: PayoutStatus::InTransit,
-        amount: amount_minus_fee,
-        fee: Some(total_fee),
-        method: Some(body.method.method_type()),
-        method_address: Some(display_address.clone()),
-        platform_id: None,
-    };
-
     let res: PayoutsResponse = payouts_queue.make_paypal_request(
         Method::POST,
         "payments/payouts",
@@ -922,33 +923,50 @@ async fn paypal_payout(
         None
     ).await?;
 
-    if let Some(link) = res.links.first() {
-        #[derive(Deserialize)]
-        struct PayoutItem {
-            pub payout_item_id: String,
-        }
+    let link = res
+        .links
+        .first()
+        .wrap_request_err("no PayPal links available")?;
 
-        #[derive(Deserialize)]
-        struct PayoutData {
-            pub items: Vec<PayoutItem>,
-        }
-
-        if let Ok(res) = payouts_queue
-            .make_paypal_request::<(), PayoutData>(
-                Method::GET,
-                &link.href,
-                None,
-                None,
-                Some(true),
-            )
-            .await
-            && let Some(data) = res.items.first()
-        {
-            payout_item.platform_id = Some(data.payout_item_id.clone());
-        }
+    #[derive(Deserialize)]
+    struct PayoutItem {
+        pub payout_item_id: String,
     }
 
-    Ok(payout_item)
+    #[derive(Deserialize)]
+    struct PayoutData {
+        pub items: Vec<PayoutItem>,
+    }
+
+    let res = payouts_queue
+        .make_paypal_request::<(), PayoutData>(
+            Method::GET,
+            &link.href,
+            None,
+            None,
+            Some(true),
+        )
+        .await
+        .wrap_internal_err("failed to make PayPal request")?;
+    let data = res
+        .items
+        .first()
+        .wrap_internal_err("no payout items returned from PayPal request")?;
+
+    let platform_id = Some(data.payout_item_id.clone());
+
+    Ok(DBPayout {
+        id: payout_id,
+        user_id: user.id,
+        created: Utc::now(),
+        status: PayoutStatus::InTransit,
+        amount: amount_minus_fee,
+        fee: Some(total_fee),
+        method: Some(body.method.method_type()),
+        method_id: Some(body.method_id.clone()),
+        method_address: Some(display_address.clone()),
+        platform_id,
+    })
 }
 
 /// User performing a payout-related action.
@@ -972,9 +990,11 @@ pub enum TransactionItem {
         /// Payout-method-specific ID for the type of payout the user got.
         ///
         /// - Tremendous: the rewarded gift card ID.
-        /// - Mural: the payment rail used, i.e. crypto USDC or fiat USD.
-        /// - PayPal: `paypal_us`
-        /// - Venmo: `venmo`
+        /// - Mural: the payment rail code used.
+        ///   - Blockchain: `blockchain-usdc-polygon`.
+        ///   - Fiat: see [`muralpay::FiatAndRailCode`].
+        /// - PayPal: `paypal_us`.
+        /// - Venmo: `venmo`.
         ///
         /// For legacy transactions, this may be [`None`] as we did not always
         /// store this payout info.
@@ -1061,9 +1081,7 @@ pub async fn transaction_history(
                 amount: payout.amount,
                 fee: payout.fee,
                 method_type: payout.method,
-                // TODO: store the `method_id` in the database, and return it here
-                // don't use the `platform_id`, that's something else
-                method_id: None,
+                method_id: payout.method_id,
                 method_address: payout.method_address,
             });
 

From 1dcb38cb57fa1d46d69e47d97f549c6928d77c03 Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Mon, 10 Nov 2025 08:48:11 -0800
Subject: [PATCH 41/64] Fix dependency installation not respecting mod loader
 (#4751)

* Fix dependency installation not respecting mod loader

* fix
---
 apps/app-frontend/src/store/install.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/app-frontend/src/store/install.js b/apps/app-frontend/src/store/install.js
index 14988763..8861bc4b 100644
--- a/apps/app-frontend/src/store/install.js
+++ b/apps/app-frontend/src/store/install.js
@@ -42,11 +42,24 @@ export const useInstall = defineStore('installStore', {
 })
 
 export const findPreferredVersion = (versions, project, instance) => {
+	// When `project` is passed in from this stack trace:
+	// - `installVersionDependencies`
+	// - `install.js/install` - `installVersionDependencies` call
+	//
+	// ..then `project` is actually a `Dependency` struct of a cached `Version`.
+	// `Dependency` does not have a `project_type` field,
+	// so we default it to `mod`.
+	//
+	// If we don't default here, then this `.find` will ignore version/instance
+	// loader mismatches, and you'll end up e.g. installing NeoForge mods for a
+	// Fabric instance.
+	const projectType = project.project_type ?? 'mod'
+
 	// If we can find a version using strictly the instance loader then prefer that
 	let version = versions.find(
 		(v) =>
 			v.game_versions.includes(instance.game_version) &&
-			(project.project_type === 'mod' ? v.loaders.includes(instance.loader) : true),
+			(projectType === 'mod' ? v.loaders.includes(instance.loader) : true),
 	)
 
 	if (!version) {

From 127e01cc96d061faa647cad44c6a9811f9a8fc07 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 10 Nov 2025 11:58:39 -0800
Subject: [PATCH 42/64] changelog

---
 packages/utils/changelog.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 58b7e0e4..3135bc70 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,13 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-11-10T11:20:00-07:00`,
+		product: 'app',
+		version: '0.10.18',
+		body: `## Improvements
+- Fixed automatic dependency resolution ignoring the selected mod loader.`,
+	},
 	{
 		date: `2025-11-07T21:10:00-07:00`,
 		product: 'web',

From cca1dd7e37244669c7180694b4cb9048335763d2 Mon Sep 17 00:00:00 2001
From: Jonathan Romano <jonathan@luxaritas.com>
Date: Mon, 10 Nov 2025 21:00:26 -0500
Subject: [PATCH 43/64] Update openapi spec to fix invalid json (#4756)

Signed-off-by: Jonathan Romano <jonathan@luxaritas.com>
---
 apps/docs/public/openapi.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/docs/public/openapi.yaml b/apps/docs/public/openapi.yaml
index 3a4376f1..5044b2be 100644
--- a/apps/docs/public/openapi.yaml
+++ b/apps/docs/public/openapi.yaml
@@ -703,8 +703,8 @@ components:
               description: All gallery images attached to the project
               example:
                 [
-                  https://cdn.modrinth.com/data/AABBCCDD/images/009b7d8d6e8bf04968a29421117c59b3efe2351a.png,
-                  https://cdn.modrinth.com/data/AABBCCDD/images/c21776867afb6046fdc3c21dbcf5cc50ae27a236.png,
+                  'https://cdn.modrinth.com/data/AABBCCDD/images/009b7d8d6e8bf04968a29421117c59b3efe2351a.png',
+                  'https://cdn.modrinth.com/data/AABBCCDD/images/c21776867afb6046fdc3c21dbcf5cc50ae27a236.png',
                 ]
               items:
                 type: string

From 5901c5a53533dcf9b93bb8b749203a248edda358 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Tue, 11 Nov 2025 12:28:24 -0800
Subject: [PATCH 44/64] update changelog

---
 packages/utils/changelog.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 3135bc70..6e948c05 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,12 +10,18 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-11-11T12:50:00-07:00`,
+		product: 'app',
+		version: '0.10.19',
+		body: `## Improvements
+- Fixed automatic dependency resolution ignoring the selected mod loader.`,
+	},
 	{
 		date: `2025-11-10T11:20:00-07:00`,
 		product: 'app',
 		version: '0.10.18',
-		body: `## Improvements
-- Fixed automatic dependency resolution ignoring the selected mod loader.`,
+		body: `No changes.`,
 	},
 	{
 		date: `2025-11-07T21:10:00-07:00`,

From a5602ff18c3b531f3cd712b738eac711263ed364 Mon Sep 17 00:00:00 2001
From: Modrinth Bot <106493074+modrinth-bot@users.noreply.github.com>
Date: Tue, 11 Nov 2025 15:11:36 -0800
Subject: [PATCH 45/64] New translations from Crowdin (main) (#4749)

---
 .../src/locales/ceb-PH/index.json             |  53 +-
 .../app-frontend/src/locales/de-DE/index.json |   6 +
 .../src/locales/es-419/index.json             |  34 +-
 .../app-frontend/src/locales/es-ES/index.json |  10 +-
 .../src/locales/fil-PH/index.json             |  53 +-
 .../app-frontend/src/locales/ja-JP/index.json |   3 +
 .../app-frontend/src/locales/nl-NL/index.json |  63 ++
 .../app-frontend/src/locales/pt-PT/index.json | 108 +++
 .../app-frontend/src/locales/sv-SE/index.json | 108 +++
 .../app-frontend/src/locales/tl-PH/index.json |  53 +-
 .../app-frontend/src/locales/tr-TR/index.json |   2 +-
 .../app-frontend/src/locales/zh-CN/index.json |   3 +
 apps/frontend/src/locales/cs-CZ/index.json    |  12 -
 apps/frontend/src/locales/de-CH/index.json    | 637 +++++++++++++++-
 apps/frontend/src/locales/de-DE/index.json    | 698 +++++++++++++++++-
 apps/frontend/src/locales/es-419/index.json   | 679 ++++++++++++++++-
 apps/frontend/src/locales/es-ES/index.json    | 213 +++++-
 apps/frontend/src/locales/fr-FR/index.json    |  21 -
 apps/frontend/src/locales/it-IT/index.json    |  15 -
 apps/frontend/src/locales/ko-KR/index.json    |  12 -
 apps/frontend/src/locales/ms-Arab/index.json  | 659 ++++++++++++++++-
 apps/frontend/src/locales/ms-MY/index.json    | 665 ++++++++++++++++-
 apps/frontend/src/locales/pl-PL/index.json    | 664 ++++++++++++++++-
 apps/frontend/src/locales/pt-BR/index.json    |  63 +-
 apps/frontend/src/locales/pt-PT/index.json    | 350 ++++++++-
 apps/frontend/src/locales/ro-RO/index.json    |  15 -
 apps/frontend/src/locales/ru-RU/index.json    | 643 +++++++++++++++-
 apps/frontend/src/locales/sr-CS/index.json    |  12 -
 apps/frontend/src/locales/sv-SE/index.json    | 105 ++-
 apps/frontend/src/locales/tr-TR/index.json    |  15 -
 apps/frontend/src/locales/uk-UA/index.json    | 184 ++++-
 apps/frontend/src/locales/zh-CN/index.json    | 508 ++++++++++++-
 apps/frontend/src/locales/zh-TW/index.json    |  73 +-
 .../moderation/src/locales/cs-CZ/index.json   |  33 -
 .../moderation/src/locales/de-CH/index.json   |  22 +-
 .../moderation/src/locales/de-DE/index.json   |  22 +-
 .../moderation/src/locales/es-419/index.json  |  33 -
 .../moderation/src/locales/es-ES/index.json   |  33 -
 .../moderation/src/locales/fi-FI/index.json   |   3 -
 .../moderation/src/locales/fr-FR/index.json   |  33 -
 .../moderation/src/locales/he-IL/index.json   |  33 -
 .../moderation/src/locales/id-ID/index.json   |  33 -
 .../moderation/src/locales/it-IT/index.json   |  33 -
 .../moderation/src/locales/ja-JP/index.json   |  30 -
 .../moderation/src/locales/ms-Arab/index.json |  22 +-
 .../moderation/src/locales/ms-MY/index.json   |  22 +-
 .../moderation/src/locales/nl-NL/index.json   |  27 -
 .../moderation/src/locales/pl-PL/index.json   |  22 +-
 .../moderation/src/locales/pt-BR/index.json   |  33 -
 .../moderation/src/locales/pt-PT/index.json   |  33 -
 .../moderation/src/locales/ro-RO/index.json   |  33 -
 .../moderation/src/locales/ru-RU/index.json   |  60 +-
 .../moderation/src/locales/tr-TR/index.json   |  26 +-
 .../moderation/src/locales/uk-UA/index.json   |  33 -
 .../moderation/src/locales/zh-CN/index.json   |  20 +-
 .../moderation/src/locales/zh-TW/index.json   |  33 -
 packages/ui/src/locales/de-CH/index.json      | 113 ++-
 packages/ui/src/locales/de-DE/index.json      | 152 +++-
 packages/ui/src/locales/es-419/index.json     | 154 +++-
 packages/ui/src/locales/es-ES/index.json      |  99 +++
 packages/ui/src/locales/ms-Arab/index.json    | 150 ++++
 packages/ui/src/locales/ms-MY/index.json      | 150 ++++
 packages/ui/src/locales/pl-PL/index.json      | 150 ++++
 packages/ui/src/locales/pt-BR/index.json      |  27 +
 packages/ui/src/locales/pt-PT/index.json      |  24 +
 packages/ui/src/locales/ru-RU/index.json      | 111 +++
 packages/ui/src/locales/tr-TR/index.json      |  72 ++
 packages/ui/src/locales/uk-UA/index.json      |  33 +
 packages/ui/src/locales/zh-CN/index.json      | 158 +++-
 packages/ui/src/locales/zh-TW/index.json      |  41 +-
 70 files changed, 7898 insertions(+), 947 deletions(-)

diff --git a/apps/app-frontend/src/locales/ceb-PH/index.json b/apps/app-frontend/src/locales/ceb-PH/index.json
index 8f78c0bc..60809bc0 100644
--- a/apps/app-frontend/src/locales/ceb-PH/index.json
+++ b/apps/app-frontend/src/locales/ceb-PH/index.json
@@ -156,7 +156,7 @@
     "message": "Minecraft nga Kalibutan"
   },
   "instance.edit-world.reset-icon": {
-    "message": "Walaa ang amoy"
+    "message": "Pag-usab sa amoy"
   },
   "instance.edit-world.title": {
     "message": "Usba ang kalibutan"
@@ -320,12 +320,18 @@
   "instance.settings.tabs.installation.platform": {
     "message": "Pantawan"
   },
+  "instance.settings.tabs.installation.reinstall.button": {
+    "message": "Itaud pag-usab ang putos sa kausaban"
+  },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
     "message": "Mahimo nga mobalik sa sinugdan ang tanang gitaod o giusab nga sulod sa unsay ihatag sa putos sa kausaban, tangtangon ang mga kausaban o sulod nga imong gidugang apil na ang lintunganay nga putos sa kausaban. Mahimo nga maayo ang mga tuhaw nga batasan kon naay pagbag-o sa pananglitan, apan kon gasalig na ang imong kalibutan sa dinugang nga sulod, mahimo nga madaut ani ang daan nga mga kalibutan."
   },
   "instance.settings.tabs.installation.reinstall.description": {
     "message": "Ibalik ang mga sulod sa pananglitan sa unang kahimtang, tangtangon ang mga kausaban o sulod nga imong gidugang apil na ang lintunganay nga putos sa kausaban."
   },
+  "instance.settings.tabs.installation.reinstall.title": {
+    "message": "Itaud pag-usab ang putos sa kausaban"
+  },
   "instance.settings.tabs.installation.repair.button": {
     "message": "Ayohon"
   },
@@ -338,6 +344,12 @@
   "instance.settings.tabs.installation.repair.confirm.title": {
     "message": "Ayohon ang pananglitan?"
   },
+  "instance.settings.tabs.installation.repair.in-progress": {
+    "message": "Nag-ayo karon"
+  },
+  "instance.settings.tabs.installation.reset-selections": {
+    "message": "Sa kasamtang pag-usab "
+  },
   "instance.settings.tabs.installation.show-all-versions": {
     "message": "Ipakita ang tanang bersiyon"
   },
@@ -365,30 +377,51 @@
   "instance.settings.tabs.installation.unknown-version": {
     "message": "(diinilang bersiyon)"
   },
+  "instance.settings.tabs.installation.unlink.button": {
+    "message": "Pagbugto sa pananglitan"
+  },
   "instance.settings.tabs.installation.unlink.confirm.description": {
     "message": "Kun imong ipadayon, dili na nimo makatay pagbalik nga wala mohimo og bag-o nga pananglitan. Dili na ka makadawat og pagpasibo sa putos sa kausaban ug mahimo kining naandan nga."
   },
   "instance.settings.tabs.installation.unlink.description": {
     "message": "Nakakatay kining pananglitan sa usa ka putos sa kausaban, pasabot ani nga dili mapasibo ang mga kausaban og dili nimo mausab ang tigkarga sa kausaban o ang bersiyon sa Minecraft. Kanunay nga mabugto kining pananglitan og putos sa kausabon kun tangtangon ang katay."
   },
+  "instance.settings.tabs.java": {
+    "message": "Java at memorya"
+  },
   "instance.settings.tabs.java.hooks": {
     "message": "Mga kaw-it"
   },
+  "instance.settings.tabs.java.java-arguments": {
+    "message": "Mga lantugi sa java"
+  },
   "instance.settings.tabs.java.java-installation": {
     "message": "Pagtaud sa Java"
   },
+  "instance.settings.tabs.java.java-memory": {
+    "message": "Memoryang gigahin"
+  },
   "instance.settings.tabs.window": {
     "message": "Tamboanan"
   },
   "instance.settings.tabs.window.custom-window-settings": {
     "message": "Mga himutangan sa pinatuyo nga tamboanan"
   },
+  "instance.settings.tabs.window.fullscreen": {
+    "message": "Punong-tabil"
+  },
   "instance.settings.tabs.window.height": {
     "message": "Gitas-on"
   },
+  "instance.settings.tabs.window.height.enter": {
+    "message": "Ibutang ang gitas-on..."
+  },
   "instance.settings.tabs.window.width": {
     "message": "Gilapdon"
   },
+  "instance.settings.tabs.window.width.enter": {
+    "message": "Ibutang ang gilapdon..."
+  },
   "instance.settings.title": {
     "message": "Mga Himutangan"
   },
@@ -398,6 +431,18 @@
   "instance.worlds.copy_address": {
     "message": "Awata ang padad-anan"
   },
+  "instance.worlds.dont_show_on_home": {
+    "message": "Ayaw pakit-a sa Puloy-anan"
+  },
+  "instance.worlds.filter.available": {
+    "message": "Magamit"
+  },
+  "instance.worlds.hardcore": {
+    "message": "Mahanasnon nga paagi"
+  },
+  "instance.worlds.play_instance": {
+    "message": "Dulai ang pananglitan"
+  },
   "instance.worlds.type.server": {
     "message": "Magsisilbi"
   },
@@ -406,5 +451,11 @@
   },
   "instance.worlds.view_instance": {
     "message": "Tan-awa ang pananglitan"
+  },
+  "instance.worlds.world_in_use": {
+    "message": "Gigamit ang kalibotan"
+  },
+  "search.filter.locked.instance.sync": {
+    "message": "Pagdungan sa pananglitan"
   }
 }
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index 3c97a9e9..cd9b383e 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -86,6 +86,9 @@
   "friends.add-friend.username.title": {
     "message": "Was ist der Modrinth Nutzername deines Freundes?"
   },
+  "friends.add-friends-to-share": {
+    "message": "<link>Freunde hinzufügen</link>, um zu sehen, was sie spielen!"
+  },
   "friends.friend.cancel-request": {
     "message": "Anfrage abbrechen"
   },
@@ -122,6 +125,9 @@
   "friends.section.heading": {
     "message": "{title} - {count}"
   },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Melden Sie sich bei einem Modrinth Konto an</link>, um Freunde hinzuzufügen und zu sehen, was sie gerade spielen!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Hinzufügen und spielen"
   },
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index 68bb0f48..14b751ee 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -66,34 +66,37 @@
     "message": "Recarga para instalar la actualización"
   },
   "friends.action.add-friend": {
-    "message": "Agrega a un amigo"
+    "message": "Añadir un amigo"
   },
   "friends.action.view-friend-requests": {
-    "message": "{count} {count, plural, one {petición} other {peticiones}} de amistad"
+    "message": "{count} {count, plural, one {solicitud} other {solicitudes}} de amistad"
   },
   "friends.add-friend.submit": {
-    "message": "Envía una petición de amistad"
+    "message": "Enviar solicitud de amistad"
   },
   "friends.add-friend.title": {
-    "message": "Agrega a un amigo"
+    "message": "Añadiendo un amigo"
   },
   "friends.add-friend.username.description": {
-    "message": "¡Puede ser diferente de su apodo en Minecraft!"
+    "message": "¡Podría ser distinto a su nombre de Minecraft!"
   },
   "friends.add-friend.username.placeholder": {
-    "message": "Escribe su apodo en Modrinth..."
+    "message": "Escribe el nombre de usuario de Modrinth..."
   },
   "friends.add-friend.username.title": {
-    "message": "¿Cuál es el apodo de tu amigo en Modrinth?"
+    "message": "¿Cuál es el nombre de usuario de Modrinth de tu amigo?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>¡Añade amigos</link> para ver qué están jugando!"
   },
   "friends.friend.cancel-request": {
-    "message": "Cancelar petición"
+    "message": "Cancelar solicitud"
   },
   "friends.friend.remove-friend": {
     "message": "Eliminar amigo"
   },
   "friends.friend.request-sent": {
-    "message": "Petición de amistad enviada"
+    "message": "Solicitud de amistad enviada"
   },
   "friends.friend.view-profile": {
     "message": "Ver perfil"
@@ -111,16 +114,19 @@
     "message": "Conectados"
   },
   "friends.heading.pending": {
-    "message": "Pendientes"
+    "message": "Pendiente"
   },
   "friends.no-friends-match": {
-    "message": "Ningún apodo concuerda con ''{query}''"
+    "message": "Ningún amigo coincide con \"{query}\""
   },
   "friends.search-friends-placeholder": {
-    "message": "Buscando amigos..."
+    "message": "Buscar amigos..."
   },
   "friends.section.heading": {
-    "message": "{title}: {count}"
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>¡Inicia sesión en una cuenta de Modrinth</link> para añadir amigos y ver qué están jugando!"
   },
   "instance.add-server.add-and-play": {
     "message": "Añadir y jugar"
@@ -174,7 +180,7 @@
     "message": "Servidor de Minecraft"
   },
   "instance.server-modal.resource-pack": {
-    "message": "Paquete de recursos"
+    "message": "Resource pack"
   },
   "instance.settings.tabs.general": {
     "message": "General"
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index 0610b983..1110e31d 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -86,6 +86,9 @@
   "friends.add-friend.username.title": {
     "message": "¿Cuál es el apodo de tu amigo en Modrinth?"
   },
+  "friends.add-friends-to-share": {
+    "message": "<link>Añade amigos</link> para ver a qué están jugando."
+  },
   "friends.friend.cancel-request": {
     "message": "Cancelar petición"
   },
@@ -122,6 +125,9 @@
   "friends.section.heading": {
     "message": "{title}: {count}"
   },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Inicia sesión en una cuenta Modrinth</link> para añadir amigos y ver a qué están jugando."
+  },
   "instance.add-server.add-and-play": {
     "message": "Añadir y jugar"
   },
@@ -198,7 +204,7 @@
     "message": "No puedes duplicar mientras se instala."
   },
   "instance.settings.tabs.general.duplicate-instance": {
-    "message": "Duplicar instancia."
+    "message": "Duplicar instancia"
   },
   "instance.settings.tabs.general.duplicate-instance.description": {
     "message": "Crea una copia de esta instancia, incluyendo mundos, configuraciones, mods, etc."
@@ -273,7 +279,7 @@
     "message": "Instancia"
   },
   "instance.settings.tabs.installation.change-version.already-installed.modded": {
-    "message": "{platform} {version} para Minecraft {game_version} ya esta instalada"
+    "message": "{platform} {version} para Minecraft {game_version} ya está instalada"
   },
   "instance.settings.tabs.installation.change-version.already-installed.vanilla": {
     "message": "La versión vanilla {game_version} ya está instalada"
diff --git a/apps/app-frontend/src/locales/fil-PH/index.json b/apps/app-frontend/src/locales/fil-PH/index.json
index d0fc9fd8..88292468 100644
--- a/apps/app-frontend/src/locales/fil-PH/index.json
+++ b/apps/app-frontend/src/locales/fil-PH/index.json
@@ -156,7 +156,7 @@
     "message": "Minecraft na Mundo"
   },
   "instance.edit-world.reset-icon": {
-    "message": "Walain ang ikono"
+    "message": "I-reset ang ikono"
   },
   "instance.edit-world.title": {
     "message": "Baguhin ang mundo"
@@ -320,12 +320,18 @@
   "instance.settings.tabs.installation.platform": {
     "message": "Plataporma"
   },
+  "instance.settings.tabs.installation.reinstall.button": {
+    "message": "I-reinstall ang modpack"
+  },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
     "message": "Ang pagrere-install ay maaaring mare-reset ang lahat ng na-install o binago na kontento sa kung anong ibibigay ng modpack, tatanggalin ang mga mods o kontentong idinagdag mo lalo na ang mga orihinal na modpack. Maaari nitong masiayos ang mga hindi inaasahang pag-uugali kung may pagbabagong naganap sa instansiya, ngunit kung dumedepende na ang iyong mundo sa karagdagang kontento, maaari nitong masira ang mga umiiral na mundo."
   },
   "instance.settings.tabs.installation.reinstall.description": {
     "message": "I-reset ang mga kontento ng instansiya sa orihinal niyang estado, tatanggalin ang mga mods o kontentong idinagdag mo lalo na ang mga orihinal na modpack."
   },
+  "instance.settings.tabs.installation.reinstall.title": {
+    "message": "I-reinstall ang modpack"
+  },
   "instance.settings.tabs.installation.repair.button": {
     "message": "Ayusin"
   },
@@ -338,6 +344,12 @@
   "instance.settings.tabs.installation.repair.confirm.title": {
     "message": "Ayusin ang instansiya?"
   },
+  "instance.settings.tabs.installation.repair.in-progress": {
+    "message": "Inaayos ngayon"
+  },
+  "instance.settings.tabs.installation.reset-selections": {
+    "message": "Sa kasalukuyan i-reset"
+  },
   "instance.settings.tabs.installation.show-all-versions": {
     "message": "Ipakita ang lahat ng bersiyon"
   },
@@ -365,30 +377,51 @@
   "instance.settings.tabs.installation.unknown-version": {
     "message": "(hindi kilalang bersiyon)"
   },
+  "instance.settings.tabs.installation.unlink.button": {
+    "message": "I-unlink sa instansiya"
+  },
   "instance.settings.tabs.installation.unlink.confirm.description": {
     "message": "Kapag ipagpatuloy mo, hindi mo na itong mai-link muli ng hindi gagawa ng bagong instansiya. Hindi ka makakatanggap ng mga update ng modpack at magiging normal na itong."
   },
   "instance.settings.tabs.installation.unlink.description": {
     "message": "Ang instansiyang ito ay naka-link sa isang modpack, ibig sabihin ang mga mod ay hindi mai-update at hindi mo mapapalitan ang mod loader o ang bersiyon ng Minecraft."
   },
+  "instance.settings.tabs.java": {
+    "message": "Java at memorya"
+  },
   "instance.settings.tabs.java.hooks": {
     "message": "Mga hook"
   },
+  "instance.settings.tabs.java.java-arguments": {
+    "message": "Mga java argument"
+  },
   "instance.settings.tabs.java.java-installation": {
     "message": "Instalasyon ng Java"
   },
+  "instance.settings.tabs.java.java-memory": {
+    "message": "Memoryang inilaan"
+  },
   "instance.settings.tabs.window": {
     "message": "Window"
   },
   "instance.settings.tabs.window.custom-window-settings": {
     "message": "Mga setting sa custom na window"
   },
+  "instance.settings.tabs.window.fullscreen": {
+    "message": "Fullscreen"
+  },
   "instance.settings.tabs.window.height": {
     "message": "Taas"
   },
+  "instance.settings.tabs.window.height.enter": {
+    "message": "Ilagay ang taas..."
+  },
   "instance.settings.tabs.window.width": {
     "message": "Lapad"
   },
+  "instance.settings.tabs.window.width.enter": {
+    "message": "Ilagay ang lapad..."
+  },
   "instance.settings.title": {
     "message": "Mga Setting"
   },
@@ -398,6 +431,18 @@
   "instance.worlds.copy_address": {
     "message": "Kopyahin ang adres"
   },
+  "instance.worlds.dont_show_on_home": {
+    "message": "Huwag ipakita sa Home"
+  },
+  "instance.worlds.filter.available": {
+    "message": "Magagamit"
+  },
+  "instance.worlds.hardcore": {
+    "message": "Modong eksperto"
+  },
+  "instance.worlds.play_instance": {
+    "message": "Laruin ang instansiya"
+  },
   "instance.worlds.type.server": {
     "message": "Server"
   },
@@ -406,5 +451,11 @@
   },
   "instance.worlds.view_instance": {
     "message": "Tingnan ang instansiya"
+  },
+  "instance.worlds.world_in_use": {
+    "message": "Ginagamit ang mundo"
+  },
+  "search.filter.locked.instance.sync": {
+    "message": "Maki-sync sa instansiya"
   }
 }
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index dd1a1803..2711a4f8 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -68,6 +68,9 @@
   "friends.action.add-friend": {
     "message": "フレンドを追加"
   },
+  "friends.action.view-friend-requests": {
+    "message": "{count}件の友達リクエスト"
+  },
   "friends.add-friend.submit": {
     "message": "フレンド申請を送信"
   },
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
index ab5a93c4..f957e52f 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -65,6 +65,69 @@
   "app.update.reload-to-update": {
     "message": "Herlaad om de update te installeren"
   },
+  "friends.action.add-friend": {
+    "message": "Voeg een vriend toe"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} vriend {count, plural,one {verzoek} other {verzoeken}}"
+  },
+  "friends.add-friend.submit": {
+    "message": "Stuur een vriendschapsverzoek"
+  },
+  "friends.add-friend.title": {
+    "message": "Een vriend toevoegen"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Het kan verschillen van hun Minecraft gebruikersnaam!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Voer Modrinth gebruikersnaam in..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Wat is de Modrinth gebruikersnaam van uw vriend?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Voeg vrienden</link> om te zien wat hun spelen!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Annuleer verzoek"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Verwijder vriend"
+  },
+  "friends.friend.request-sent": {
+    "message": "Vriendschapsverzoek gestuurd"
+  },
+  "friends.friend.view-profile": {
+    "message": "Bekijk profiel"
+  },
+  "friends.heading": {
+    "message": "Vrienden"
+  },
+  "friends.heading.active": {
+    "message": "Actief"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "In behandeling"
+  },
+  "friends.no-friends-match": {
+    "message": "Geen vrienden die overeenkomen met \"{query}\""
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Zoek vrienden..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Log in op een Modrinth account</link> om vrienden toe te voegen en te kijken wat zij spelen!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Toevoegen en spelen"
   },
diff --git a/apps/app-frontend/src/locales/pt-PT/index.json b/apps/app-frontend/src/locales/pt-PT/index.json
index 67421503..1973dce4 100644
--- a/apps/app-frontend/src/locales/pt-PT/index.json
+++ b/apps/app-frontend/src/locales/pt-PT/index.json
@@ -2,6 +2,9 @@
   "app.settings.developer-mode-enabled": {
     "message": "Modo de desenvolvedor ativado."
   },
+  "app.settings.downloading": {
+    "message": "A transferir v{version}"
+  },
   "app.settings.tabs.appearance": {
     "message": "Aparência"
   },
@@ -20,6 +23,111 @@
   "app.settings.tabs.resource-management": {
     "message": "Gestão de recursos"
   },
+  "app.update-toast.body": {
+    "message": "Modrinth App v{version} está pronta para ser instalada! Recarrega para atualizar agora, ou automaticamente quando fechares a Modrinth App."
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "Modrinth App v{version} acabou de ser transferida. Recarrega para atualizar agora, ou automaticamente quando fechares a Modrinth App."
+  },
+  "app.update-toast.body.metered": {
+    "message": "Modrinth App v{version} está disponível! Como estás numa rede com tráfego limitado, não a transferimos automaticamente."
+  },
+  "app.update-toast.changelog": {
+    "message": "Lista de alterações"
+  },
+  "app.update-toast.download": {
+    "message": "Transferir ({size})"
+  },
+  "app.update-toast.downloading": {
+    "message": "A transferir..."
+  },
+  "app.update-toast.reload": {
+    "message": "Recarregar"
+  },
+  "app.update-toast.title": {
+    "message": "Atualização disponível"
+  },
+  "app.update-toast.title.download-complete": {
+    "message": "Transferência concluída"
+  },
+  "app.update.complete-toast.text": {
+    "message": "Clica aqui para ver a lista de alterações."
+  },
+  "app.update.complete-toast.title": {
+    "message": "Versão {version} foi instalada com sucesso!"
+  },
+  "app.update.download-update": {
+    "message": "Transferir atualização"
+  },
+  "app.update.downloading-update": {
+    "message": "A transferir atualização ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "Recarrega para instalar a atualização"
+  },
+  "friends.action.add-friend": {
+    "message": "Adicionar um amigo"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} {count, plural,one {pedido} other {pedidos}} de amizade"
+  },
+  "friends.add-friend.submit": {
+    "message": "Enviar pedido de amizade"
+  },
+  "friends.add-friend.title": {
+    "message": "Adicionar um amigo"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Pode ser diferente do nome no Minecraft!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Insere o nome do utilizador no Modrinth..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Qual é o nome de utilizador do teu amigo no Modrinth?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Adiciona amigos</link> para ver o que estão a jogar!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Cancelar pedido"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Remover amigo"
+  },
+  "friends.friend.request-sent": {
+    "message": "Pedido de amizade enviado"
+  },
+  "friends.friend.view-profile": {
+    "message": "Ver perfil"
+  },
+  "friends.heading": {
+    "message": "Amigos"
+  },
+  "friends.heading.active": {
+    "message": "Ativo"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "Pendente"
+  },
+  "friends.no-friends-match": {
+    "message": "Nenhum amigo corresponde a \"{query}\""
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Procurar amigos..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Inicia a sessão com uma conta Modrinth</link> para adicionar amigos e ver o que estão a jogar!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Adicionar e jogar"
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index 28397084..77305f56 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -2,6 +2,9 @@
   "app.settings.developer-mode-enabled": {
     "message": "Utvecklarläge aktiverat."
   },
+  "app.settings.downloading": {
+    "message": "Ladda ner v{version}"
+  },
   "app.settings.tabs.appearance": {
     "message": "Utseende"
   },
@@ -20,6 +23,111 @@
   "app.settings.tabs.resource-management": {
     "message": "Resurshantering"
   },
+  "app.update-toast.body": {
+    "message": "Modrinth App v{version} är redo att laddas ner! Ladda om för att uppdatera nu, eller automatiskt när du stänger Modrinth App."
+  },
+  "app.update-toast.body.download-complete": {
+    "message": "Modrinth App v{version} har laddats ner. Ladda om för att uppdatera nu, eller automatiskt när du stänger Modrinth App."
+  },
+  "app.update-toast.body.metered": {
+    "message": "Modrinth App v{version} är nu tillgänglig! Eftersom du använder ett nätverk med datatrafikbegränsningar har vi inte laddat ner det automatiskt."
+  },
+  "app.update-toast.changelog": {
+    "message": "Ändringslogg"
+  },
+  "app.update-toast.download": {
+    "message": "Ladda ner ({size})"
+  },
+  "app.update-toast.downloading": {
+    "message": "Laddar ner..."
+  },
+  "app.update-toast.reload": {
+    "message": "Ladda om"
+  },
+  "app.update-toast.title": {
+    "message": "Uppdatering tillgänglig"
+  },
+  "app.update-toast.title.download-complete": {
+    "message": "Nedladdning slutförd"
+  },
+  "app.update.complete-toast.text": {
+    "message": "Tryck här för att visa ändringsloggen."
+  },
+  "app.update.complete-toast.title": {
+    "message": "Version {version} har installerats!"
+  },
+  "app.update.download-update": {
+    "message": "Ladda ner uppdatering"
+  },
+  "app.update.downloading-update": {
+    "message": "Laddar ner uppdatering ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "Ladda om för att installera uppdatering"
+  },
+  "friends.action.add-friend": {
+    "message": "Lägg till en vän"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} vän{count, plural, one {förfrågan} other {förfrågningar}}"
+  },
+  "friends.add-friend.submit": {
+    "message": "Skicka vänförfrågan"
+  },
+  "friends.add-friend.title": {
+    "message": "Lägga till en vän"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Det kan vara annorlunda från deras Minecraft-användarnamn!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Ange Modrinth-användarnamn..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Vad är din väns Modrinth-användarnamn?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Lägg till vänner</link> för att se vad de spelar!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Avbryt förfrågan"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Ta bort vän"
+  },
+  "friends.friend.request-sent": {
+    "message": "Vänförfrågan skickad"
+  },
+  "friends.friend.view-profile": {
+    "message": "Visa profil"
+  },
+  "friends.heading": {
+    "message": "Vänner"
+  },
+  "friends.heading.active": {
+    "message": "Aktiva"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "Väntar"
+  },
+  "friends.no-friends-match": {
+    "message": "Inga vänner matchar ''{query}''"
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Sök efter vänner..."
+  },
+  "friends.section.heading": {
+    "message": "{title}: {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Logga in på ett Modrinth-konto</link> för att lägga till vänner och se vad de spelar!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Lägg till och spela"
   },
diff --git a/apps/app-frontend/src/locales/tl-PH/index.json b/apps/app-frontend/src/locales/tl-PH/index.json
index 0ec27d8a..b339d89e 100644
--- a/apps/app-frontend/src/locales/tl-PH/index.json
+++ b/apps/app-frontend/src/locales/tl-PH/index.json
@@ -156,7 +156,7 @@
     "message": "Minecraft na Daigdig"
   },
   "instance.edit-world.reset-icon": {
-    "message": "Walain ang lambana"
+    "message": "Isauli ang lambana"
   },
   "instance.edit-world.title": {
     "message": "Baguhin ang daigdig"
@@ -320,12 +320,18 @@
   "instance.settings.tabs.installation.platform": {
     "message": "Batyawan"
   },
+  "instance.settings.tabs.installation.reinstall.button": {
+    "message": "Ikabit muli ang balot ng pambago"
+  },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
     "message": "Maaaring mababalik sa dati ang lahat ng kinabit o binago na nilalaman sa kung anong ibibigay ng balot ng pambago, tatanggalin ang mga pambago o nilalamang idinagdag mo lalo na ang nangunang balot ng pambago. Maaari nitong masiayos ang mga hindi inaasahang pag-uugali kung may pagbabagong naganap sa tularan, ngunit kung nakabatay na ang iyong daigdig sa karagdagang nilalaman, maaari nitong masira ang mga umiiral na daigdig."
   },
   "instance.settings.tabs.installation.reinstall.description": {
     "message": "Ibalik ang mga nilalaman ng tularan sa pangunahing kalagayan, tatanggalin ang mga pambago o nilalamang idinagdag mo lalo na ang nangunang balot ng pambago."
   },
+  "instance.settings.tabs.installation.reinstall.title": {
+    "message": "Ikabit muli ang balot ng pambago"
+  },
   "instance.settings.tabs.installation.repair.button": {
     "message": "Kumpunihin"
   },
@@ -338,6 +344,12 @@
   "instance.settings.tabs.installation.repair.confirm.title": {
     "message": "Kumpunihin ang tularan?"
   },
+  "instance.settings.tabs.installation.repair.in-progress": {
+    "message": "Kinukumpuni ngayon"
+  },
+  "instance.settings.tabs.installation.reset-selections": {
+    "message": "Sa kasalukuyan isauli"
+  },
   "instance.settings.tabs.installation.show-all-versions": {
     "message": "Ipakita ang lahat ng bersiyon"
   },
@@ -365,30 +377,51 @@
   "instance.settings.tabs.installation.unknown-version": {
     "message": "(hindi kilalang bersiyon)"
   },
+  "instance.settings.tabs.installation.unlink.button": {
+    "message": "Paghiwalayin sa tularan"
+  },
   "instance.settings.tabs.installation.unlink.confirm.description": {
     "message": "Kung ipapatuloy mo, hindi mo na itong maaaring maikawing muli ng hindi lilikha ng panibagong tularan. Hindi ka makatatanggap ng mga pagsasapanahon ng pambalot ng pambago at magiging pangkaraniwan na itong."
   },
   "instance.settings.tabs.installation.unlink.description": {
     "message": "Nakakawing ang tularang ito sa isang pambalot ng pambago, ibig sabihin hindi maisapanahon ang mga pambago at hindi mo mapapalitan ang tagapagdala ng pambago o ang bersiyon ng Minecraft."
   },
+  "instance.settings.tabs.java": {
+    "message": "Java at memorya"
+  },
   "instance.settings.tabs.java.hooks": {
     "message": "Mga kawit"
   },
+  "instance.settings.tabs.java.java-arguments": {
+    "message": "Mga sadyansukat ng java"
+  },
   "instance.settings.tabs.java.java-installation": {
     "message": "Kabit ng Java"
   },
+  "instance.settings.tabs.java.java-memory": {
+    "message": "Memoryang inilaan"
+  },
   "instance.settings.tabs.window": {
     "message": "Durungawan"
   },
   "instance.settings.tabs.window.custom-window-settings": {
     "message": "Mga kagustuhan sa pasadyang durungawan"
   },
+  "instance.settings.tabs.window.fullscreen": {
+    "message": "Buong-tabing"
+  },
   "instance.settings.tabs.window.height": {
     "message": "Tayog"
   },
+  "instance.settings.tabs.window.height.enter": {
+    "message": "Ilagay ang taas..."
+  },
   "instance.settings.tabs.window.width": {
     "message": "Lapad"
   },
+  "instance.settings.tabs.window.width.enter": {
+    "message": "Ilagay ang lapad..."
+  },
   "instance.settings.title": {
     "message": "Mga Kagustuhan"
   },
@@ -398,6 +431,18 @@
   "instance.worlds.copy_address": {
     "message": "Sipiin ang tinitirhan"
   },
+  "instance.worlds.dont_show_on_home": {
+    "message": "Huwag ipakita sa Tirahan"
+  },
+  "instance.worlds.filter.available": {
+    "message": "Magagamit"
+  },
+  "instance.worlds.hardcore": {
+    "message": "Paraang pangdalubhasan"
+  },
+  "instance.worlds.play_instance": {
+    "message": "Laruin ang tularan"
+  },
   "instance.worlds.type.server": {
     "message": "Tagapagsilbi"
   },
@@ -406,5 +451,11 @@
   },
   "instance.worlds.view_instance": {
     "message": "Tingnan ang tularan"
+  },
+  "instance.worlds.world_in_use": {
+    "message": "Ginagamit ang daigdig"
+  },
+  "search.filter.locked.instance.sync": {
+    "message": "Makipagsabayan sa tularan"
   }
 }
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index ec0881c7..287e5912 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -108,7 +108,7 @@
     "message": "Aktif"
   },
   "friends.heading.offline": {
-    "message": "Deaktif"
+    "message": "Çevrimdışı"
   },
   "friends.heading.online": {
     "message": "Çevrimiçi"
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index 06509668..163a1e73 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -74,6 +74,9 @@
   "friends.add-friend.submit": {
     "message": "发送好友请求"
   },
+  "friends.add-friend.title": {
+    "message": "添加好友"
+  },
   "friends.add-friend.username.description": {
     "message": "可能和他们的 Minecraft 用户名不一样！"
   },
diff --git a/apps/frontend/src/locales/cs-CZ/index.json b/apps/frontend/src/locales/cs-CZ/index.json
index 7a2727cb..058986ef 100644
--- a/apps/frontend/src/locales/cs-CZ/index.json
+++ b/apps/frontend/src/locales/cs-CZ/index.json
@@ -1052,18 +1052,6 @@
   "report.submit": {
     "message": "Odeslat hlášení"
   },
-  "revenue.transfers.total": {
-    "message": "Vybrali jste celkem {amount}."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Vybrali jste {amount} skrze {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "V roce {year} jste vybrali {amount}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "V roce {year} jste vybrali {amount} skrze {method}."
-  },
   "scopes.analytics.label": {
     "message": "Přečíst analytiku"
   },
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index 27f28dcc..980b180c 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -635,6 +635,339 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "Bist du ein US Bürger?"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Steuerformular abschliessen"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Mit Limit weitermachen"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Details"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Menge"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "FX rate"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Gebühr"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Nettobetrag"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Wirtschaftseinheit"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "Eine Wirtschaftseinheit bezieht sich auf eine registrierte Organisation wie ein Unternehmen, Partnerschaft oder GmbH."
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "Hebst du als Einzelperson oder Firma ab?"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Privatperson"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Land auswählen"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Länder suchen..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "Fehler beim laden verfügbarer Zahlungsmethoden. Versuch es später erneut."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Laden von Zahlungsmethoden fehlgeschlagen"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Region"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Einige Zahlungsmöglichkeiten sind in bestimmten Regionen nicht verfügbar."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Auszahlungsmethode auswählen"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "Dein Auszahlungslimit ist <b>{amount}</b>. <tax-link>Fülle das Steuerformular aus</tax-link> um mehr abzuheben."
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Kontoinhaber"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Coin"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Bestätige deine Wallet-Adresse"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "Personalausweisnummer"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "Personalausweisnummer eingeben"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "Passnummer"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "Passnummer eingeben"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
+    "message": "Personalausweisnummer"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "Personalausweisnummer eingeben"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "RUC-Nummer"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "RUC-Nummer eingeben"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "Steueridentifikationsnummer"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "Steueridentifikationsnummer eingeben"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Netzwerk"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "Du näherst dich dem Auszahlungslimit. Du kannst noch <b>{amountRemaining}</b> abheben, aber ein Steuerformular wird benötigt, um mehr abzuheben."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Konto"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Konto trennen"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Zahlungsmethode"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "PayPal-Konto"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Verbinde dein PayPal-Konto um Zahlungen direkt zu erhalten."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Speichern"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Venmo-Benutzername erfolgreich gespeichert!"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Gespeichert"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Mit PayPal anmelden"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "Gib deinen Venmo-Benutzernamen ein um Zahlungen zu erhalten."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Venmo-Benutzername"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@benutzername"
+  },
+  "dashboard.creator-withdraw-modal.stage.completion": {
+    "message": "Abgeschlossen"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Methode"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Kontodetails"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "Verifizierung"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "Steuerformular"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "Details"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "Um dein vollständiges Guthaben von <b>{available}</b> abzuheben musst du das unten stehende Formular ausfüllen. Dies wird für die Steuererklärung benötigt und muss nur einmal ausgefüllt werden."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body-with-limit": {
+    "message": "Du musst ein W-9- oder W-8-Formular für die Steuerunterlagen von Modrinth ausfüllen, damit wir die Steuervorschriften einhalten können."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.header": {
+    "message": "Steuerformular benötigt"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Zahlungsmethode"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward": {
+    "message": "Belohnung"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "Belohnung auswählen"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
+    "message": "Belohnungen"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "Unverifizierte E-Mail"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message": {
+    "message": "Die Zustellungs-E-Mail die du eingegeben hast ist nicht mit deinem Modrinth-Konto verbunden. Belohnungen, welche an eine falsche E-Mail-Adresse gesendet werden können von Modrinth nicht wiederhergestellt werden."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
+    "message": "Weniger Gebühren verfügbar"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message": {
+    "message": "Du has USD für PayPal International ausgewählt. <direct-paypal-link>Wechsle zu direktem PayPal</direct-paypal-link> für bessere Gebühren (≈2% statt ≈6%)."
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Auszahlen"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit": {
+    "message": "Auszahlungslimit"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit-used": {
+    "message": "Du hast dein Auszahlungslimit von <b>{withdrawLimit}</b> aufgebraucht. Du musst ein Steuerformular ausfüllen, um merh abzuheben."
+  },
+  "dashboard.revenue.available-now": {
+    "message": "Jetzt verfügbar"
+  },
+  "dashboard.revenue.balance": {
+    "message": "Guthaben"
+  },
+  "dashboard.revenue.estimated-tooltip.msg1": {
+    "message": "Geschätzte Einnahmen können sich bis zur verfügbarmachung ändern."
+  },
+  "dashboard.revenue.estimated-tooltip.msg2": {
+    "message": "Klicke um zu erfahren, wie Modrinth deine Einnahmen verwaltet (Englisch)."
+  },
+  "dashboard.revenue.estimated-with-date": {
+    "message": "Geschätzt {date}"
+  },
+  "dashboard.revenue.processing": {
+    "message": "Verarbeitet"
+  },
+  "dashboard.revenue.processing.tooltip": {
+    "message": "Einnahmen bleiben in bearbeitung bis zum ende des Monats, und werden 60 Tage danach verfügbar."
+  },
+  "dashboard.revenue.stats.received": {
+    "message": "Erhalten"
+  },
+  "dashboard.revenue.stats.transactions": {
+    "message": "Transaktionen"
+  },
+  "dashboard.revenue.stats.withdrawn": {
+    "message": "Ausgezahlt"
+  },
+  "dashboard.revenue.tos": {
+    "message": "Durch das hochladen von Projekten auf Modrinth, und das abheben von Geld von deinem Konto, stimmst du den <terms-link>Bedingungen des Rewards-Programm</terms-link> zu. Erfahre mehr über das <info-link>Reward-Programm</info-link>."
+  },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "Als CSV herunterladen"
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "Transaktionen"
+  },
+  "dashboard.revenue.transactions.none": {
+    "message": "Keine Transaktionen"
+  },
+  "dashboard.revenue.transactions.none.desc": {
+    "message": "Deine Auszahlungen und Abhebungen erscheinen hier."
+  },
+  "dashboard.revenue.transactions.see-all": {
+    "message": "Alle anzeigen"
+  },
+  "dashboard.revenue.withdraw.blocked-tin-mismatch": {
+    "message": "Deine Auszahlungen sind vorrübergehend gesperrt, da deine TIN oder SSN nicht mit den IRS-Aufzeichnungen übereinstimmt. Bitte kontaktiere den Support um dein Steuerformular zurückzusetzen und erneut einzureichen."
+  },
+  "dashboard.revenue.withdraw.card.description": {
+    "message": "Hebe von deinem Verfügbaren Guthaben über einen Zahlungsmethode ab."
+  },
+  "dashboard.revenue.withdraw.card.title": {
+    "message": "Abheben"
+  },
+  "dashboard.revenue.withdraw.header": {
+    "message": "Abheben"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "Konto"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Menge"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Schliessen"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Datum"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "Du wirst eine E-Mail auf <b>{email}</b> mit Instruktionen zur Einlösung deiner Auszahlung."
+  },
+  "dashboard.withdraw.completion.exchange-rate": {
+    "message": "Wechselkurs"
+  },
+  "dashboard.withdraw.completion.fee": {
+    "message": "Gebühr"
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "Methode"
+  },
+  "dashboard.withdraw.completion.net-amount": {
+    "message": "Nettobetrag"
+  },
+  "dashboard.withdraw.completion.recipient": {
+    "message": "Empfänger"
+  },
+  "dashboard.withdraw.completion.title": {
+    "message": "Abhebung abgeschlossen"
+  },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "Transaktionen"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "Wallet"
+  },
+  "dashboard.withdraw.error.generic.text": {
+    "message": "Wir konnten deine Auszahlungsanforderung nicht übermitteln. Bitte überprüfe deine Angaben oder kontaktiere den Support."
+  },
+  "dashboard.withdraw.error.generic.title": {
+    "message": "Abheben nicht möglich"
+  },
+  "dashboard.withdraw.error.invalid-address.text": {
+    "message": "Die angegebene Adresse konnte nicht bestätigt werden. Bitte überprüfe deine Adressdetails."
+  },
+  "dashboard.withdraw.error.invalid-address.title": {
+    "message": "Adressbestätigung fehlgeschlagen"
+  },
+  "dashboard.withdraw.error.invalid-bank.text": {
+    "message": "Die angegebenen Bankinformationen sind ungültig. Bitte überprüfe deine Informationen."
+  },
+  "dashboard.withdraw.error.invalid-bank.title": {
+    "message": "Ungültige Bankinformationen"
+  },
+  "dashboard.withdraw.error.invalid-wallet.text": {
+    "message": "Die Crypto-Wallet Adresse die du gegeben hast ist ungültig. Bitte überprüfe sie und versuch es erneut."
+  },
+  "dashboard.withdraw.error.invalid-wallet.title": {
+    "message": "Ungültige Wallet-Adresse"
+  },
+  "dashboard.withdraw.error.minimum-not-met.text": {
+    "message": "Die Auszahlungsmenge (Nach abzug von Gebühren) entspricht nicht dem Mindestbetrag. Bitte erhöhe deine Auszahlungsmenge."
+  },
+  "dashboard.withdraw.error.minimum-not-met.title": {
+    "message": "Menge zu gering"
+  },
+  "dashboard.withdraw.error.tax-form.text": {
+    "message": "Du musst ein Steuerformular ausfüllen, um deinen Antrag auf Auszahling einzureichen."
+  },
+  "dashboard.withdraw.error.tax-form.title": {
+    "message": "Bitte Steuerformular ausfüllen"
+  },
   "error.collection.404.list_item.1": {
     "message": "Du hast eventuell die Kollektions-URL falsch geschrieben."
   },
@@ -986,6 +1319,9 @@
   "layout.footer.about.status": {
     "message": "Status"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "Rechtliches"
   },
@@ -1064,6 +1400,15 @@
   "layout.meta.og-description": {
     "message": "Entdecke und veröffentliche Minecraft-Inhalte!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Menü schliessen"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Menü öffnen"
+  },
+  "layout.nav.active-reports": {
+    "message": "Aktive Meldungen"
+  },
   "layout.nav.analytics": {
     "message": "Analytik"
   },
@@ -1091,6 +1436,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Modrinth Startseite"
   },
+  "layout.nav.my-servers": {
+    "message": "Meine Server"
+  },
   "layout.nav.organizations": {
     "message": "Organisationen"
   },
@@ -1136,6 +1484,273 @@
   "moderation.technical.search.placeholder": {
     "message": "Technische Rezensionen durchsuchen..."
   },
+  "muralpay.account-type.checking": {
+    "message": "Girokonto"
+  },
+  "muralpay.account-type.savings": {
+    "message": "Sparkonto"
+  },
+  "muralpay.country.at": {
+    "message": "Österreich"
+  },
+  "muralpay.country.be": {
+    "message": "Belgien"
+  },
+  "muralpay.country.cy": {
+    "message": "Zypern"
+  },
+  "muralpay.country.de": {
+    "message": "Deutschland"
+  },
+  "muralpay.country.ee": {
+    "message": "Estland"
+  },
+  "muralpay.country.es": {
+    "message": "Spanien"
+  },
+  "muralpay.country.fi": {
+    "message": "Finnland"
+  },
+  "muralpay.country.fr": {
+    "message": "Frankreich"
+  },
+  "muralpay.country.gr": {
+    "message": "Griechenland"
+  },
+  "muralpay.country.ie": {
+    "message": "Irland"
+  },
+  "muralpay.country.it": {
+    "message": "Italien"
+  },
+  "muralpay.country.lt": {
+    "message": "Litauen"
+  },
+  "muralpay.country.lu": {
+    "message": "Luxenburg"
+  },
+  "muralpay.country.lv": {
+    "message": "Lettland"
+  },
+  "muralpay.country.mt": {
+    "message": "Malta"
+  },
+  "muralpay.country.nl": {
+    "message": "Niederlande"
+  },
+  "muralpay.country.pt": {
+    "message": "Portugal"
+  },
+  "muralpay.country.sk": {
+    "message": "Slowakei"
+  },
+  "muralpay.document-type.national-id": {
+    "message": "Personalausweis"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Reisepass"
+  },
+  "muralpay.document-type.resident-id": {
+    "message": "Aufenthaltsgenehmigung"
+  },
+  "muralpay.document-type.ruc": {
+    "message": "RUC"
+  },
+  "muralpay.document-type.tax-id": {
+    "message": "Steuer-ID"
+  },
+  "muralpay.field.account-number": {
+    "message": "Kontonummer"
+  },
+  "muralpay.field.account-number-cbu-cvu": {
+    "message": "Kontonummer (CBU/CVU)"
+  },
+  "muralpay.field.account-number-cci": {
+    "message": "Kontonummer (CCI)"
+  },
+  "muralpay.field.account-number-type": {
+    "message": "Kontonummertyp"
+  },
+  "muralpay.field.account-type": {
+    "message": "Kontotyp"
+  },
+  "muralpay.field.bank-account-number": {
+    "message": "Kontonummer"
+  },
+  "muralpay.field.branch-code": {
+    "message": "Filialcode"
+  },
+  "muralpay.field.clabe": {
+    "message": "CLABE"
+  },
+  "muralpay.field.country": {
+    "message": "Land"
+  },
+  "muralpay.field.cpf-cnpj": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.field.cuit-cuil": {
+    "message": "CUIT/CUIL"
+  },
+  "muralpay.field.document-type": {
+    "message": "Dokumententyp"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.field.phone-number": {
+    "message": "Telefonnummer"
+  },
+  "muralpay.field.pix-email": {
+    "message": "PIX-E-Mail"
+  },
+  "muralpay.field.pix-key-type": {
+    "message": "PIX-Schlüsseltyp"
+  },
+  "muralpay.field.pix-phone": {
+    "message": "PIX-Telefon"
+  },
+  "muralpay.field.routing-number": {
+    "message": "Bankleitzahl"
+  },
+  "muralpay.field.swift-bic": {
+    "message": "SWIFT/BIC"
+  },
+  "muralpay.field.wallet-address": {
+    "message": "Wallet-Adresse"
+  },
+  "muralpay.help.cbu-cvu": {
+    "message": "Clave Bancaria Uniforme oder Clave Virtual Uniforme"
+  },
+  "muralpay.help.cci": {
+    "message": "Código de Cuenta Interbancaria"
+  },
+  "muralpay.help.clabe": {
+    "message": "Clave Bancaria Estandarizada (Mexikanische Bankkontonummer)"
+  },
+  "muralpay.help.cpf-cnpj": {
+    "message": "Brasilianische Steueridentifikationsnummer"
+  },
+  "muralpay.help.cuit-cuil": {
+    "message": "Argentinische Steuer-ID"
+  },
+  "muralpay.help.iban": {
+    "message": "Internationale Bankkontonummer"
+  },
+  "muralpay.help.swift-bic": {
+    "message": "Bankleitzahl"
+  },
+  "muralpay.pix-type.bank-account": {
+    "message": "Bankkonto"
+  },
+  "muralpay.pix-type.document": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.pix-type.email": {
+    "message": "E-Mail"
+  },
+  "muralpay.pix-type.phone": {
+    "message": "Telefonnummer"
+  },
+  "muralpay.placeholder.account-number": {
+    "message": "Kontonummer eingeben"
+  },
+  "muralpay.placeholder.cbu-cvu": {
+    "message": "CBU oder CVU eingeben"
+  },
+  "muralpay.placeholder.cbu-cvu-type": {
+    "message": "CBU oder CVU"
+  },
+  "muralpay.placeholder.cci": {
+    "message": "20-stelligen CCI eingeben"
+  },
+  "muralpay.placeholder.cuit-cuil": {
+    "message": "CUIT oder CUIL eingeben"
+  },
+  "muralpay.placeholder.enter-account-number": {
+    "message": "Kontonummer eingeben"
+  },
+  "muralpay.placeholder.enter-branch-code": {
+    "message": "Filialcode eingeben"
+  },
+  "muralpay.placeholder.enter-clabe": {
+    "message": "18-stelligen CLABE eingeben"
+  },
+  "muralpay.placeholder.enter-cpf-cnpj": {
+    "message": "CPF oder CNPJ eingeben"
+  },
+  "muralpay.placeholder.enter-iban": {
+    "message": "IBAN eingeben"
+  },
+  "muralpay.placeholder.enter-pix-email": {
+    "message": "PIX-E-Mail eingeben"
+  },
+  "muralpay.placeholder.enter-routing-number": {
+    "message": "9-stellige Bankleitzahl eingeben"
+  },
+  "muralpay.placeholder.enter-swift-bic": {
+    "message": "SWIFT/BIC-Code eingeben"
+  },
+  "muralpay.placeholder.iban-crc": {
+    "message": "Costarikanische IBAN eingeben"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
+  "muralpay.rail.fiat-ars.name": {
+    "message": "Banküberweisung (ARS)"
+  },
+  "muralpay.rail.fiat-brl.name": {
+    "message": "PIX-Überweisung (BRL)"
+  },
+  "muralpay.rail.fiat-clp.name": {
+    "message": "Banküberweisung (CLP)"
+  },
+  "muralpay.rail.fiat-cop.name": {
+    "message": "Banküberweisung (COP)"
+  },
+  "muralpay.rail.fiat-crc.name": {
+    "message": "Banküberweisung (CRC)"
+  },
+  "muralpay.rail.fiat-eur.name": {
+    "message": "Banküberweisung (EUR)"
+  },
+  "muralpay.rail.fiat-mxn.name": {
+    "message": "Banküberweisung (MXN)"
+  },
+  "muralpay.rail.fiat-pen.name": {
+    "message": "Banküberweisung (PEN)"
+  },
+  "muralpay.rail.fiat-usd-peru.name": {
+    "message": "Banküberweisung (USD - Peru)"
+  },
+  "muralpay.rail.fiat-usd.name": {
+    "message": "Banküberweisung (USD)"
+  },
+  "muralpay.rail.fiat-zar.name": {
+    "message": "Banküberweisung (ZAR)"
+  },
+  "muralpay.rail.usdc-base.name": {
+    "message": "USDC (Base)"
+  },
+  "muralpay.rail.usdc-celo.name": {
+    "message": "USDC (Celo)"
+  },
+  "muralpay.rail.usdc-ethereum.name": {
+    "message": "USDC (Ethereum)"
+  },
+  "muralpay.rail.usdc-polygon.name": {
+    "message": "Crypto (USDC)"
+  },
+  "muralpay.warning.wallet-address": {
+    "message": "Überprüfe deine Wallet-Adresse. An eine falsche Adresse gesendete Gelder können nicht wiederhergestellt werden."
+  },
   "profile.bio.fallback.creator": {
     "message": "Ein Modrinth Ersteller."
   },
@@ -1197,7 +1812,7 @@
     "message": "Details"
   },
   "profile.label.downloads": {
-    "message": "{count} Download{count, plural, one {} other {s}}"
+    "message": "{count} {count, plural, one {Projekt} other {Projekte}}"
   },
   "profile.label.joined": {
     "message": "Beigetreten"
@@ -1284,7 +1899,7 @@
     "message": "Erneut zur Überprüfung einreichen"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Dein Projekt wurde {status} von Modrinth-Mitarbeitern. In den meisten Fällen kannst du das Projekt erneut zur Überprüfung einreichen, nachdem du die Punkte in der Mitarbeiter-Nachricht adressiert hast."
+    "message": "Dein Projekt wurde vom Modrinth-Team {status, select, rejected {abgelehnt} withheld {zurückgehalten} other {{status}}}."
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Du musst die benötigten Schritte in der Veröffentlichungsliste abschliessen!"
@@ -1691,18 +2306,6 @@
   "report.submit": {
     "message": "Meldung einreichen"
   },
-  "revenue.transfers.total": {
-    "message": "Du hast insgesammt {amount} abgehoben."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Du hast {amount} über {method} abgehoben."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Du hast {amount} im Jahr {year} abgehoben."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Du hast {amount} im Jahr {year} über {method} abgehoben."
-  },
   "scopes.analytics.description": {
     "message": "Zugriff auf Analysedaten"
   },
@@ -1967,12 +2570,6 @@
   "servers.backups.item.creating-backup": {
     "message": "Erstelle Backup..."
   },
-  "servers.backups.item.downloading": {
-    "message": "Wird Heruntergeladen"
-  },
-  "servers.backups.item.downloading-backup": {
-    "message": "Lade Backup herunter..."
-  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Erstellung eines Backup fehlgeschlagen"
   },
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index d06f94cf..0abd51aa 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -33,7 +33,7 @@
     "message": "Mac"
   },
   "app-marketing.download.options-title": {
-    "message": "Download Optionen"
+    "message": "Download-Optionen"
   },
   "app-marketing.download.terms": {
     "message": "Mit dem Herunterladen der Modrinth App stimmst du unseren <terms-link>Nutzungsbedingungen</terms-link> und der <privacy-link>Datenschutzrichtlinie</privacy-link> zu."
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "Nicht gelistet"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Affiliate-Link erstellen"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Fehler beim Laden von Affiliate-Links"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Deine Affiliate-Links"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Dadurch wird der Affiliate-Code `{id}` dauerhaft widerrufen, und alle bestehenden Links, die mit diesem Code geteilt wurden, sind dann nicht mehr gültig."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Widerrufen"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "Möchtest Du Deinen Affiliate-Link ''{title}'' wirklich widerrufen?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Affiliate-Links suchen..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "Erstellen"
   },
@@ -585,7 +606,7 @@
     "message": "Dein {formType} Steuerformular wurde erfolgreich eingereicht!"
   },
   "dashboard.creator-tax-form-modal.confirmation.support-text": {
-    "message": "Sie können sich jetzt jederzeit abmelden. Wenn Sie Fragen haben oder Ihre Daten aktualisieren möchten, wenden Sie sich an den <support-link>Support</support-link>."
+    "message": "Du kannst dich jetzt jederzeit abmelden. Falls du Fragen hast oder deine Daten aktualisieren möchtest, wende dich an den <support-link>Support</support-link>."
   },
   "dashboard.creator-tax-form-modal.confirmation.title": {
     "message": "Sie sind startklar! 🎉"
@@ -614,6 +635,339 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "Bist du ein US-Staatsbürger?"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Steuerformular ausfüllen"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Mit Limit fortfahren"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Details"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Menge"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "Wechselkurs"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Gebühr"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Nettobetrag"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Geschäftseinheit"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "Eine Geschäftseinheit bezieht sich auf eine eingetragene Organisation wie ein Unternehmen, eine Personengesellschaft oder eine LLC."
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "Zahlst du als Privatperson oder Unternehmen aus?"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Privatperson"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Wähle dein Land aus"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Länder suchen..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "Verfügbare Bezahlmethoden konnten nicht abgerufen werden. Versuche es bitte später noch einmal."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Bezahlmethoden konnten nicht geladen werden"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Region"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Einige Auszahlungsmethoden sind in bestimmten Regionen nicht verfügbar."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Auszahlungsmethode auswählen"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "Dein Auszahlungslimit beträgt <b>{amount}</b>. <tax-link>Fülle ein Steuerformular aus</tax-link>, um mehr auszahlen zu können."
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Kontoinhaber"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Coin"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Bestätige deine Wallet-Adresse"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "Personalausweisnummer"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "Personalausweisnummer eingeben"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "Passnummer"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "Passnummer eingeben"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
+    "message": "Personalausweisnummer"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "Personalausweisnummer eingeben"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "RUC-Nummer"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "RUC-Nummer eingeben"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "Steueridentifikationsnummer"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "Steueridentifikationsnummer eingeben"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Netzwerk"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "Sie nähern sich der Auszahlungsgrenze. Sie können jetzt <b>{amountRemaining}</b> auszahlen lassen, für einen höheren Betrag ist jedoch ein Steuerformular erforderlich."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Konto"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Konto trennen"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Zahlungsart"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "PayPal-Konto"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Verbinde dein PayPal-Konto, um Zahlungen direkt zu erhalten."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Speichern"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Venmo-Benutzername erfolgreich gespeichert!"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Gespeichert"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Mit PayPal anmelden"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "Gib deinen Venmo-Benutzernamen ein, um Zahlungen zu empfangen."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Venmo-Benutzername"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@benutzername"
+  },
+  "dashboard.creator-withdraw-modal.stage.completion": {
+    "message": "Vollständig"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Methode"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Kontodetails"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "Überprüfung"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "Steuerformular"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "Details"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "Um dein vollständiges Guthaben von <b>{available}</b> abzuheben musst du das unten stehende Formular ausfüllen. Dies wird für die Steuererklärung benötigt und muss nur einmal ausgefüllt werden."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body-with-limit": {
+    "message": "Du musst ein W-9- oder W-8-Formular für die Steuerunterlagen von Modrinth ausfüllen, damit wir die Steuervorschriften einhalten können."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.header": {
+    "message": "Steuerformular erforderlich"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Zahlungsmethode"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward": {
+    "message": "Belohnung"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "Belohnung auswählen"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
+    "message": "Belohnungen"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "Unbestätigte E-Mail"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message": {
+    "message": "Die angegebene E-Mail-Adresse für die Lieferung ist nicht mit deinem Modrinth-Konto verknüpft. Modrinth kann keine Belohnungen wiederherstellen, die an eine falsche E-Mail-Adresse gesendet wurden."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
+    "message": "Niedrigere Gebühren verfügbar"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message": {
+    "message": "Du has USD für PayPal International ausgewählt. <direct-paypal-link>Wechsle zu direktem PayPal</direct-paypal-link> für bessere Gebühren (≈2% statt ≈6%)."
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Auszahlen"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit": {
+    "message": "Auszahlungslimit"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit-used": {
+    "message": "Du hast dein Auszahlungslimit von <b>{withdrawLimit}</b> aufgebraucht. Du musst ein Steuerformular ausfüllen, um merh abzuheben."
+  },
+  "dashboard.revenue.available-now": {
+    "message": "Jetzt verfügbar"
+  },
+  "dashboard.revenue.balance": {
+    "message": "Guthaben"
+  },
+  "dashboard.revenue.estimated-tooltip.msg1": {
+    "message": "Geschätzte Einnahmen können sich bis sie verfügbar sind ändern."
+  },
+  "dashboard.revenue.estimated-tooltip.msg2": {
+    "message": "Klicke um zu erfahren, wie Modrinth deine Einnahmen verwaltet."
+  },
+  "dashboard.revenue.estimated-with-date": {
+    "message": "Geschätzt {date}"
+  },
+  "dashboard.revenue.processing": {
+    "message": "Verarbeitet"
+  },
+  "dashboard.revenue.processing.tooltip": {
+    "message": "Einnahmen bleiben in bearbeitung bis zum ende des Monats, und werden 60 Tage danach verfügbar."
+  },
+  "dashboard.revenue.stats.received": {
+    "message": "Erhalten"
+  },
+  "dashboard.revenue.stats.transactions": {
+    "message": "Transaktionen"
+  },
+  "dashboard.revenue.stats.withdrawn": {
+    "message": "Ausgezahlt"
+  },
+  "dashboard.revenue.tos": {
+    "message": "Durch das hochladen von Projekten auf Modrinth, und das abheben von Geld von deinem Konto, stimmst du den <terms-link>Bedingungen des Rewards-Programm</terms-link> zu. Erfahre mehr über das <info-link>Reward-Programm</info-link>."
+  },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "Als CSV herunterladen"
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "Transaktionen"
+  },
+  "dashboard.revenue.transactions.none": {
+    "message": "Keine Transaktionen"
+  },
+  "dashboard.revenue.transactions.none.desc": {
+    "message": "Deine Auszahlungen und Abhebungen erscheinen hier."
+  },
+  "dashboard.revenue.transactions.see-all": {
+    "message": "Alle anzeigen"
+  },
+  "dashboard.revenue.withdraw.blocked-tin-mismatch": {
+    "message": "Deine Auszahlungen sind vorrübergehend gesperrt, da deine TIN oder SSN nicht mit den IRS-Aufzeichnungen übereinstimmt. Bitte kontaktiere den Support um dein Steuerformular zurückzusetzen und erneut einzureichen."
+  },
+  "dashboard.revenue.withdraw.card.description": {
+    "message": "Hebe von deinem Verfügbaren Guthaben über einen Zahlungsmethode ab."
+  },
+  "dashboard.revenue.withdraw.card.title": {
+    "message": "Abheben"
+  },
+  "dashboard.revenue.withdraw.header": {
+    "message": "Abheben"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "Konto"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Menge"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Schließen"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Datum"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "Du erhältst eine E-Mail an <b>{email}</b> mit Anweisungen zur Einlösung deiner Auszahlung."
+  },
+  "dashboard.withdraw.completion.exchange-rate": {
+    "message": "Wechselkurs"
+  },
+  "dashboard.withdraw.completion.fee": {
+    "message": "Gebühr"
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "Methode"
+  },
+  "dashboard.withdraw.completion.net-amount": {
+    "message": "Nettobetrag"
+  },
+  "dashboard.withdraw.completion.recipient": {
+    "message": "Empfänger"
+  },
+  "dashboard.withdraw.completion.title": {
+    "message": "Abhebung abgeschlossen"
+  },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "Transaktionen"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "Wallet"
+  },
+  "dashboard.withdraw.error.generic.text": {
+    "message": "Wir konnten deine Auszahlungsanforderung nicht übermitteln. Bitte überprüfe deine Angaben oder kontaktiere den Support."
+  },
+  "dashboard.withdraw.error.generic.title": {
+    "message": "Abheben nicht möglich"
+  },
+  "dashboard.withdraw.error.invalid-address.text": {
+    "message": "Die angegebene Adresse konnte nicht bestätigt werden. Bitte überprüfe deine Adressdetails."
+  },
+  "dashboard.withdraw.error.invalid-address.title": {
+    "message": "Adressbestätigung fehlgeschlagen"
+  },
+  "dashboard.withdraw.error.invalid-bank.text": {
+    "message": "Die angegebenen Bankinformationen sind ungültig. Bitte überprüfe deine Informationen."
+  },
+  "dashboard.withdraw.error.invalid-bank.title": {
+    "message": "Ungültige Bankinformationen"
+  },
+  "dashboard.withdraw.error.invalid-wallet.text": {
+    "message": "Die Crypto-Wallet Adresse die du angegeben hast ist ungültig. Bitte überprüfe sie und versuch es erneut."
+  },
+  "dashboard.withdraw.error.invalid-wallet.title": {
+    "message": "Ungültige Wallet-Adresse"
+  },
+  "dashboard.withdraw.error.minimum-not-met.text": {
+    "message": "Die Auszahlungsmenge (Nach abzug von Gebühren) entspricht nicht dem Mindestbetrag. Bitte erhöhe deine Auszahlungsmenge."
+  },
+  "dashboard.withdraw.error.minimum-not-met.title": {
+    "message": "Menge zu gering"
+  },
+  "dashboard.withdraw.error.tax-form.text": {
+    "message": "Du musst ein Steuerformular ausfüllen, um deinen Antrag auf Auszahlung einzureichen."
+  },
+  "dashboard.withdraw.error.tax-form.title": {
+    "message": "Bitte Steuerformular ausfüllen"
+  },
   "error.collection.404.list_item.1": {
     "message": "Du hast vielleicht die URL der Kollektion falsch geschrieben."
   },
@@ -869,6 +1223,9 @@
   "layout.action.lookup-by-email": {
     "message": "Mit E-Mail nachschauen"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Partnerlinks verwalten"
+  },
   "layout.action.manage-server-notices": {
     "message": "Servermitteilungen verwalten"
   },
@@ -932,11 +1289,17 @@
   "layout.banner.tin-mismatch.action": {
     "message": "Support Kontaktieren"
   },
+  "layout.banner.tin-mismatch.description": {
+    "message": "Deine Abbuchungen sind vorübergehend blockiert, da deine TIN oder SSN nicht mit IRS-Aufzeichnungen übereinstimmt. Bitte kontaktiere den Support, um dein Steuerformular zurückzusetzen und erneut zu übermitteln."
+  },
+  "layout.banner.tin-mismatch.title": {
+    "message": "Steuerformular fehlgeschlagen"
+  },
   "layout.banner.verify-email.action": {
     "message": "Bestätigungs-E-Mail erneut senden"
   },
   "layout.banner.verify-email.description": {
-    "message": "Aus Sicherheits gründen verlangt Modrinth von dir, dass du die E-Mail-Adresse, die mit deinem Account assoziiert ist, verifizierst."
+    "message": "Aus Sicherheitsgründen verlangt Modrinth von dir, dass du die E-Mail-Adresse, die mit deinem Account assoziiert ist, verifizierst."
   },
   "layout.footer.about": {
     "message": "Über"
@@ -956,6 +1319,9 @@
   "layout.footer.about.status": {
     "message": "Status"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "Rechtliches"
   },
@@ -1034,6 +1400,15 @@
   "layout.meta.og-description": {
     "message": "Entdecke und veröffentliche Minecraft-Inhalte!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Menü schliessen"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Menü öffnen"
+  },
+  "layout.nav.active-reports": {
+    "message": "Aktive Meldungen"
+  },
   "layout.nav.analytics": {
     "message": "Analytik"
   },
@@ -1061,6 +1436,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Modrinth Startseite"
   },
+  "layout.nav.my-servers": {
+    "message": "Meine Server"
+  },
   "layout.nav.organizations": {
     "message": "Organisationen"
   },
@@ -1106,6 +1484,273 @@
   "moderation.technical.search.placeholder": {
     "message": "Durchsuche Technische Rezensionen..."
   },
+  "muralpay.account-type.checking": {
+    "message": "Girokonto"
+  },
+  "muralpay.account-type.savings": {
+    "message": "Sparkonto"
+  },
+  "muralpay.country.at": {
+    "message": "Österreich"
+  },
+  "muralpay.country.be": {
+    "message": "Belgien"
+  },
+  "muralpay.country.cy": {
+    "message": "Zypern"
+  },
+  "muralpay.country.de": {
+    "message": "Deutschland"
+  },
+  "muralpay.country.ee": {
+    "message": "Estland"
+  },
+  "muralpay.country.es": {
+    "message": "Spanien"
+  },
+  "muralpay.country.fi": {
+    "message": "Finnland"
+  },
+  "muralpay.country.fr": {
+    "message": "Frankreich"
+  },
+  "muralpay.country.gr": {
+    "message": "Griechenland"
+  },
+  "muralpay.country.ie": {
+    "message": "Irland"
+  },
+  "muralpay.country.it": {
+    "message": "Italien"
+  },
+  "muralpay.country.lt": {
+    "message": "Litauen"
+  },
+  "muralpay.country.lu": {
+    "message": "Luxenburg"
+  },
+  "muralpay.country.lv": {
+    "message": "Lettland"
+  },
+  "muralpay.country.mt": {
+    "message": "Malta"
+  },
+  "muralpay.country.nl": {
+    "message": "Niederlande"
+  },
+  "muralpay.country.pt": {
+    "message": "Portugal"
+  },
+  "muralpay.country.sk": {
+    "message": "Slowakei"
+  },
+  "muralpay.document-type.national-id": {
+    "message": "Personalausweis"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Reisepass"
+  },
+  "muralpay.document-type.resident-id": {
+    "message": "Aufenthaltsgenehmigung"
+  },
+  "muralpay.document-type.ruc": {
+    "message": "RUC"
+  },
+  "muralpay.document-type.tax-id": {
+    "message": "Steuer-ID"
+  },
+  "muralpay.field.account-number": {
+    "message": "Kontonummer"
+  },
+  "muralpay.field.account-number-cbu-cvu": {
+    "message": "Kontonummer (CBU/CVU)"
+  },
+  "muralpay.field.account-number-cci": {
+    "message": "Kontonummer (CCI)"
+  },
+  "muralpay.field.account-number-type": {
+    "message": "Kontonummertyp"
+  },
+  "muralpay.field.account-type": {
+    "message": "Kontotyp"
+  },
+  "muralpay.field.bank-account-number": {
+    "message": "Kontonummer"
+  },
+  "muralpay.field.branch-code": {
+    "message": "Filialcode"
+  },
+  "muralpay.field.clabe": {
+    "message": "CLABE"
+  },
+  "muralpay.field.country": {
+    "message": "Land"
+  },
+  "muralpay.field.cpf-cnpj": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.field.cuit-cuil": {
+    "message": "CUIT/CUIL"
+  },
+  "muralpay.field.document-type": {
+    "message": "Dokumententyp"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.field.phone-number": {
+    "message": "Telefonnummer"
+  },
+  "muralpay.field.pix-email": {
+    "message": "PIX-E-Mail"
+  },
+  "muralpay.field.pix-key-type": {
+    "message": "PIX-Schlüsseltyp"
+  },
+  "muralpay.field.pix-phone": {
+    "message": "PIX-Telefon"
+  },
+  "muralpay.field.routing-number": {
+    "message": "Bankleitzahl"
+  },
+  "muralpay.field.swift-bic": {
+    "message": "SWIFT/BIC"
+  },
+  "muralpay.field.wallet-address": {
+    "message": "Wallet-Adresse"
+  },
+  "muralpay.help.cbu-cvu": {
+    "message": "Clave Bancaria Uniforme oder Clave Virtual Uniforme"
+  },
+  "muralpay.help.cci": {
+    "message": "Código de Cuenta Interbancaria"
+  },
+  "muralpay.help.clabe": {
+    "message": "Clave Bancaria Estandarizada (Mexikanische Bankkontonummer)"
+  },
+  "muralpay.help.cpf-cnpj": {
+    "message": "Brasilianische Steueridentifikationsnummer"
+  },
+  "muralpay.help.cuit-cuil": {
+    "message": "Argentinische Steuer-ID"
+  },
+  "muralpay.help.iban": {
+    "message": "Internationale Bankkontonummer"
+  },
+  "muralpay.help.swift-bic": {
+    "message": "Bankleitzahl"
+  },
+  "muralpay.pix-type.bank-account": {
+    "message": "Bankkonto"
+  },
+  "muralpay.pix-type.document": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.pix-type.email": {
+    "message": "E-Mail"
+  },
+  "muralpay.pix-type.phone": {
+    "message": "Telefonnummer"
+  },
+  "muralpay.placeholder.account-number": {
+    "message": "Kontonummer eingeben"
+  },
+  "muralpay.placeholder.cbu-cvu": {
+    "message": "CBU oder CVU eingeben"
+  },
+  "muralpay.placeholder.cbu-cvu-type": {
+    "message": "CBU oder CVU"
+  },
+  "muralpay.placeholder.cci": {
+    "message": "20-stelligen CCI eingeben"
+  },
+  "muralpay.placeholder.cuit-cuil": {
+    "message": "CUIT oder CUIL eingeben"
+  },
+  "muralpay.placeholder.enter-account-number": {
+    "message": "Kontonummer eingeben"
+  },
+  "muralpay.placeholder.enter-branch-code": {
+    "message": "Filialcode eingeben"
+  },
+  "muralpay.placeholder.enter-clabe": {
+    "message": "18-stelligen CLABE eingeben"
+  },
+  "muralpay.placeholder.enter-cpf-cnpj": {
+    "message": "CPF oder CNPJ eingeben"
+  },
+  "muralpay.placeholder.enter-iban": {
+    "message": "IBAN eingeben"
+  },
+  "muralpay.placeholder.enter-pix-email": {
+    "message": "PIX-E-Mail eingeben"
+  },
+  "muralpay.placeholder.enter-routing-number": {
+    "message": "9-stellige Bankleitzahl eingeben"
+  },
+  "muralpay.placeholder.enter-swift-bic": {
+    "message": "SWIFT/BIC-Code eingeben"
+  },
+  "muralpay.placeholder.iban-crc": {
+    "message": "Costarikanische IBAN eingeben"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
+  "muralpay.rail.fiat-ars.name": {
+    "message": "Banküberweisung (ARS)"
+  },
+  "muralpay.rail.fiat-brl.name": {
+    "message": "PIX-Überweisung (BRL)"
+  },
+  "muralpay.rail.fiat-clp.name": {
+    "message": "Banküberweisung (CLP)"
+  },
+  "muralpay.rail.fiat-cop.name": {
+    "message": "Banküberweisung (COP)"
+  },
+  "muralpay.rail.fiat-crc.name": {
+    "message": "Banküberweisung (CRC)"
+  },
+  "muralpay.rail.fiat-eur.name": {
+    "message": "Banküberweisung (EUR)"
+  },
+  "muralpay.rail.fiat-mxn.name": {
+    "message": "Banküberweisung (MXN)"
+  },
+  "muralpay.rail.fiat-pen.name": {
+    "message": "Banküberweisung (PEN)"
+  },
+  "muralpay.rail.fiat-usd-peru.name": {
+    "message": "Banküberweisung (USD - Peru)"
+  },
+  "muralpay.rail.fiat-usd.name": {
+    "message": "Banküberweisung (USD)"
+  },
+  "muralpay.rail.fiat-zar.name": {
+    "message": "Banküberweisung (ZAR)"
+  },
+  "muralpay.rail.usdc-base.name": {
+    "message": "USDC (Base)"
+  },
+  "muralpay.rail.usdc-celo.name": {
+    "message": "USDC (Celo)"
+  },
+  "muralpay.rail.usdc-ethereum.name": {
+    "message": "USDC (Ethereum)"
+  },
+  "muralpay.rail.usdc-polygon.name": {
+    "message": "Crypto (USDC)"
+  },
+  "muralpay.warning.wallet-address": {
+    "message": "Überprüfe deine Wallet-Adresse. An eine falsche Adresse gesendete Gelder können nicht wiederhergestellt werden."
+  },
   "profile.bio.fallback.creator": {
     "message": "Ein Modrinth Ersteller."
   },
@@ -1124,6 +1769,27 @@
   "profile.button.manage-projects": {
     "message": "Projekte verwalten"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Als Partner entfernen"
+  },
+  "profile.button.set-affiliate": {
+    "message": "Als Partner setzen"
+  },
+  "profile.details.label.auth-providers": {
+    "message": "Authentifizierungsanbieter"
+  },
+  "profile.details.label.email": {
+    "message": "E-Mail"
+  },
+  "profile.details.label.has-password": {
+    "message": "Hat Passwort"
+  },
+  "profile.details.label.has-totp": {
+    "message": "Hat TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "message": "Zahlungsmethoden"
+  },
   "profile.details.tooltip.email-not-verified": {
     "message": "E-Mail nicht verifiziert"
   },
@@ -1133,12 +1799,21 @@
   "profile.error.not-found": {
     "message": "Benutzer nicht gefunden"
   },
+  "profile.label.affiliate": {
+    "message": "Partner"
+  },
   "profile.label.badges": {
     "message": "Abzeichen"
   },
+  "profile.label.collection": {
+    "message": "Kollektion"
+  },
   "profile.label.details": {
     "message": "Details"
   },
+  "profile.label.downloads": {
+    "message": "{count} {count, plural, one {Download} other {Downloads}}"
+  },
   "profile.label.joined": {
     "message": "Beigetreten"
   },
@@ -1160,6 +1835,9 @@
   "profile.label.organizations": {
     "message": "Organisationen"
   },
+  "profile.label.projects": {
+    "message": "{count} {count, plural, one {Projekt} other {Projekte}}"
+  },
   "profile.label.saving": {
     "message": "Speichern..."
   },
@@ -1221,7 +1899,7 @@
     "message": "Erneut zur Überprüfung einsenden"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Dein Projekt wurde {status} von Modrinths Mitarbeitern. In den meisten fällen, kannst du jederzeit erneut absenden zur Verarbeitung, nachdem sie uns per Nachricht kontaktieren."
+    "message": "Dein Projekt wurde vom Modrinth-Team {status, select, rejected {abgelehnt} withheld {zurückgehalten} other {{status}}}."
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Du musst erst die benötigten Schritte aus der Veröffentlichungsliste abschließen!"
@@ -1628,18 +2306,6 @@
   "report.submit": {
     "message": "Meldung einreichen"
   },
-  "revenue.transfers.total": {
-    "message": "Du hast insgesamt {amount} abgehoben."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Du hast {amount} über {method} abgehoben."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Du hast im Jahr {year} {amount} abgehoben."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Du hast {amount} im Jahr {year} durch {method} abgehoben."
-  },
   "scopes.analytics.description": {
     "message": "Zugriff auf Analysedaten"
   },
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index 6db5cfb2..eaa3a2f4 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "No listado"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Crear enlace de afiliado"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Error al cargar los enlaces de afiliado"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Tus enlaces de afiliado"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Esto revocará de forma permanente el código de afiliado `{id}` y cualquier enlace existente con este código que se haya compartido ya no será válido."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Revocar"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "¿Estás seguro de que quieres revocar tu enlace de afiliado ''{title}''?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Buscar enlaces de afiliado..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "Crear nuevo"
   },
@@ -579,16 +600,16 @@
     "message": "Tus colecciones"
   },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
-    "message": "Descarga {formType}"
+    "message": "Descargar {formType}"
   },
   "dashboard.creator-tax-form-modal.confirmation.success": {
-    "message": "¡Tu {formType} formulario de impuestos se ha subido exitosamente!"
+    "message": "¡Tu {formType} formulario fiscal se ha enviado correctamente!"
   },
   "dashboard.creator-tax-form-modal.confirmation.support-text": {
-    "message": "Puedes retirarte por ahora. Si tiene preguntas o necesita actualizar tus datos <support-link>contacte con soporte</support-link>."
+    "message": "Ahora puedes retirar libremente. Si tienes preguntas o necesitas actualizar tus datos <support-link>contacta con soporte</support-link>."
   },
   "dashboard.creator-tax-form-modal.confirmation.title": {
-    "message": "¡Está todo listo! 🎉"
+    "message": "¡Ya estás listo! 🎉"
   },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Una entidad extranjera es una entidad comercial constituida fuera de Estados Unidos (como una corporación, sociedad o LLC no estadounidense)."
@@ -614,6 +635,336 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "¿Eres ciudadano estadounidense?"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Llena el formulario fiscal"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Continuar con el límite"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Detalles"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Cantidad"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "Tipo de cambio"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Tarifa"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Cantidad neta"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Entidad comercial"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "Una entidad comercial se refiere a una organización registrada, como una sociedad anónima, una sociedad colectiva o una sociedad de responsabilidad limitada."
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "¿Estás retirando como particular o como empresa?"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Particular"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Selecciona tu país"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Buscar países..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "No se pueden obtener los métodos de pago disponibles. Inténtalo de nuevo más tarde."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Error al cargar los métodos de pago"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Región"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Algunos métodos de pago no están disponibles en ciertas regiones."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Selecciona el método para retirar"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "Tu límite de retiro es <b>{amount}</b>, <tax-link>llena un formulario fiscal</tax-link> para retirar más."
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Titular de la cuenta"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Moneda"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Confirma tu dirección de cartera"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "Número de identificación nacional"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "Escribe el número de identificación nacional"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "Número de pasaporte"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "Escribe el número de pasaporte"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "Escribe el número de identificación de residente"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "Número de RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "Escribe el número RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "Número de identificación fiscal"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "Escribe el número de identificación fiscal"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Red"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "Estás cerca del límite de retiro. Puedes retirar <b>{amountRemaining}</b> ahora, pero se requiere un formulario de fiscal para poder retirar más."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Cuenta"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Desconectar cuenta"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Método de pago"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "Cuenta de PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Conecta tu cuenta de PayPal para recibir pagos directamente."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Guardar"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "¡Nombre de usuario de Venmo guardado con éxito!"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Guardado"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Iniciar sesión con PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "Escribe tu nombre de usuario de Venmo para recibir pagos."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Nombre de usario de Venmo"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@usuario"
+  },
+  "dashboard.creator-withdraw-modal.stage.completion": {
+    "message": "Completado"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Método"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Detalles de la cuenta"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "Verificación"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "Formulario fiscal"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "Detalles"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "Para retirar tu saldo total <b>{available}</b> disponible, llena el siguiente formulario. Es necesario para la declaración de impuestos y solo es necesario hacerlo una vez."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body-with-limit": {
+    "message": "Debes llenar un formulario W-9 o W-8 para los registros fiscales de Modrinth, así nos mantenemos al día con las normativas de impuestos."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.header": {
+    "message": "Formulario fiscal requerido"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Método de pago"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward": {
+    "message": "Recompensa"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "Seleccionar recompensa"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
+    "message": "Recompensas"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "Correo electrónico no verificado"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message": {
+    "message": "El correo electrónico de entrega que has ingresado no está asociado a tu cuenta de Modrinth. Modrinth no puede recuperar las recompensas enviadas a una dirección de correo electrónico incorrecta."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
+    "message": "Tarifas más bajas disponibles"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message": {
+    "message": "Has seleccionado USD para PayPal Internacional. <direct-paypal-link>Cambia a PayPal directo</direct-paypal-link> para obtener mejores tarifas (≈2 % en lugar de ≈6 %)."
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Retirar"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit": {
+    "message": "Límite de retiro"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit-used": {
+    "message": "Has agotado tu límite de retiro <b>{withdrawLimit}</b>. Debes completar un formulario de impuestos para retirar más."
+  },
+  "dashboard.revenue.available-now": {
+    "message": "Disponible ahora"
+  },
+  "dashboard.revenue.balance": {
+    "message": "Saldo"
+  },
+  "dashboard.revenue.estimated-tooltip.msg1": {
+    "message": "Los ingresos estimados pueden estar sujetos a cambios hasta que estén disponibles."
+  },
+  "dashboard.revenue.estimated-tooltip.msg2": {
+    "message": "Haz clic aquí para leer acerca del cómo Modrinth gestiona tus ingresos."
+  },
+  "dashboard.revenue.estimated-with-date": {
+    "message": "Fecha estimada {date}"
+  },
+  "dashboard.revenue.processing": {
+    "message": "Procesando"
+  },
+  "dashboard.revenue.processing.tooltip": {
+    "message": "Los ingresos permanecen en proceso hasta final de mes, luego están disponibles 60 días después."
+  },
+  "dashboard.revenue.stats.received": {
+    "message": "Recibido"
+  },
+  "dashboard.revenue.stats.transactions": {
+    "message": "Transacciones"
+  },
+  "dashboard.revenue.stats.withdrawn": {
+    "message": "Retiros"
+  },
+  "dashboard.revenue.tos": {
+    "message": "Al subir proyectos a Modrinth y retirar dinero de tu cuenta, aceptas nuestros <terms-link>Términos del programa de recompensas</terms-link>. Aprende más acerca del <info-link>Programa de recompensas</info-link>."
+  },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "Descargar como CSV"
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "Transacciones"
+  },
+  "dashboard.revenue.transactions.none": {
+    "message": "Sin transacciones"
+  },
+  "dashboard.revenue.transactions.none.desc": {
+    "message": "Tus pagos y retiros aparecerán aquí."
+  },
+  "dashboard.revenue.transactions.see-all": {
+    "message": "Ver todo"
+  },
+  "dashboard.revenue.withdraw.blocked-tin-mismatch": {
+    "message": "Tus retiros están temporalmente bloqueados por que tu TIN o SSN no coinciden con los registros del IRS. Conte en contacto con el equipo de soporte para restablecerlos y reenviar tu formulario fiscal."
+  },
+  "dashboard.revenue.withdraw.card.description": {
+    "message": "Retira dinero de tu saldo disponible a cualquier método de pago."
+  },
+  "dashboard.revenue.withdraw.card.title": {
+    "message": "Retirar"
+  },
+  "dashboard.revenue.withdraw.header": {
+    "message": "Retirar"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "Cuenta"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Cantidad"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Cerrar"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Fecha"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "Recibirás un correo electrónico a <b>{email}</b> con instrucciones para canjear tu retiro."
+  },
+  "dashboard.withdraw.completion.exchange-rate": {
+    "message": "Tipo de cambio"
+  },
+  "dashboard.withdraw.completion.fee": {
+    "message": "Tarifa"
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "Método"
+  },
+  "dashboard.withdraw.completion.net-amount": {
+    "message": "Cantidad neta"
+  },
+  "dashboard.withdraw.completion.recipient": {
+    "message": "Destinatario"
+  },
+  "dashboard.withdraw.completion.title": {
+    "message": "Retiro completado"
+  },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "Transacciones"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "Cartera"
+  },
+  "dashboard.withdraw.error.generic.text": {
+    "message": "No hemos podido enviar tu solicitud de retiro. Por favor, revisa tus datos o ponte en contacto con el servicio de asistencia."
+  },
+  "dashboard.withdraw.error.generic.title": {
+    "message": "No se puede retirar"
+  },
+  "dashboard.withdraw.error.invalid-address.text": {
+    "message": "No se ha podido verificar la dirección que has introducido. Por favor, revisa tus datos de dirección."
+  },
+  "dashboard.withdraw.error.invalid-address.title": {
+    "message": "Error al verificar la dirección"
+  },
+  "dashboard.withdraw.error.invalid-bank.text": {
+    "message": "Los datos de la cuenta bancaria que proporcionaste no son válidos. Por favor, verifica la información."
+  },
+  "dashboard.withdraw.error.invalid-bank.title": {
+    "message": "Datos bancarios no válidos"
+  },
+  "dashboard.withdraw.error.invalid-wallet.text": {
+    "message": "La dirección de la cartera de criptomonedas que proporcionaste no es válida. Por favor, revísala y vuelve a intentarlo."
+  },
+  "dashboard.withdraw.error.invalid-wallet.title": {
+    "message": "Dirección de cartera no válida"
+  },
+  "dashboard.withdraw.error.minimum-not-met.text": {
+    "message": "El monto a retirar (después de las tarifas) no cumple con el requisito mínimo. Por favor, aumenta la cantidad a retirar."
+  },
+  "dashboard.withdraw.error.minimum-not-met.title": {
+    "message": "Cantidad demasiado baja"
+  },
+  "dashboard.withdraw.error.tax-form.text": {
+    "message": "Debes completar un formulario fiscal para poder enviar tu solicitud de retiro."
+  },
+  "dashboard.withdraw.error.tax-form.title": {
+    "message": "Por favor, llena el formulario fiscal"
+  },
   "error.collection.404.list_item.1": {
     "message": "Puede que hayas escrito mal la URL de la colección."
   },
@@ -869,6 +1220,9 @@
   "layout.action.lookup-by-email": {
     "message": "Buscar por correo electrónico"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Administrar enlaces de afiliado"
+  },
   "layout.action.manage-server-notices": {
     "message": "Administrar notificaciones del servidor"
   },
@@ -924,19 +1278,19 @@
     "message": "Completar formulario fiscal"
   },
   "layout.banner.tax.description": {
-    "message": "Ya ha retirado más de 600 dólares de Modrinth este año. Para cumplir con la normativa fiscal, debes rellenar un formulario de impuestos. Tus retiradas quedarán en suspenso hasta que envíes el formulario."
+    "message": "Ya has retirado más de 600 dólares de Modrinth este año. Para cumplir con las regulaciones fiscales, necesitas llenar un formulario fiscal. Tus retiros estarán en pausa hasta que envíes el formulario."
   },
   "layout.banner.tax.title": {
     "message": "Formulario fiscal requerido"
   },
   "layout.banner.tin-mismatch.action": {
-    "message": "Contacta con soporte"
+    "message": "Contactar con soporte"
   },
   "layout.banner.tin-mismatch.description": {
-    "message": "Tus retiradas están bloqueadas temporalmente porque tu TIN o SSN no coinciden con los registros del IRS. Ponte en contacto con el servicio de asistencia para restablecer y volver a enviar tu formulario fiscal."
+    "message": "Tus retiros están temporalmente bloqueados por que tu TIN o SSN no coinciden con los registros del IRS. Conte en contacto con el equipo de soporte para restablecerlos y reenviar tu formulario fiscal."
   },
   "layout.banner.tin-mismatch.title": {
-    "message": "Error en el formulario fiscal"
+    "message": "Formulario fiscal erróneo"
   },
   "layout.banner.verify-email.action": {
     "message": "Reenviar correo de verificación"
@@ -962,6 +1316,9 @@
   "layout.footer.about.status": {
     "message": "Estado"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "Legal"
   },
@@ -1040,6 +1397,15 @@
   "layout.meta.og-description": {
     "message": "¡Descubre y publica contenido de Minecraft!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Cerrar menú"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Abrir menú"
+  },
+  "layout.nav.active-reports": {
+    "message": "Reportes activos"
+  },
   "layout.nav.analytics": {
     "message": "Estadísticas"
   },
@@ -1067,6 +1433,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Página de inicio de Modrinth"
   },
+  "layout.nav.my-servers": {
+    "message": "Mis servidores"
+  },
   "layout.nav.organizations": {
     "message": "Organizaciones"
   },
@@ -1112,11 +1481,272 @@
   "moderation.technical.search.placeholder": {
     "message": "Buscar revisiones técnicas..."
   },
+  "muralpay.account-type.checking": {
+    "message": "Cuenta de cheques"
+  },
+  "muralpay.account-type.savings": {
+    "message": "Ahorros"
+  },
+  "muralpay.country.at": {
+    "message": "Austria"
+  },
+  "muralpay.country.be": {
+    "message": "Bélgica"
+  },
+  "muralpay.country.cy": {
+    "message": "Chipre"
+  },
+  "muralpay.country.de": {
+    "message": "Alemania"
+  },
+  "muralpay.country.ee": {
+    "message": "Estonia"
+  },
+  "muralpay.country.es": {
+    "message": "España"
+  },
+  "muralpay.country.fi": {
+    "message": "Finlandia"
+  },
+  "muralpay.country.fr": {
+    "message": "Francia"
+  },
+  "muralpay.country.gr": {
+    "message": "Grecia"
+  },
+  "muralpay.country.ie": {
+    "message": "Irlanda"
+  },
+  "muralpay.country.it": {
+    "message": "Italia"
+  },
+  "muralpay.country.lt": {
+    "message": "Lituania"
+  },
+  "muralpay.country.lu": {
+    "message": "Luxemburgo"
+  },
+  "muralpay.country.lv": {
+    "message": "Letonia"
+  },
+  "muralpay.country.mt": {
+    "message": "Malta"
+  },
+  "muralpay.country.nl": {
+    "message": "Países Bajos"
+  },
+  "muralpay.country.pt": {
+    "message": "Portugal"
+  },
+  "muralpay.country.sk": {
+    "message": "Eslovaquia"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Pasaporte"
+  },
+  "muralpay.document-type.ruc": {
+    "message": "RUC"
+  },
+  "muralpay.document-type.tax-id": {
+    "message": "Identificación fiscal"
+  },
+  "muralpay.field.account-number": {
+    "message": "Número de cuenta"
+  },
+  "muralpay.field.account-number-cbu-cvu": {
+    "message": "Número de cuenta (CBU/CVU)"
+  },
+  "muralpay.field.account-number-cci": {
+    "message": "Número de cuenta (CCI)"
+  },
+  "muralpay.field.account-number-type": {
+    "message": "Tipo de número de cuenta"
+  },
+  "muralpay.field.account-type": {
+    "message": "Tipo de cuenta"
+  },
+  "muralpay.field.bank-account-number": {
+    "message": "Número de cuenta"
+  },
+  "muralpay.field.branch-code": {
+    "message": "Código de sucursal"
+  },
+  "muralpay.field.clabe": {
+    "message": "CLABE"
+  },
+  "muralpay.field.country": {
+    "message": "País"
+  },
+  "muralpay.field.cpf-cnpj": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.field.cuit-cuil": {
+    "message": "CUIT/CUIL"
+  },
+  "muralpay.field.document-type": {
+    "message": "Tipo de documento"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.field.phone-number": {
+    "message": "Número telefónico"
+  },
+  "muralpay.field.pix-email": {
+    "message": "Correo electrónico PIX"
+  },
+  "muralpay.field.pix-key-type": {
+    "message": "Tipo de clave PIX"
+  },
+  "muralpay.field.pix-phone": {
+    "message": "Teléfono PIX"
+  },
+  "muralpay.field.routing-number": {
+    "message": "Número de ruta"
+  },
+  "muralpay.field.swift-bic": {
+    "message": "SWIFT/BIC"
+  },
+  "muralpay.field.wallet-address": {
+    "message": "Dirección de cartera"
+  },
+  "muralpay.help.cbu-cvu": {
+    "message": "Clave Bancaria Uniforme o Clave Virtual Uniforme"
+  },
+  "muralpay.help.cci": {
+    "message": "Código de cuenta interbancaria"
+  },
+  "muralpay.help.clabe": {
+    "message": "Clave bancaria estandarizada (Número de cuenta bancaria mexicana)"
+  },
+  "muralpay.help.cpf-cnpj": {
+    "message": "Número de identificación fiscal brasileño"
+  },
+  "muralpay.help.cuit-cuil": {
+    "message": "Identificación fiscal argentina"
+  },
+  "muralpay.help.iban": {
+    "message": "Número de cuenta bancaria internacional"
+  },
+  "muralpay.help.swift-bic": {
+    "message": "Código de identificación bancaria"
+  },
+  "muralpay.pix-type.bank-account": {
+    "message": "Cuenta bancaria"
+  },
+  "muralpay.pix-type.document": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.pix-type.email": {
+    "message": "Correo electrónico"
+  },
+  "muralpay.pix-type.phone": {
+    "message": "Número telefónico"
+  },
+  "muralpay.placeholder.account-number": {
+    "message": "Escribe el número de cuenta"
+  },
+  "muralpay.placeholder.cbu-cvu": {
+    "message": "Ingresa el CBU o el CVU"
+  },
+  "muralpay.placeholder.cbu-cvu-type": {
+    "message": "CBU o CVU"
+  },
+  "muralpay.placeholder.cci": {
+    "message": "Ingresa el CCI de 20 dígitos"
+  },
+  "muralpay.placeholder.cuit-cuil": {
+    "message": "Ingresa el CUIT o el CUIL"
+  },
+  "muralpay.placeholder.enter-account-number": {
+    "message": "Escribe el número de cuenta"
+  },
+  "muralpay.placeholder.enter-branch-code": {
+    "message": "Escribe el código de sucursal"
+  },
+  "muralpay.placeholder.enter-clabe": {
+    "message": "Ingresa la CLABE de 18 dígitos"
+  },
+  "muralpay.placeholder.enter-cpf-cnpj": {
+    "message": "Ingresa el CPF o CNPJ"
+  },
+  "muralpay.placeholder.enter-iban": {
+    "message": "Escribe el IBAN"
+  },
+  "muralpay.placeholder.enter-pix-email": {
+    "message": "Escribe tu correo electrónico de PIX"
+  },
+  "muralpay.placeholder.enter-routing-number": {
+    "message": "Escribe el número de ruta de 9 dígitos"
+  },
+  "muralpay.placeholder.enter-swift-bic": {
+    "message": "Escribe el código SWIFT/BIC"
+  },
+  "muralpay.placeholder.iban-crc": {
+    "message": "Ingresa el IBAN de Costa Rica"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
+  "muralpay.rail.fiat-ars.name": {
+    "message": "Transferencia bancaria (ARS)"
+  },
+  "muralpay.rail.fiat-brl.name": {
+    "message": "Transferencia PIX (BRL)"
+  },
+  "muralpay.rail.fiat-clp.name": {
+    "message": "Transferencia bancaria (CLP)"
+  },
+  "muralpay.rail.fiat-cop.name": {
+    "message": "Transferencia bancaria (COP)"
+  },
+  "muralpay.rail.fiat-crc.name": {
+    "message": "Transferencia bancaria (CRC)"
+  },
+  "muralpay.rail.fiat-eur.name": {
+    "message": "Transferencia bancaria (EUR)"
+  },
+  "muralpay.rail.fiat-mxn.name": {
+    "message": "Transferencia bancaria (MXN)"
+  },
+  "muralpay.rail.fiat-pen.name": {
+    "message": "Transferencia bancaria (PEN)"
+  },
+  "muralpay.rail.fiat-usd-peru.name": {
+    "message": "Transferencia bancaria (USD - Perú)"
+  },
+  "muralpay.rail.fiat-usd.name": {
+    "message": "Transferencia bancaria (USD)"
+  },
+  "muralpay.rail.fiat-zar.name": {
+    "message": "Transferencia bancaria (ZAR)"
+  },
+  "muralpay.rail.usdc-base.name": {
+    "message": "USDC (Base)"
+  },
+  "muralpay.rail.usdc-celo.name": {
+    "message": "USDC (Celo)"
+  },
+  "muralpay.rail.usdc-ethereum.name": {
+    "message": "USDC (Ethereum)"
+  },
+  "muralpay.rail.usdc-polygon.name": {
+    "message": "Cripto (USDC)"
+  },
+  "muralpay.warning.wallet-address": {
+    "message": "Verifica dos veces la dirección de tu billetera. Los fondos enviados a una dirección incorrecta no se pueden recuperar."
+  },
   "profile.bio.fallback.creator": {
-    "message": "Creador en Modrinth."
+    "message": "Un creador de Modrinth."
   },
   "profile.bio.fallback.user": {
-    "message": "Usuario de Modrinth."
+    "message": "Un usuario de Modrinth."
   },
   "profile.button.billing": {
     "message": "Gestionar la facturación de usuario"
@@ -1130,8 +1760,14 @@
   "profile.button.manage-projects": {
     "message": "Gestionar proyectos"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Remover como afiliado"
+  },
+  "profile.button.set-affiliate": {
+    "message": "Configurar como afiliado"
+  },
   "profile.details.label.auth-providers": {
-    "message": "Autentificar proveedores"
+    "message": "Proveedores de autenticación"
   },
   "profile.details.label.email": {
     "message": "Correo electrónico"
@@ -1140,7 +1776,7 @@
     "message": "Tiene contraseña"
   },
   "profile.details.label.has-totp": {
-    "message": "Tiene autentificación de doble factor"
+    "message": "Tiene TOTP"
   },
   "profile.details.label.payment-methods": {
     "message": "Métodos de pago"
@@ -1154,6 +1790,9 @@
   "profile.error.not-found": {
     "message": "Usuario no encontrado"
   },
+  "profile.label.affiliate": {
+    "message": "Afiliado"
+  },
   "profile.label.badges": {
     "message": "Insignias"
   },
@@ -1167,7 +1806,7 @@
     "message": "{count} {count, plural, one {descarga} other {descargas}}"
   },
   "profile.label.joined": {
-    "message": "Se unió hace"
+    "message": "Se unió"
   },
   "profile.label.no": {
     "message": "No"
@@ -1251,7 +1890,7 @@
     "message": "Reenviar para revisión"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Tu proyecto ha sido {status} por el staff de Modrinth. En la mayoría de los casos, puedes volver a enviarlo para su revisión después de responder al mensaje del staff."
+    "message": "Tu proyecto ha sido {status, select, rejected {rechazado} withheld {retenido} other {{status}}} por el equipo de Modrinth. En la mayoría de los casos, puedes volver a enviarlo para su revisión después de responder a las observaciones que el equipo te haya dado."
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "¡Debes completar los pasos requeridos en la lista de verificación de publicación!"
@@ -1658,18 +2297,6 @@
   "report.submit": {
     "message": "Enviar reporte"
   },
-  "revenue.transfers.total": {
-    "message": "Has retirado {amount} en total."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Has retirado {amount} mediante {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Has retirado {amount} en {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Has retirado {amount} en {year} mediante {method}."
-  },
   "scopes.analytics.description": {
     "message": "Accede a tus datos analíticos"
   },
diff --git a/apps/frontend/src/locales/es-ES/index.json b/apps/frontend/src/locales/es-ES/index.json
index 57f4f949..c85ea91d 100644
--- a/apps/frontend/src/locales/es-ES/index.json
+++ b/apps/frontend/src/locales/es-ES/index.json
@@ -566,6 +566,24 @@
   "create.project.visibility-unlisted": {
     "message": "No listado"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Crear enlace de afiliado"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Error al cargar los enlaces de afiliado"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Tus enlaces de afiliado"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Esto revocará permanentemente el código de afiliado `{id}` y cualquier enlace existente con este código que se haya compartido dejará de ser válido."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Revocar"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "¿Estás seguro de que deseas revocar tu enlace de afiliado «{title}»?"
+  },
   "dashboard.collections.button.create-new": {
     "message": "Crear nuevo"
   },
@@ -614,6 +632,78 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "¿Es usted ciudadano estadounidense?"
   },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Detalles"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Cantidad"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Seleccione el país"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Buscar país..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Región"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Algunos métodos de pago no están disponibles en determinadas regiones."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Seleccionar método de retirada"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Moneda"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "Estás cerca del límite de retirada. Puedes retirar <b>{amountRemaining}</b> ahora, pero se requiere un formulario de impuestos para retirar más."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "Cuenta de Paypal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Guardar"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Guardado"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Entrar con PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@username"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Método"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "Para retirar el saldo total <b>{available}</b> disponible, rellene el siguiente formulario. Es necesario para la declaración de impuestos y solo hay que hacerlo una vez."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Método de pago"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "Email no verificado"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Retirada"
+  },
+  "dashboard.revenue.tos": {
+    "message": "Al subir proyectos a Modrinth y retirar dinero de tu cuenta, aceptas nuestros <terms-link>Términos del programa de recompensas</terms-link>. Más información sobre el <info-link>Programa de recompensas</info-link>."
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Cerrar"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Fecha"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "Recibirás un correo electrónico en <b>{email}</b> con instrucciones para canjear tu retirada."
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "Método"
+  },
   "error.collection.404.list_item.1": {
     "message": "Has escrito mal en enlace de esta colección."
   },
@@ -959,6 +1049,9 @@
   "layout.footer.about.status": {
     "message": "Estado"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "Legal"
   },
@@ -1037,6 +1130,12 @@
   "layout.meta.og-description": {
     "message": "¡Descubre y publica contenido de Minecraft!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Cerrar menú"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Abrir menú"
+  },
   "layout.nav.analytics": {
     "message": "Análisis"
   },
@@ -1064,6 +1163,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Página de inicio de Modrinth"
   },
+  "layout.nav.my-servers": {
+    "message": "Mis servidores"
+  },
   "layout.nav.organizations": {
     "message": "Organizaciones"
   },
@@ -1109,6 +1211,78 @@
   "moderation.technical.search.placeholder": {
     "message": "Buscar reseñas tecnológicas..."
   },
+  "muralpay.account-type.savings": {
+    "message": "Guardando"
+  },
+  "muralpay.country.at": {
+    "message": "Austria"
+  },
+  "muralpay.country.be": {
+    "message": "Bélgica"
+  },
+  "muralpay.country.cy": {
+    "message": "Chipre"
+  },
+  "muralpay.country.de": {
+    "message": "Alemania"
+  },
+  "muralpay.country.ee": {
+    "message": "Estonia"
+  },
+  "muralpay.country.es": {
+    "message": "España"
+  },
+  "muralpay.country.fi": {
+    "message": "Finlandia"
+  },
+  "muralpay.country.fr": {
+    "message": "Francia"
+  },
+  "muralpay.country.gr": {
+    "message": "Grecia"
+  },
+  "muralpay.country.ie": {
+    "message": "Irlanda"
+  },
+  "muralpay.country.it": {
+    "message": "Italia"
+  },
+  "muralpay.country.lt": {
+    "message": "Lituania"
+  },
+  "muralpay.country.lu": {
+    "message": "Luxemburgo"
+  },
+  "muralpay.country.lv": {
+    "message": "Letonia"
+  },
+  "muralpay.country.mt": {
+    "message": "Malta"
+  },
+  "muralpay.country.nl": {
+    "message": "Países Bajos"
+  },
+  "muralpay.country.pt": {
+    "message": "Portugal"
+  },
+  "muralpay.country.sk": {
+    "message": "Eslovaquia"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Pasaporte"
+  },
+  "muralpay.field.country": {
+    "message": "País"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.help.cci": {
+    "message": "Código de Cuenta Interbancaria"
+  },
+  "muralpay.pix-type.email": {
+    "message": "Correo electrónico"
+  },
   "profile.bio.fallback.creator": {
     "message": "Creador en Modrinth."
   },
@@ -1127,6 +1301,12 @@
   "profile.button.manage-projects": {
     "message": "Gestionar proyectos"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Borrar como afiliado"
+  },
+  "profile.button.set-affiliate": {
+    "message": "Establecer como afiliado"
+  },
   "profile.details.label.auth-providers": {
     "message": "Autentificar proveedores"
   },
@@ -1151,6 +1331,9 @@
   "profile.error.not-found": {
     "message": "Usuario no encontrado"
   },
+  "profile.label.affiliate": {
+    "message": "Afiliado"
+  },
   "profile.label.badges": {
     "message": "Medallas"
   },
@@ -1247,9 +1430,6 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "Reenviar para revisión"
   },
-  "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Tu proyecto ha sido {status} por el personal de Modrinth. En la mayoría de los casos, puedes volver a enviarlo para su revisión después de responder al mensaje del personal."
-  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "¡Debes completar los pasos requeridos en la lista de verificación de publicación!"
   },
@@ -1574,6 +1754,12 @@
   "report.not-for.bug-reports.description": {
     "message": "Puedes informar de los errores en su <issues-link>sistema de seguimiento de incidencias</issues-link>."
   },
+  "report.not-for.dmca.description": {
+    "message": "Consulte nuestra <policy-link>Política de derechos de autor</policy-link>."
+  },
+  "report.note.copyright.1": {
+    "message": "Tenga en cuenta que *no* está enviando una solicitud de retirada en virtud de la DMCA, sino un informe sobre contenido vuelto a subir."
+  },
   "report.note.malicious.1": {
     "message": "Los informes de contenido malicioso o engañoso deben incluir pruebas sustanciales del comportamiento, como muestras de código."
   },
@@ -1601,18 +1787,6 @@
   "report.submit": {
     "message": "Enviar reporte"
   },
-  "revenue.transfers.total": {
-    "message": "Has retirado un total de {amount}."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Has retirado {amount} a través de {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Has retirado {amount} en {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Has retirado {amount} en {year} mediante {method}."
-  },
   "scopes.analytics.description": {
     "message": "Accede a tus datos de analítica"
   },
@@ -2045,6 +2219,9 @@
   "settings.display.banner.developer-mode.button": {
     "message": "Desactivar modo desarrollador"
   },
+  "settings.display.banner.developer-mode.description": {
+    "message": "El <strong>modo desarrollador</strong> está activo. Esto te permitirá ver los ID internos de varios elementos de Modrinth, lo que puede resultarte útil si eres desarrollador y utilizas la API de Modrinth. Haz clic 5 veces en el logotipo de Modrinth situado en la parte inferior de la página para activar o desactivar el modo desarrollador."
+  },
   "settings.display.flags.description": {
     "message": "Activar o desactivar determinadas funciones de este dispositivo."
   },
@@ -2087,9 +2264,15 @@
   "settings.display.sidebar.advanced-rendering.title": {
     "message": "Renderizado avanzado"
   },
+  "settings.display.sidebar.external-links-new-tab.description": {
+    "message": "Haz que los enlaces que salen de Modrinth se abran en una nueva pestaña. Independientemente de esta configuración, los enlaces del mismo dominio y de las descripciones Markdown se abrirán en la misma pestaña, y los enlaces de los anuncios y las páginas de edición se abrirán en una nueva pestaña."
+  },
   "settings.display.sidebar.external-links-new-tab.title": {
     "message": "Abrir enlaces externos en una nueva pestaña"
   },
+  "settings.display.sidebar.hide-app-promos.description": {
+    "message": "Oculta los botones «Obtener la aplicación Modrinth» de la navegación principal. La página de la aplicación Modrinth sigue estando disponible en la página de inicio o en el pie de página."
+  },
   "settings.display.sidebar.hide-app-promos.title": {
     "message": "Ocultar promociones de la aplicación de Modrinth"
   },
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index 8eef4386..e5d38ae2 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -1193,9 +1193,6 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "Soumettre à nouveau pour révision"
   },
-  "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Ton projet a été {status} par le personnel de Modrinth. Tu peux soumettre à nouveau pour examen après avoir adressé le message du personnel."
-  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Vous devez compléter les étapes obligatoires dans la liste de contrôle de publication !"
   },
@@ -1601,18 +1598,6 @@
   "report.submit": {
     "message": "Soumettre le signalement"
   },
-  "revenue.transfers.total": {
-    "message": "Vous avez retiré {amount} au total."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Vous avez retiré {amount} via {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Vous avez retiré {amount} en {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Vous avez retiré {amount} en {year} via {method}."
-  },
   "scopes.analytics.description": {
     "message": "Accéder à vos données analytiques"
   },
@@ -1877,12 +1862,6 @@
   "servers.backups.item.creating-backup": {
     "message": "Création de sauvegarde..."
   },
-  "servers.backups.item.downloading": {
-    "message": "Téléchargement"
-  },
-  "servers.backups.item.downloading-backup": {
-    "message": "Téléchargement de la backup..."
-  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Échec de la création de la sauvegarde"
   },
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index 7f9cad96..de33cc09 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -1250,9 +1250,6 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "Ripresenta per la revisione"
   },
-  "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Il tuo progetto è stato {status} dallo staff di Modrinth. Nella maggioranza dei casi, potrai ripresentarlo per una revisione dopo aver risposto al messaggio dello staff."
-  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Devi completare i passaggi obbligatori nella checklist di pubblicazione!"
   },
@@ -1658,18 +1655,6 @@
   "report.submit": {
     "message": "Invia segnalazione"
   },
-  "revenue.transfers.total": {
-    "message": "Hai prelevato in tutto {amount}."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Hai prelevato {amount} tramite {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Hai prelevato {amount} nel {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Hai prelevato {amount} nel {year} tramite {method}."
-  },
   "scopes.analytics.description": {
     "message": "Accedere ai tuoi dati analitici"
   },
diff --git a/apps/frontend/src/locales/ko-KR/index.json b/apps/frontend/src/locales/ko-KR/index.json
index f9a1800c..179b1047 100644
--- a/apps/frontend/src/locales/ko-KR/index.json
+++ b/apps/frontend/src/locales/ko-KR/index.json
@@ -998,18 +998,6 @@
   "report.submit": {
     "message": "신고 제출"
   },
-  "revenue.transfers.total": {
-    "message": "총 {amount} 만큼 인출했습니다."
-  },
-  "revenue.transfers.total.method": {
-    "message": "{method}(으)로 총 {amount} 만큼 인출했습니다."
-  },
-  "revenue.transfers.total.year": {
-    "message": "{year}년에 총 {amount} 만큼 인출했습니다."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "{method}(으)로 {year}년에 총 {amount} 만큼 인출했습니다."
-  },
   "scopes.analytics.description": {
     "message": "통계 접근"
   },
diff --git a/apps/frontend/src/locales/ms-Arab/index.json b/apps/frontend/src/locales/ms-Arab/index.json
index 840ecfbb..f284472c 100644
--- a/apps/frontend/src/locales/ms-Arab/index.json
+++ b/apps/frontend/src/locales/ms-Arab/index.json
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "تيدق دسنارايکن"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Cipta pautan afiliasi"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Ralat semasa memuatkan pautan afiliasi"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Pautan afiliasi anda"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Ini akan membatalkan kod afiliasi `{id}` secara kekal dan sebarang pautan sedia ada dengan kod ini yang telah dikongsi tidak lagi sah."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Batalkan"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "Adakah anda pasti mahu membatalkan pautan afiliasi anda yang bernama ''{title}''?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Cari pautan afiliasi..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "چيڤتا بهارو"
   },
@@ -614,6 +635,336 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "اداکه اندا ورݢانݢارا اميريکا شريکت؟"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Lengkapkan borang cukai"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Teruskan dengan had"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Butiran"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Amaun"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "Kadar FX"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Yuran"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Amaun bersih"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Entiti bisnes"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "Entiti bisnes merujuk kepada organisasi terdaftar seperti perbadanan, perkongsian atau LLC."
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "Adakah anda sedang mengeluarkan wang sebagai seorang individu atau sebuah perniagaan?"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Individu persendirian"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Pilih negara anda"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Cari negara..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "Tidak dapat mengambil kaedah pembayaran yang tersedia. Sila cuba lagi kemudian."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Gagal memuatkan kaedah pembayaran"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Rantau"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Sesetengah kaedah pembayaran tidak tersedia di rantau tertentu."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Pilih kaedah pengeluaran"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "Had pengeluaran anda ialah <b>{amount}</b>, <tax-link>lengkapkan borang cukai</tax-link> untuk mengeluarkan lebih banyak wang."
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Pemilik akaun"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Syiling"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Sahkan alamat dompet anda"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "Nombor ID kebangsaan"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "Masukkan nombor ID kebangsaan"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "Nombor pasport"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "Masukkan nombor pasport"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
+    "message": "Masukkan nombor ID penduduk"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "Masukkan nombor ID penduduk"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "Nombor RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "Masukkan nombor RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "Nombor ID cukai"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "Masukkan nombor ID cukai"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Rangkaian"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "Anda hampir mencapai ambang pengeluaran. Anda boleh mengeluarkan <b>{amountRemaining}</b> sekarang, tetapi borang cukai diperlukan untuk mengeluarkan lebih banyak wang."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Akaun"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Putuskan sambungan akaun"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Kaedah pembayaran"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "Akaun PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Sambungkan akaun PayPal anda untuk menerima pembayaran secara langsung."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Simpan"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Nama pemegang Venmo berjaya disimpan!"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Disimpan"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Daftar masuk dengan PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "Masukkan nama pemegang Venmo anda untuk menerima pembayaran."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Nama pemegang Venmo"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@nama-pengguna"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Kaedah"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Butiran Akaun"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "Pengesahan"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "Borang cukai"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "Butiran"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "Untuk mengeluarkan baki penuh anda yang tersedia sebanyak <b>{available}</b>, sila lengkapkan borang di bawah. Ia diperlukan untuk pelaporan cukai dan hanya perlu dilakukan sekali sahaja."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body-with-limit": {
+    "message": "Anda mesti melengkapkan borang W-9 atau W-8 untuk rekod cukai Modrinth supaya kami kekal mematuhi peraturan cukai."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.header": {
+    "message": "Borang cukai diperlukan"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Kaedah pembayaran"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward": {
+    "message": "Ganjaran"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "Pilih ganjaran"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
+    "message": "Ganjaran"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "E-mel yang belum disahkan"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message": {
+    "message": "E-mel penghantaran yang anda masukkan tidak dikaitkan dengan akaun Modrinth anda. Modrinth tidak dapat mendapatkan semula ganjaran yang dihantar ke alamat e-mel yang salah."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
+    "message": "Yuran lebih rendah tersedia"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message": {
+    "message": "Anda memilih USD untuk PayPal Antarabangsa. <direct-paypal-link>Tukar kepada PayPal langsung</direct-paypal-link> untuk yuran yang lebih baik (≈2% dan bukannya ≈6%)."
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Keluarkan"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit": {
+    "message": "Had pengeluaran wang"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit-used": {
+    "message": "Anda telah menggunakan had pengeluaran anda sebanyak <b>{withdrawLimit}</b>. Anda mesti melengkapkan borang cukai untuk mengeluarkan lebih banyak wang."
+  },
+  "dashboard.revenue.available-now": {
+    "message": "Tersedia sekarang"
+  },
+  "dashboard.revenue.balance": {
+    "message": "Baki"
+  },
+  "dashboard.revenue.estimated-tooltip.msg1": {
+    "message": "Anggaran hasil pendapatan mungkin tertakluk kepada perubahan sehingga ia tersedia."
+  },
+  "dashboard.revenue.estimated-tooltip.msg2": {
+    "message": "Klik untuk membaca tentang cara Modrinth mengendalikan pendapatan anda."
+  },
+  "dashboard.revenue.estimated-with-date": {
+    "message": "Anggaran {date}"
+  },
+  "dashboard.revenue.processing": {
+    "message": "Memproses"
+  },
+  "dashboard.revenue.processing.tooltip": {
+    "message": "Hasil pendapatan kekal dalam pemprosesan sehingga akhir bulan, dan kemudian akan tersedia 60 hari kemudian."
+  },
+  "dashboard.revenue.stats.received": {
+    "message": "Diterima"
+  },
+  "dashboard.revenue.stats.transactions": {
+    "message": "Transaksi"
+  },
+  "dashboard.revenue.stats.withdrawn": {
+    "message": "Telah dikeluarkan"
+  },
+  "dashboard.revenue.tos": {
+    "message": "Dengan memuat naik projek ke Modrinth dan mengeluarkan wang daripada akaun anda, anda bersetuju dengan <terms-link>Terma Program Ganjaran</terms-link> kami. Ketahui lebih lanjut tentang <info-link>Program Ganjaran</info-link> ini."
+  },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "Muat turun sebagai CSV"
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "Transaksi"
+  },
+  "dashboard.revenue.transactions.none": {
+    "message": "Tiada transaksi"
+  },
+  "dashboard.revenue.transactions.none.desc": {
+    "message": "Pembayaran dan pengeluaran anda akan dipaparkan di sini."
+  },
+  "dashboard.revenue.transactions.see-all": {
+    "message": "Lihat semua"
+  },
+  "dashboard.revenue.withdraw.blocked-tin-mismatch": {
+    "message": "Pengeluaran anda telah dikunci buat sementara waktu kerana TIN atau SSN anda tidak sepadan dengan rekod IRS. Sila hubungi sokongan untuk menetapkan semula dan menghantar semula borang cukai anda."
+  },
+  "dashboard.revenue.withdraw.card.description": {
+    "message": "Keluarkan wang daripada baki yang tersedia kepada mana-mana kaedah pembayaran."
+  },
+  "dashboard.revenue.withdraw.card.title": {
+    "message": "Pengeluaran"
+  },
+  "dashboard.revenue.withdraw.header": {
+    "message": "Pengeluaran"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "Akaun"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Amaun"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Tutup"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Tarikh"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "Anda akan menerima e-mel di <b>{email}</b> dengan arahan untuk menebus pengeluaran anda."
+  },
+  "dashboard.withdraw.completion.exchange-rate": {
+    "message": "Kadar pertukaran"
+  },
+  "dashboard.withdraw.completion.fee": {
+    "message": "Yuran"
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "Kaedah"
+  },
+  "dashboard.withdraw.completion.net-amount": {
+    "message": "Amaun bersih"
+  },
+  "dashboard.withdraw.completion.recipient": {
+    "message": "Penerima"
+  },
+  "dashboard.withdraw.completion.title": {
+    "message": "Pengeluaran selesai"
+  },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "Transaksi"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "Dompet"
+  },
+  "dashboard.withdraw.error.generic.text": {
+    "message": "Kami tidak dapat menghantar permintaan pengeluaran anda, sila semak butiran anda atau hubungi sokongan."
+  },
+  "dashboard.withdraw.error.generic.title": {
+    "message": "Tidak dapat mengeluarkan wang"
+  },
+  "dashboard.withdraw.error.invalid-address.text": {
+    "message": "Alamat yang anda berikan tidak dapat disahkan. Sila semak butiran alamat anda."
+  },
+  "dashboard.withdraw.error.invalid-address.title": {
+    "message": "Pengesahan alamat gagal"
+  },
+  "dashboard.withdraw.error.invalid-bank.text": {
+    "message": "Butiran akaun bank yang anda berikan tidak sah. Sila sahkan maklumat anda."
+  },
+  "dashboard.withdraw.error.invalid-bank.title": {
+    "message": "Butiran bank tidak sah"
+  },
+  "dashboard.withdraw.error.invalid-wallet.text": {
+    "message": "Alamat dompet kripto yang anda berikan tidak sah. Sila semak semula dan cuba lagi."
+  },
+  "dashboard.withdraw.error.invalid-wallet.title": {
+    "message": "Alamat dompet tidak sah"
+  },
+  "dashboard.withdraw.error.minimum-not-met.text": {
+    "message": "Amaun pengeluaran (selepas yuran) tidak memenuhi keperluan minimum. Sila tingkatkan amaun pengeluaran anda."
+  },
+  "dashboard.withdraw.error.minimum-not-met.title": {
+    "message": "Amaun terlalu rendah"
+  },
+  "dashboard.withdraw.error.tax-form.text": {
+    "message": "Anda mesti melengkapkan borang cukai untuk menyerahkan permintaan pengeluaran anda."
+  },
+  "dashboard.withdraw.error.tax-form.title": {
+    "message": "Sila lengkapkan borang cukai"
+  },
   "error.collection.404.list_item.1": {
     "message": "اندا موڠکين ترساله تاءيڤ URL کوليکسي."
   },
@@ -869,6 +1220,9 @@
   "layout.action.lookup-by-email": {
     "message": "چاري ملالوءي إي-ميل"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Urus pautan afiliasi"
+  },
   "layout.action.manage-server-notices": {
     "message": "اوروس نوتيس ڤلاين"
   },
@@ -962,6 +1316,9 @@
   "layout.footer.about.status": {
     "message": "ستاتوس"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "اوندڠ‌٢"
   },
@@ -1040,6 +1397,15 @@
   "layout.meta.og-description": {
     "message": "تموءي دان تربيتکن کاندوڠن ماءينکرف‌ت!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Tutup menu"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Buka menu"
+  },
+  "layout.nav.active-reports": {
+    "message": "Laporan yang aktif"
+  },
   "layout.nav.analytics": {
     "message": "اناليتيک"
   },
@@ -1067,6 +1433,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "لامن اوتام Modrinth"
   },
+  "layout.nav.my-servers": {
+    "message": "Pelayan saya"
+  },
   "layout.nav.organizations": {
     "message": "اورݢانيساسي"
   },
@@ -1112,6 +1481,273 @@
   "moderation.technical.search.placeholder": {
     "message": "چاري ڤنيلاين تيکنيکل..."
   },
+  "muralpay.account-type.checking": {
+    "message": "Cek"
+  },
+  "muralpay.account-type.savings": {
+    "message": "Simpanan"
+  },
+  "muralpay.country.at": {
+    "message": "Austria"
+  },
+  "muralpay.country.be": {
+    "message": "Belgium"
+  },
+  "muralpay.country.cy": {
+    "message": "Cyprus"
+  },
+  "muralpay.country.de": {
+    "message": "Jerman"
+  },
+  "muralpay.country.ee": {
+    "message": "Estonia"
+  },
+  "muralpay.country.es": {
+    "message": "Sepanyol"
+  },
+  "muralpay.country.fi": {
+    "message": "Finland"
+  },
+  "muralpay.country.fr": {
+    "message": "Perancis"
+  },
+  "muralpay.country.gr": {
+    "message": "Yunani"
+  },
+  "muralpay.country.ie": {
+    "message": "Ireland"
+  },
+  "muralpay.country.it": {
+    "message": "Itali"
+  },
+  "muralpay.country.lt": {
+    "message": "Lithuania"
+  },
+  "muralpay.country.lu": {
+    "message": "Luxembourg"
+  },
+  "muralpay.country.lv": {
+    "message": "Latvia"
+  },
+  "muralpay.country.mt": {
+    "message": "Malta"
+  },
+  "muralpay.country.nl": {
+    "message": "Belanda"
+  },
+  "muralpay.country.pt": {
+    "message": "Portugal"
+  },
+  "muralpay.country.sk": {
+    "message": "Slovakia"
+  },
+  "muralpay.document-type.national-id": {
+    "message": "ID Kebangsaan"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Pasport"
+  },
+  "muralpay.document-type.resident-id": {
+    "message": "ID Penduduk"
+  },
+  "muralpay.document-type.ruc": {
+    "message": "RUC"
+  },
+  "muralpay.document-type.tax-id": {
+    "message": "ID cukai"
+  },
+  "muralpay.field.account-number": {
+    "message": "Nombor akaun"
+  },
+  "muralpay.field.account-number-cbu-cvu": {
+    "message": "Nombor akaun (CBU/CVU)"
+  },
+  "muralpay.field.account-number-cci": {
+    "message": "Nombor akaun (CCI)"
+  },
+  "muralpay.field.account-number-type": {
+    "message": "Jenis nombor akaun"
+  },
+  "muralpay.field.account-type": {
+    "message": "Jenis akaun"
+  },
+  "muralpay.field.bank-account-number": {
+    "message": "Nombor akaun"
+  },
+  "muralpay.field.branch-code": {
+    "message": "Kod cawangan"
+  },
+  "muralpay.field.clabe": {
+    "message": "CLABE"
+  },
+  "muralpay.field.country": {
+    "message": "Negara"
+  },
+  "muralpay.field.cpf-cnpj": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.field.cuit-cuil": {
+    "message": "CUIT/CUIL"
+  },
+  "muralpay.field.document-type": {
+    "message": "Jenis dokumen"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.field.phone-number": {
+    "message": "Nombor telefon"
+  },
+  "muralpay.field.pix-email": {
+    "message": "E-mel PIX"
+  },
+  "muralpay.field.pix-key-type": {
+    "message": "Jenis kunci PIX"
+  },
+  "muralpay.field.pix-phone": {
+    "message": "Telefon PIX"
+  },
+  "muralpay.field.routing-number": {
+    "message": "Nombor penghalaan"
+  },
+  "muralpay.field.swift-bic": {
+    "message": "SWIFT/BIC"
+  },
+  "muralpay.field.wallet-address": {
+    "message": "Alamat dompet"
+  },
+  "muralpay.help.cbu-cvu": {
+    "message": "Clave Bancaria Uniforme atau Clave Virtual Uniforme"
+  },
+  "muralpay.help.cci": {
+    "message": "Código de Cuenta Interbancaria"
+  },
+  "muralpay.help.clabe": {
+    "message": "Clave Bancaria Estandarizada (Nombor akaun bank Mexico)"
+  },
+  "muralpay.help.cpf-cnpj": {
+    "message": "Nombor pengenalan cukai Brazil"
+  },
+  "muralpay.help.cuit-cuil": {
+    "message": "ID cukai Argentina"
+  },
+  "muralpay.help.iban": {
+    "message": "Nombor Akaun Bank Antarabangsa (IBAN)"
+  },
+  "muralpay.help.swift-bic": {
+    "message": "Kod Pengenalpastian Bank (BIC)"
+  },
+  "muralpay.pix-type.bank-account": {
+    "message": "Akaun bank"
+  },
+  "muralpay.pix-type.document": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.pix-type.email": {
+    "message": "E-mel"
+  },
+  "muralpay.pix-type.phone": {
+    "message": "Nombor telefon"
+  },
+  "muralpay.placeholder.account-number": {
+    "message": "Masukkan nombor akaun"
+  },
+  "muralpay.placeholder.cbu-cvu": {
+    "message": "Masukkan CBU atau CVU"
+  },
+  "muralpay.placeholder.cbu-cvu-type": {
+    "message": "CBU atau CVU"
+  },
+  "muralpay.placeholder.cci": {
+    "message": "Masukkan CCI 20 digit"
+  },
+  "muralpay.placeholder.cuit-cuil": {
+    "message": "Masukkan CUIT atau CUIL"
+  },
+  "muralpay.placeholder.enter-account-number": {
+    "message": "Masukkan nombor akaun"
+  },
+  "muralpay.placeholder.enter-branch-code": {
+    "message": "Masukkan kod cawangan"
+  },
+  "muralpay.placeholder.enter-clabe": {
+    "message": "Masukkan CLABE 18 digit"
+  },
+  "muralpay.placeholder.enter-cpf-cnpj": {
+    "message": "Masukkan CPF atau CNPJ"
+  },
+  "muralpay.placeholder.enter-iban": {
+    "message": "Masukkan IBAN"
+  },
+  "muralpay.placeholder.enter-pix-email": {
+    "message": "Masukkan e-mel PIX"
+  },
+  "muralpay.placeholder.enter-routing-number": {
+    "message": "Masukkan nombor penghalaan 9 digit"
+  },
+  "muralpay.placeholder.enter-swift-bic": {
+    "message": "Masukkan kod SWIFT/BIC"
+  },
+  "muralpay.placeholder.iban-crc": {
+    "message": "Masukkan IBAN Costa Rica"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
+  "muralpay.rail.fiat-ars.name": {
+    "message": "Pindahan Bank (ARS)"
+  },
+  "muralpay.rail.fiat-brl.name": {
+    "message": "Pindahan PIX (BRL)"
+  },
+  "muralpay.rail.fiat-clp.name": {
+    "message": "Pindahan Bank (CLP)"
+  },
+  "muralpay.rail.fiat-cop.name": {
+    "message": "Pindahan Bank (COP)"
+  },
+  "muralpay.rail.fiat-crc.name": {
+    "message": "Pindahan Bank (CRC)"
+  },
+  "muralpay.rail.fiat-eur.name": {
+    "message": "Pindahan Bank (EUR)"
+  },
+  "muralpay.rail.fiat-mxn.name": {
+    "message": "Pindahan Bank (MXN)"
+  },
+  "muralpay.rail.fiat-pen.name": {
+    "message": "Pindahan Bank (PEN)"
+  },
+  "muralpay.rail.fiat-usd-peru.name": {
+    "message": "Pindahan Bank (USD - Peru)"
+  },
+  "muralpay.rail.fiat-usd.name": {
+    "message": "Pindahan Bank (USD)"
+  },
+  "muralpay.rail.fiat-zar.name": {
+    "message": "Pindahan Bank (ZAR)"
+  },
+  "muralpay.rail.usdc-base.name": {
+    "message": "USDC (Base)"
+  },
+  "muralpay.rail.usdc-celo.name": {
+    "message": "USDC (Celo)"
+  },
+  "muralpay.rail.usdc-ethereum.name": {
+    "message": "USDC (Ethereum)"
+  },
+  "muralpay.rail.usdc-polygon.name": {
+    "message": "Kripto (USDC)"
+  },
+  "muralpay.warning.wallet-address": {
+    "message": "Semak semula alamat dompet anda. Dana yang dihantar ke alamat yang salah tidak boleh dipulihkan."
+  },
   "profile.bio.fallback.creator": {
     "message": "سأورڠ ڤنچيڤتا Modrinth."
   },
@@ -1130,6 +1766,12 @@
   "profile.button.manage-projects": {
     "message": "اوروس ڤروجيک"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Alih keluar rakan afiliasi"
+  },
+  "profile.button.set-affiliate": {
+    "message": "Tetapkan sebagai rakan afiliasi"
+  },
   "profile.details.label.auth-providers": {
     "message": "ڤڽديا ڤڠصحن"
   },
@@ -1154,6 +1796,9 @@
   "profile.error.not-found": {
     "message": "ڤڠݢونا تيدق دجومڤاءي"
   },
+  "profile.label.affiliate": {
+    "message": "Afiliasi"
+  },
   "profile.label.badges": {
     "message": "لنچان"
   },
@@ -1251,7 +1896,7 @@
     "message": "سره سمولا اونتوق ڤنيلاين"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "ڤروجيک اندا تله {status} اوليه ستف Modrinth. دالم کباڽقن کيس⹁ اندا بوليه مڽرهکن سمولا اونتوق سيمقن سلڤس مناڠني ميسيج کاکيتاڠن."
+    "message": "Projek anda telah {status, select, rejected {ditolak} withheld {ditahan} other {{status}}} oleh staf Modrinth. Dalam kebanyakan kes, anda boleh menyerahkan semula untuk semakan selepas menangani masalah yang dikemukakan dalam mesej kakitangan."
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "اندا مستي ملڠکڤکن لڠکه٢ يڠ دڤرلوکن دالم سناراي سيمق ڤنربيتن!"
@@ -1658,18 +2303,6 @@
   "report.submit": {
     "message": "سيرهکن لاڤورن"
   },
-  "revenue.transfers.total": {
-    "message": "اندا تله مڠلوارکن {amount} سچارا کسلوروهن."
-  },
-  "revenue.transfers.total.method": {
-    "message": "اندا تله مڠلوارکن {amount} ملالوءي {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "اندا تله مڠلوارکن {amount} ڤد تاهون {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "اندا تله مڠلوارکن {amount} ڤد تاهون {year} ملالوءي {method}."
-  },
   "scopes.analytics.description": {
     "message": "مڠکسيس داتا اناليتيس اندا"
   },
diff --git a/apps/frontend/src/locales/ms-MY/index.json b/apps/frontend/src/locales/ms-MY/index.json
index a639277e..750e275d 100644
--- a/apps/frontend/src/locales/ms-MY/index.json
+++ b/apps/frontend/src/locales/ms-MY/index.json
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "Tidak disenaraikan"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Cipta pautan afiliasi"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Ralat semasa memuatkan pautan afiliasi"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Pautan afiliasi anda"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Ini akan membatalkan kod afiliasi `{id}` secara kekal dan sebarang pautan sedia ada dengan kod ini yang telah dikongsi tidak lagi sah."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Batalkan"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "Adakah anda pasti mahu membatalkan pautan afiliasi anda yang bernama ''{title}''?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Cari pautan afiliasi..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "Cipta baharu"
   },
@@ -614,6 +635,336 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "Adakah anda warganegara AS?"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Lengkapkan borang cukai"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Teruskan dengan had"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Butiran"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Amaun"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "Kadar FX"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Yuran"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Amaun bersih"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Entiti bisnes"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "Entiti bisnes merujuk kepada organisasi terdaftar seperti perbadanan, perkongsian atau LLC."
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "Adakah anda sedang mengeluarkan wang sebagai seorang individu atau sebuah perniagaan?"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Individu persendirian"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Pilih negara anda"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Cari negara..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "Tidak dapat mengambil kaedah pembayaran yang tersedia. Sila cuba lagi kemudian."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Gagal memuatkan kaedah pembayaran"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Rantau"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Sesetengah kaedah pembayaran tidak tersedia di rantau tertentu."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Pilih kaedah pengeluaran"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "Had pengeluaran anda ialah <b>{amount}</b>, <tax-link>lengkapkan borang cukai</tax-link> untuk mengeluarkan lebih banyak wang."
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Pemilik akaun"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Syiling"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Sahkan alamat dompet anda"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "Nombor ID kebangsaan"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "Masukkan nombor ID kebangsaan"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "Nombor pasport"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "Masukkan nombor pasport"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
+    "message": "Masukkan nombor ID penduduk"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "Masukkan nombor ID penduduk"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "Nombor RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "Masukkan nombor RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "Nombor ID cukai"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "Masukkan nombor ID cukai"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Rangkaian"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "Anda hampir mencapai ambang pengeluaran. Anda boleh mengeluarkan <b>{amountRemaining}</b> sekarang, tetapi borang cukai diperlukan untuk mengeluarkan lebih banyak wang."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Akaun"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Putuskan sambungan akaun"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Kaedah pembayaran"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "Akaun PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Sambungkan akaun PayPal anda untuk menerima pembayaran secara langsung."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Simpan"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Nama pemegang Venmo berjaya disimpan!"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Disimpan"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Daftar masuk dengan PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "Masukkan nama pemegang Venmo anda untuk menerima pembayaran."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Nama pemegang Venmo"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@nama-pengguna"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Kaedah"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Butiran Akaun"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "Pengesahan"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "Borang cukai"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "Butiran"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "Untuk mengeluarkan baki penuh anda yang tersedia sebanyak <b>{available}</b>, sila lengkapkan borang di bawah. Ia diperlukan untuk pelaporan cukai dan hanya perlu dilakukan sekali sahaja."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body-with-limit": {
+    "message": "Anda mesti melengkapkan borang W-9 atau W-8 untuk rekod cukai Modrinth supaya kami kekal mematuhi peraturan cukai."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.header": {
+    "message": "Borang cukai diperlukan"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Kaedah pembayaran"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward": {
+    "message": "Ganjaran"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "Pilih ganjaran"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
+    "message": "Ganjaran"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "E-mel yang belum disahkan"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message": {
+    "message": "E-mel penghantaran yang anda masukkan tidak dikaitkan dengan akaun Modrinth anda. Modrinth tidak dapat mendapatkan semula ganjaran yang dihantar ke alamat e-mel yang salah."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
+    "message": "Yuran lebih rendah tersedia"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message": {
+    "message": "Anda memilih USD untuk PayPal Antarabangsa. <direct-paypal-link>Tukar kepada PayPal langsung</direct-paypal-link> untuk yuran yang lebih baik (≈2% dan bukannya ≈6%)."
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Keluarkan"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit": {
+    "message": "Had pengeluaran wang"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit-used": {
+    "message": "Anda telah menggunakan had pengeluaran anda sebanyak <b>{withdrawLimit}</b>. Anda mesti melengkapkan borang cukai untuk mengeluarkan lebih banyak wang."
+  },
+  "dashboard.revenue.available-now": {
+    "message": "Tersedia sekarang"
+  },
+  "dashboard.revenue.balance": {
+    "message": "Baki"
+  },
+  "dashboard.revenue.estimated-tooltip.msg1": {
+    "message": "Anggaran hasil pendapatan mungkin tertakluk kepada perubahan sehingga ia tersedia."
+  },
+  "dashboard.revenue.estimated-tooltip.msg2": {
+    "message": "Klik untuk membaca tentang cara Modrinth mengendalikan pendapatan anda."
+  },
+  "dashboard.revenue.estimated-with-date": {
+    "message": "Anggaran {date}"
+  },
+  "dashboard.revenue.processing": {
+    "message": "Memproses"
+  },
+  "dashboard.revenue.processing.tooltip": {
+    "message": "Hasil pendapatan kekal dalam pemprosesan sehingga akhir bulan, dan kemudian akan tersedia 60 hari kemudian."
+  },
+  "dashboard.revenue.stats.received": {
+    "message": "Diterima"
+  },
+  "dashboard.revenue.stats.transactions": {
+    "message": "Transaksi"
+  },
+  "dashboard.revenue.stats.withdrawn": {
+    "message": "Telah dikeluarkan"
+  },
+  "dashboard.revenue.tos": {
+    "message": "Dengan memuat naik projek ke Modrinth dan mengeluarkan wang daripada akaun anda, anda bersetuju dengan <terms-link>Terma Program Ganjaran</terms-link> kami. Ketahui lebih lanjut tentang <info-link>Program Ganjaran</info-link> ini."
+  },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "Muat turun sebagai CSV"
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "Transaksi"
+  },
+  "dashboard.revenue.transactions.none": {
+    "message": "Tiada transaksi"
+  },
+  "dashboard.revenue.transactions.none.desc": {
+    "message": "Pembayaran dan pengeluaran anda akan dipaparkan di sini."
+  },
+  "dashboard.revenue.transactions.see-all": {
+    "message": "Lihat semua"
+  },
+  "dashboard.revenue.withdraw.blocked-tin-mismatch": {
+    "message": "Pengeluaran anda telah dikunci buat sementara waktu kerana TIN atau SSN anda tidak sepadan dengan rekod IRS. Sila hubungi sokongan untuk menetapkan semula dan menghantar semula borang cukai anda."
+  },
+  "dashboard.revenue.withdraw.card.description": {
+    "message": "Keluarkan wang daripada baki yang tersedia kepada mana-mana kaedah pembayaran."
+  },
+  "dashboard.revenue.withdraw.card.title": {
+    "message": "Pengeluaran"
+  },
+  "dashboard.revenue.withdraw.header": {
+    "message": "Pengeluaran"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "Akaun"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Amaun"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Tutup"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Tarikh"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "Anda akan menerima e-mel di <b>{email}</b> dengan arahan untuk menebus pengeluaran anda."
+  },
+  "dashboard.withdraw.completion.exchange-rate": {
+    "message": "Kadar pertukaran"
+  },
+  "dashboard.withdraw.completion.fee": {
+    "message": "Yuran"
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "Kaedah"
+  },
+  "dashboard.withdraw.completion.net-amount": {
+    "message": "Amaun bersih"
+  },
+  "dashboard.withdraw.completion.recipient": {
+    "message": "Penerima"
+  },
+  "dashboard.withdraw.completion.title": {
+    "message": "Pengeluaran selesai"
+  },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "Transaksi"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "Dompet"
+  },
+  "dashboard.withdraw.error.generic.text": {
+    "message": "Kami tidak dapat menghantar permintaan pengeluaran anda, sila semak butiran anda atau hubungi sokongan."
+  },
+  "dashboard.withdraw.error.generic.title": {
+    "message": "Tidak dapat mengeluarkan wang"
+  },
+  "dashboard.withdraw.error.invalid-address.text": {
+    "message": "Alamat yang anda berikan tidak dapat disahkan. Sila semak butiran alamat anda."
+  },
+  "dashboard.withdraw.error.invalid-address.title": {
+    "message": "Pengesahan alamat gagal"
+  },
+  "dashboard.withdraw.error.invalid-bank.text": {
+    "message": "Butiran akaun bank yang anda berikan tidak sah. Sila sahkan maklumat anda."
+  },
+  "dashboard.withdraw.error.invalid-bank.title": {
+    "message": "Butiran bank tidak sah"
+  },
+  "dashboard.withdraw.error.invalid-wallet.text": {
+    "message": "Alamat dompet kripto yang anda berikan tidak sah. Sila semak semula dan cuba lagi."
+  },
+  "dashboard.withdraw.error.invalid-wallet.title": {
+    "message": "Alamat dompet tidak sah"
+  },
+  "dashboard.withdraw.error.minimum-not-met.text": {
+    "message": "Amaun pengeluaran (selepas yuran) tidak memenuhi keperluan minimum. Sila tingkatkan amaun pengeluaran anda."
+  },
+  "dashboard.withdraw.error.minimum-not-met.title": {
+    "message": "Amaun terlalu rendah"
+  },
+  "dashboard.withdraw.error.tax-form.text": {
+    "message": "Anda mesti melengkapkan borang cukai untuk menyerahkan permintaan pengeluaran anda."
+  },
+  "dashboard.withdraw.error.tax-form.title": {
+    "message": "Sila lengkapkan borang cukai"
+  },
   "error.collection.404.list_item.1": {
     "message": "Anda mungkin tersalah taip URL koleksi."
   },
@@ -869,6 +1220,9 @@
   "layout.action.lookup-by-email": {
     "message": "Cari melalui e-mel"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Urus pautan afiliasi"
+  },
   "layout.action.manage-server-notices": {
     "message": "Urus notis pelayan"
   },
@@ -962,6 +1316,9 @@
   "layout.footer.about.status": {
     "message": "Status"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "Undang-undang"
   },
@@ -1040,6 +1397,15 @@
   "layout.meta.og-description": {
     "message": "Temui dan terbitkan kandungan Minecraft!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Tutup menu"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Buka menu"
+  },
+  "layout.nav.active-reports": {
+    "message": "Laporan yang aktif"
+  },
   "layout.nav.analytics": {
     "message": "Analitik"
   },
@@ -1067,6 +1433,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Laman utama Modrinth"
   },
+  "layout.nav.my-servers": {
+    "message": "Pelayan saya"
+  },
   "layout.nav.organizations": {
     "message": "Organisasi"
   },
@@ -1112,6 +1481,273 @@
   "moderation.technical.search.placeholder": {
     "message": "Cari penilaian teknikal..."
   },
+  "muralpay.account-type.checking": {
+    "message": "Cek"
+  },
+  "muralpay.account-type.savings": {
+    "message": "Simpanan"
+  },
+  "muralpay.country.at": {
+    "message": "Austria"
+  },
+  "muralpay.country.be": {
+    "message": "Belgium"
+  },
+  "muralpay.country.cy": {
+    "message": "Cyprus"
+  },
+  "muralpay.country.de": {
+    "message": "Jerman"
+  },
+  "muralpay.country.ee": {
+    "message": "Estonia"
+  },
+  "muralpay.country.es": {
+    "message": "Sepanyol"
+  },
+  "muralpay.country.fi": {
+    "message": "Finland"
+  },
+  "muralpay.country.fr": {
+    "message": "Perancis"
+  },
+  "muralpay.country.gr": {
+    "message": "Yunani"
+  },
+  "muralpay.country.ie": {
+    "message": "Ireland"
+  },
+  "muralpay.country.it": {
+    "message": "Itali"
+  },
+  "muralpay.country.lt": {
+    "message": "Lithuania"
+  },
+  "muralpay.country.lu": {
+    "message": "Luxembourg"
+  },
+  "muralpay.country.lv": {
+    "message": "Latvia"
+  },
+  "muralpay.country.mt": {
+    "message": "Malta"
+  },
+  "muralpay.country.nl": {
+    "message": "Belanda"
+  },
+  "muralpay.country.pt": {
+    "message": "Portugal"
+  },
+  "muralpay.country.sk": {
+    "message": "Slovakia"
+  },
+  "muralpay.document-type.national-id": {
+    "message": "ID Kebangsaan"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Pasport"
+  },
+  "muralpay.document-type.resident-id": {
+    "message": "ID Penduduk"
+  },
+  "muralpay.document-type.ruc": {
+    "message": "RUC"
+  },
+  "muralpay.document-type.tax-id": {
+    "message": "ID cukai"
+  },
+  "muralpay.field.account-number": {
+    "message": "Nombor akaun"
+  },
+  "muralpay.field.account-number-cbu-cvu": {
+    "message": "Nombor akaun (CBU/CVU)"
+  },
+  "muralpay.field.account-number-cci": {
+    "message": "Nombor akaun (CCI)"
+  },
+  "muralpay.field.account-number-type": {
+    "message": "Jenis nombor akaun"
+  },
+  "muralpay.field.account-type": {
+    "message": "Jenis akaun"
+  },
+  "muralpay.field.bank-account-number": {
+    "message": "Nombor akaun"
+  },
+  "muralpay.field.branch-code": {
+    "message": "Kod cawangan"
+  },
+  "muralpay.field.clabe": {
+    "message": "CLABE"
+  },
+  "muralpay.field.country": {
+    "message": "Negara"
+  },
+  "muralpay.field.cpf-cnpj": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.field.cuit-cuil": {
+    "message": "CUIT/CUIL"
+  },
+  "muralpay.field.document-type": {
+    "message": "Jenis dokumen"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.field.phone-number": {
+    "message": "Nombor telefon"
+  },
+  "muralpay.field.pix-email": {
+    "message": "E-mel PIX"
+  },
+  "muralpay.field.pix-key-type": {
+    "message": "Jenis kunci PIX"
+  },
+  "muralpay.field.pix-phone": {
+    "message": "Telefon PIX"
+  },
+  "muralpay.field.routing-number": {
+    "message": "Nombor penghalaan"
+  },
+  "muralpay.field.swift-bic": {
+    "message": "SWIFT/BIC"
+  },
+  "muralpay.field.wallet-address": {
+    "message": "Alamat dompet"
+  },
+  "muralpay.help.cbu-cvu": {
+    "message": "Clave Bancaria Uniforme atau Clave Virtual Uniforme"
+  },
+  "muralpay.help.cci": {
+    "message": "Código de Cuenta Interbancaria"
+  },
+  "muralpay.help.clabe": {
+    "message": "Clave Bancaria Estandarizada (Nombor akaun bank Mexico)"
+  },
+  "muralpay.help.cpf-cnpj": {
+    "message": "Nombor pengenalan cukai Brazil"
+  },
+  "muralpay.help.cuit-cuil": {
+    "message": "ID cukai Argentina"
+  },
+  "muralpay.help.iban": {
+    "message": "Nombor Akaun Bank Antarabangsa (IBAN)"
+  },
+  "muralpay.help.swift-bic": {
+    "message": "Kod Pengenalpastian Bank (BIC)"
+  },
+  "muralpay.pix-type.bank-account": {
+    "message": "Akaun bank"
+  },
+  "muralpay.pix-type.document": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.pix-type.email": {
+    "message": "E-mel"
+  },
+  "muralpay.pix-type.phone": {
+    "message": "Nombor telefon"
+  },
+  "muralpay.placeholder.account-number": {
+    "message": "Masukkan nombor akaun"
+  },
+  "muralpay.placeholder.cbu-cvu": {
+    "message": "Masukkan CBU atau CVU"
+  },
+  "muralpay.placeholder.cbu-cvu-type": {
+    "message": "CBU atau CVU"
+  },
+  "muralpay.placeholder.cci": {
+    "message": "Masukkan CCI 20 digit"
+  },
+  "muralpay.placeholder.cuit-cuil": {
+    "message": "Masukkan CUIT atau CUIL"
+  },
+  "muralpay.placeholder.enter-account-number": {
+    "message": "Masukkan nombor akaun"
+  },
+  "muralpay.placeholder.enter-branch-code": {
+    "message": "Masukkan kod cawangan"
+  },
+  "muralpay.placeholder.enter-clabe": {
+    "message": "Masukkan CLABE 18 digit"
+  },
+  "muralpay.placeholder.enter-cpf-cnpj": {
+    "message": "Masukkan CPF atau CNPJ"
+  },
+  "muralpay.placeholder.enter-iban": {
+    "message": "Masukkan IBAN"
+  },
+  "muralpay.placeholder.enter-pix-email": {
+    "message": "Masukkan e-mel PIX"
+  },
+  "muralpay.placeholder.enter-routing-number": {
+    "message": "Masukkan nombor penghalaan 9 digit"
+  },
+  "muralpay.placeholder.enter-swift-bic": {
+    "message": "Masukkan kod SWIFT/BIC"
+  },
+  "muralpay.placeholder.iban-crc": {
+    "message": "Masukkan IBAN Costa Rica"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
+  "muralpay.rail.fiat-ars.name": {
+    "message": "Pindahan Bank (ARS)"
+  },
+  "muralpay.rail.fiat-brl.name": {
+    "message": "Pindahan PIX (BRL)"
+  },
+  "muralpay.rail.fiat-clp.name": {
+    "message": "Pindahan Bank (CLP)"
+  },
+  "muralpay.rail.fiat-cop.name": {
+    "message": "Pindahan Bank (COP)"
+  },
+  "muralpay.rail.fiat-crc.name": {
+    "message": "Pindahan Bank (CRC)"
+  },
+  "muralpay.rail.fiat-eur.name": {
+    "message": "Pindahan Bank (EUR)"
+  },
+  "muralpay.rail.fiat-mxn.name": {
+    "message": "Pindahan Bank (MXN)"
+  },
+  "muralpay.rail.fiat-pen.name": {
+    "message": "Pindahan Bank (PEN)"
+  },
+  "muralpay.rail.fiat-usd-peru.name": {
+    "message": "Pindahan Bank (USD - Peru)"
+  },
+  "muralpay.rail.fiat-usd.name": {
+    "message": "Pindahan Bank (USD)"
+  },
+  "muralpay.rail.fiat-zar.name": {
+    "message": "Pindahan Bank (ZAR)"
+  },
+  "muralpay.rail.usdc-base.name": {
+    "message": "USDC (Base)"
+  },
+  "muralpay.rail.usdc-celo.name": {
+    "message": "USDC (Celo)"
+  },
+  "muralpay.rail.usdc-ethereum.name": {
+    "message": "USDC (Ethereum)"
+  },
+  "muralpay.rail.usdc-polygon.name": {
+    "message": "Kripto (USDC)"
+  },
+  "muralpay.warning.wallet-address": {
+    "message": "Semak semula alamat dompet anda. Dana yang dihantar ke alamat yang salah tidak boleh dipulihkan."
+  },
   "profile.bio.fallback.creator": {
     "message": "Seorang pencipta Modrinth."
   },
@@ -1130,6 +1766,12 @@
   "profile.button.manage-projects": {
     "message": "Urus projek"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Alih keluar rakan afiliasi"
+  },
+  "profile.button.set-affiliate": {
+    "message": "Tetapkan sebagai rakan afiliasi"
+  },
   "profile.details.label.auth-providers": {
     "message": "Penyedia pengesahan"
   },
@@ -1154,6 +1796,9 @@
   "profile.error.not-found": {
     "message": "Pengguna tidak dijumpai"
   },
+  "profile.label.affiliate": {
+    "message": "Afiliasi"
+  },
   "profile.label.badges": {
     "message": "Lencana"
   },
@@ -1251,7 +1896,7 @@
     "message": "Serah semula untuk penilaian"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Projek anda telah {status} oleh staf Modrinth. Dalam kebanyakan kes, anda boleh menyerahkan semula untuk semakan selepas menangani mesej kakitangan."
+    "message": "Projek anda telah {status, select, rejected {ditolak} withheld {ditahan} other {{status}}} oleh staf Modrinth. Dalam kebanyakan kes, anda boleh menyerahkan semula untuk semakan selepas menangani masalah yang dikemukakan dalam mesej kakitangan."
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Anda mesti melengkapkan langkah-langkah yang diperlukan dalam senarai semak penerbitan!"
@@ -1658,18 +2303,6 @@
   "report.submit": {
     "message": "Serahkan laporan"
   },
-  "revenue.transfers.total": {
-    "message": "Anda telah mengeluarkan {amount} secara keseluruhan."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Anda telah mengeluarkan {amount} melalui {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Anda telah mengeluarkan {amount} pada tahun {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Anda telah mengeluarkan {amount} pada tahun {year} melalui {method}."
-  },
   "scopes.analytics.description": {
     "message": "Mengakses data analitis anda"
   },
@@ -2226,7 +2859,7 @@
     "message": "Cipta PAT"
   },
   "settings.pats.description": {
-    "message": "PAT boleh digunakan untuk mengakses API Modrinth. Untuk mendapatkan maklumat lanjut, lihat <doc-link>Dokumentasi API Modrinth</doc-link>. Ia boleh dibuat dan ditarik balik pada bila-bila masa."
+    "message": "PAT boleh digunakan untuk mengakses API Modrinth. Untuk mendapatkan maklumat lanjut, lihat <doc-link>Dokumentasi API Modrinth</doc-link>. Ia boleh dibuat dan dibatalkan pada bila-bila masa."
   },
   "settings.pats.modal.create.action": {
     "message": "Cipta PAT"
@@ -2259,7 +2892,7 @@
     "message": "Sunting token"
   },
   "settings.pats.token.action.revoke": {
-    "message": "Tarik balik token"
+    "message": "Batalkan token"
   },
   "settings.pats.token.expired-ago": {
     "message": "Telah luput {ago}"
@@ -2298,7 +2931,7 @@
     "message": "Nama pengguna"
   },
   "settings.sessions.action.revoke-session": {
-    "message": "Tarik balik sesi"
+    "message": "Batalkan sesi"
   },
   "settings.sessions.created-ago": {
     "message": "Dicipta {ago}"
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index 16cd7770..0af0a862 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "Niepubliczny"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Utwórz link afiliacyjny"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Błąd podczas ładowania linków afiliacyjnych"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Twoje linki afiliacyjne"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Unieważni to nieodwołalnie kod afiliacyjny `{id}`. Wszystkie udostępnione linki używające tego kodu zostaną unieważnione."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Unieważnij"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "Czy na pewno chcesz unieważnić link afiliacyjny \"{title}\"?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Szukaj linku afiliacyjnego..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "Stwórz nową"
   },
@@ -614,6 +635,339 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "Czy jesteś obywatelem Stanów Zjednoczonych?"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Wypełnij formularz podatkowy"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Kontynuuj z limitem"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Szczegóły"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Kwota"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "Kurs walutowy"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Opłata"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Kwota netto"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Podmiot gospodarczy"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "Podmiot gospodarczy to na przykład korporacja, spółka osobowa bądź sp. z o.o."
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "Czy wypłacasz jako osoba prywatna, czy jako podmiot gospodarczy?"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Osoba prywatna"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Wybierz swój kraj"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Szukaj kraju..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "Nie udało się odczytać dostępnych metod płatniczych. Spróbuj ponownie później."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Nie udało się odczytać dostępnych metod płatniczych"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Region"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Niektóre sposoby wypłacania nie są dostępne w niektórych regionach."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Wybierz metodę wypłacania"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "Twój limit wypłat wynosi <b>{amount}</b>, <tax-link>wypełnij formularz podatkowy</tax-link> by wypłacić więcej."
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Właściciel konta"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Waluta"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Potwierdź adres portfela"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "Numer identyfikatora krajowego"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "Podaj numer identyfikatora krajowego"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "Numer paszportu"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "Podaj numer paszportu"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
+    "message": "Numer identyfikatora rezydenta"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "Podaj numer identyfikatora rezydenta"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "Numer RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "Podaj numer RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "Numer identyfikatora podatkowego"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "Podaj numer identyfikatora podatkowego"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Sieć"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "Niedługo przekroczysz limit wypłat. Możesz wypłacić jeszcze <b>{amountRemaining}</b>. By wypłacić więcej, musisz wypełnić formularz podatkowy."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Konto"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Odłącz konto"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Metoda płatności"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "Konto PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Połącz konto PayPal, by bezpośrednio otrzymywać wypłaty."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Zapisz"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Nazwa użytkownika Venmo została zapisana pomyślnie!"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Zapisano"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Zaloguj się z PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "Podaj nazwę użytkownika Venmo, by otrzymywać wypłaty."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Nazwa użytkownika Venmo"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@nazwa_użytkownika"
+  },
+  "dashboard.creator-withdraw-modal.stage.completion": {
+    "message": "Zakończ"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Metoda"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Szczegóły konta"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "Weryfikacja"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "Formularz podatkowy"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "Szczegóły"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "By wypłacić całe saldo konta (<b>{available}</b>) musisz wypełnić ten formularz. Jest on wymagany dla sprawozdawczości podatkowej i musi być wypełniony tylko raz."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body-with-limit": {
+    "message": "Musisz wypełnić formularz podatkowy W-9 lub W-8 dla zapisów podatkowych Modrinth, abyśmy mogli zachować zgodność z przepisami podatkowymi."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.header": {
+    "message": "Wymagany jest formularz podatkowy"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Metoda płatności"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward": {
+    "message": "Nagroda"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "Wybierz nagrodę"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
+    "message": "Nagrody"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "Adres e-mail nie jest zweryfikowany"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message": {
+    "message": "Podany adres e-mail nie jest powiązany z Twoim kontem Modrinth. Modrinth nie może odzyskać nagród wysłanych na niepoprawny adres e-mail."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
+    "message": "Dostępne niższe opłaty"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message": {
+    "message": "Wybrano walutę USD w opcji międzynarodowej PayPal. <direct-paypal-link>Przełącz się na bezpośredni PayPal</direct-paypal-link> dla niższych opłat (≈2% zamiast ≈6%)."
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Wypłać"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit": {
+    "message": "Limit wypłat"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit-used": {
+    "message": "Przekroczono limit wypłat (<b>{withdrawLimit}</b>). Musisz wypełnić formularz podatkowy, by wypłacić więcej."
+  },
+  "dashboard.revenue.available-now": {
+    "message": "Dostępne teraz"
+  },
+  "dashboard.revenue.balance": {
+    "message": "Saldo"
+  },
+  "dashboard.revenue.estimated-tooltip.msg1": {
+    "message": "Szacunkowe przychody mogą ulec zmianie do momentu ich udostępnienia."
+  },
+  "dashboard.revenue.estimated-tooltip.msg2": {
+    "message": "Kliknij tutaj, by dowiedzieć się, jak Modrinth oblicza Twoje przychody."
+  },
+  "dashboard.revenue.estimated-with-date": {
+    "message": "Oszacowane na {date}"
+  },
+  "dashboard.revenue.processing": {
+    "message": "Przetwarzane"
+  },
+  "dashboard.revenue.processing.tooltip": {
+    "message": "Przychody są przetwarzane do końca miesiąca, po czym są dostępne 60 dni później."
+  },
+  "dashboard.revenue.stats.received": {
+    "message": "Otrzymane"
+  },
+  "dashboard.revenue.stats.transactions": {
+    "message": "Transakcje"
+  },
+  "dashboard.revenue.stats.withdrawn": {
+    "message": "Wypłacone"
+  },
+  "dashboard.revenue.tos": {
+    "message": "Udostępniając projekty na Modrinth i wypłacając pieniądze z konta, wyrażasz zgodę na <terms-link>Warunki programu wynagrodzenia</terms-link>. Dowiedz się więcej o <info-link>programie wynagrodzenia</info-link>."
+  },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "Pobierz jako CSV"
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "Transakcje"
+  },
+  "dashboard.revenue.transactions.none": {
+    "message": "Brak transakcji"
+  },
+  "dashboard.revenue.transactions.none.desc": {
+    "message": "Tutaj pojawią się otrzymane fundusze i wypłaty."
+  },
+  "dashboard.revenue.transactions.see-all": {
+    "message": "Pokaż wszystkie"
+  },
+  "dashboard.revenue.withdraw.blocked-tin-mismatch": {
+    "message": "Twoje wypłaty są tymczasowo zablokowane, ponieważ Twój TIN lub SSN nie pasował do zapisów IRS. Skontaktuj się z obsługą, by resetować i ponownie wysłać Twój formularz podatkowy."
+  },
+  "dashboard.revenue.withdraw.card.description": {
+    "message": "Wypłać z salda Twojego konta poprzez daną metodę płatności."
+  },
+  "dashboard.revenue.withdraw.card.title": {
+    "message": "Wypłata"
+  },
+  "dashboard.revenue.withdraw.header": {
+    "message": "Wypłata"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "Konto"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Kwota"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Zamknij"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Data"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "Otrzymasz e-mail na adres <b>{email}</b> z instrukcjami, jak otrzymać wypłatę."
+  },
+  "dashboard.withdraw.completion.exchange-rate": {
+    "message": "Kurs walut"
+  },
+  "dashboard.withdraw.completion.fee": {
+    "message": "Opłata"
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "Metoda"
+  },
+  "dashboard.withdraw.completion.net-amount": {
+    "message": "Kwota netto"
+  },
+  "dashboard.withdraw.completion.recipient": {
+    "message": "Odbiorca"
+  },
+  "dashboard.withdraw.completion.title": {
+    "message": "Wypłata ukończona"
+  },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "Transakcje"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "Portfel"
+  },
+  "dashboard.withdraw.error.generic.text": {
+    "message": "Nie udało się przesłać prośby o wypłatę, sprawdź podane dane lub skontaktuj się z obsługą."
+  },
+  "dashboard.withdraw.error.generic.title": {
+    "message": "Wypłata nie powiodła się"
+  },
+  "dashboard.withdraw.error.invalid-address.text": {
+    "message": "Podany adres nie mógł być zweryfikowany. Sprawdź ponownie adres."
+  },
+  "dashboard.withdraw.error.invalid-address.title": {
+    "message": "Weryfikacja adresu nie powiodła się"
+  },
+  "dashboard.withdraw.error.invalid-bank.text": {
+    "message": "Podane detale bankowe są nieprawidłowe. Zweryfikuj podane informacje."
+  },
+  "dashboard.withdraw.error.invalid-bank.title": {
+    "message": "Nieprawidłowe detale bankowe"
+  },
+  "dashboard.withdraw.error.invalid-wallet.text": {
+    "message": "Podany portfel krypto jest nieprawidłowy. Zweryfikuj podane informacje."
+  },
+  "dashboard.withdraw.error.invalid-wallet.title": {
+    "message": "Nieprawidłowy adres portfela"
+  },
+  "dashboard.withdraw.error.minimum-not-met.text": {
+    "message": "Kwota do wypłaty (po opłatach) jest zbyt niska. Podaj wyższą kwotę do wypłaty."
+  },
+  "dashboard.withdraw.error.minimum-not-met.title": {
+    "message": "Zbyt niska kwota"
+  },
+  "dashboard.withdraw.error.tax-form.text": {
+    "message": "Musisz wypełnić formularz podatkowy, by móc złożyć wniosek o wypłatę."
+  },
+  "dashboard.withdraw.error.tax-form.title": {
+    "message": "Wypełnij formularz podatkowy"
+  },
   "error.collection.404.list_item.1": {
     "message": "Mogłeś źle napisać URL kolekcji."
   },
@@ -869,6 +1223,9 @@
   "layout.action.lookup-by-email": {
     "message": "Szukaj po e-mailu"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Zarządzaj linkami afiliacyjnymi"
+  },
   "layout.action.manage-server-notices": {
     "message": "Zarządzaj ogłoszeniami serwera"
   },
@@ -957,11 +1314,14 @@
     "message": "Wiadomości"
   },
   "layout.footer.about.rewards-program": {
-    "message": "Program nagród"
+    "message": "Program wynagrodzenia"
   },
   "layout.footer.about.status": {
     "message": "Status"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "Polityka"
   },
@@ -1040,6 +1400,15 @@
   "layout.meta.og-description": {
     "message": "Odkrywaj i publikuj zawartość Minecraft!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Zamknij menu"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Otwórz menu"
+  },
+  "layout.nav.active-reports": {
+    "message": "Aktywne raporty"
+  },
   "layout.nav.analytics": {
     "message": "Analizy"
   },
@@ -1067,6 +1436,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Strona główna Modrinth"
   },
+  "layout.nav.my-servers": {
+    "message": "Moje serwery"
+  },
   "layout.nav.organizations": {
     "message": "Organizacje"
   },
@@ -1112,6 +1484,273 @@
   "moderation.technical.search.placeholder": {
     "message": "Wyszukaj recenzje technologiczne..."
   },
+  "muralpay.account-type.checking": {
+    "message": "Czekowe"
+  },
+  "muralpay.account-type.savings": {
+    "message": "Oszczędnościowe"
+  },
+  "muralpay.country.at": {
+    "message": "Austria"
+  },
+  "muralpay.country.be": {
+    "message": "Belgia"
+  },
+  "muralpay.country.cy": {
+    "message": "Cypr"
+  },
+  "muralpay.country.de": {
+    "message": "Niemcy"
+  },
+  "muralpay.country.ee": {
+    "message": "Estonia"
+  },
+  "muralpay.country.es": {
+    "message": "Hiszpania"
+  },
+  "muralpay.country.fi": {
+    "message": "Finlandia"
+  },
+  "muralpay.country.fr": {
+    "message": "Francja"
+  },
+  "muralpay.country.gr": {
+    "message": "Grecja"
+  },
+  "muralpay.country.ie": {
+    "message": "Irlandia"
+  },
+  "muralpay.country.it": {
+    "message": "Włochy"
+  },
+  "muralpay.country.lt": {
+    "message": "Litwa"
+  },
+  "muralpay.country.lu": {
+    "message": "Luksemburg"
+  },
+  "muralpay.country.lv": {
+    "message": "Łotwa"
+  },
+  "muralpay.country.mt": {
+    "message": "Malta"
+  },
+  "muralpay.country.nl": {
+    "message": "Niderlandy"
+  },
+  "muralpay.country.pt": {
+    "message": "Portugalia"
+  },
+  "muralpay.country.sk": {
+    "message": "Słowacja"
+  },
+  "muralpay.document-type.national-id": {
+    "message": "Identyfikator krajowy"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Paszport"
+  },
+  "muralpay.document-type.resident-id": {
+    "message": "Identyfikator rezydenta"
+  },
+  "muralpay.document-type.ruc": {
+    "message": "RUC"
+  },
+  "muralpay.document-type.tax-id": {
+    "message": "Identyfikator podatkowy"
+  },
+  "muralpay.field.account-number": {
+    "message": "Numer konta"
+  },
+  "muralpay.field.account-number-cbu-cvu": {
+    "message": "Numer konta (CBU/CVU)"
+  },
+  "muralpay.field.account-number-cci": {
+    "message": "Numer konta (CCI)"
+  },
+  "muralpay.field.account-number-type": {
+    "message": "Rodzaj numeru konta"
+  },
+  "muralpay.field.account-type": {
+    "message": "Rodzaj konta"
+  },
+  "muralpay.field.bank-account-number": {
+    "message": "Numer konta"
+  },
+  "muralpay.field.branch-code": {
+    "message": "Kod oddziału"
+  },
+  "muralpay.field.clabe": {
+    "message": "CLABE"
+  },
+  "muralpay.field.country": {
+    "message": "Kraj"
+  },
+  "muralpay.field.cpf-cnpj": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.field.cuit-cuil": {
+    "message": "CUIT/CUIL"
+  },
+  "muralpay.field.document-type": {
+    "message": "Rodzaj dokumentu"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.field.phone-number": {
+    "message": "Numer tel."
+  },
+  "muralpay.field.pix-email": {
+    "message": "E-mail PIX"
+  },
+  "muralpay.field.pix-key-type": {
+    "message": "Rodzaj klucza PIX"
+  },
+  "muralpay.field.pix-phone": {
+    "message": "Tel. PIX"
+  },
+  "muralpay.field.routing-number": {
+    "message": "Numer rozliczeniowy"
+  },
+  "muralpay.field.swift-bic": {
+    "message": "SWIFT/BIC"
+  },
+  "muralpay.field.wallet-address": {
+    "message": "Adres portfela"
+  },
+  "muralpay.help.cbu-cvu": {
+    "message": "Clave Bancaria Uniforme lub Clave Virtual Uniforme"
+  },
+  "muralpay.help.cci": {
+    "message": "Código de Cuenta Interbancaria"
+  },
+  "muralpay.help.clabe": {
+    "message": "Clave Bancaria Estandarizada (Meksykański numer konta bankowego)"
+  },
+  "muralpay.help.cpf-cnpj": {
+    "message": "Brazylijski numer identyfikacyjny podatków"
+  },
+  "muralpay.help.cuit-cuil": {
+    "message": "Argentyńskie ID podatków"
+  },
+  "muralpay.help.iban": {
+    "message": "Międzynarodowy numer rachunku bankowego (IBAN)"
+  },
+  "muralpay.help.swift-bic": {
+    "message": "Kod identyfikujący bank (BIC)"
+  },
+  "muralpay.pix-type.bank-account": {
+    "message": "Konto bankowe"
+  },
+  "muralpay.pix-type.document": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.pix-type.email": {
+    "message": "E-mail"
+  },
+  "muralpay.pix-type.phone": {
+    "message": "Numer tel."
+  },
+  "muralpay.placeholder.account-number": {
+    "message": "Podaj numer konta"
+  },
+  "muralpay.placeholder.cbu-cvu": {
+    "message": "Podaj CBU lub CVU"
+  },
+  "muralpay.placeholder.cbu-cvu-type": {
+    "message": "CBU lub CVU"
+  },
+  "muralpay.placeholder.cci": {
+    "message": "Podaj 20-cyfrowe CCI"
+  },
+  "muralpay.placeholder.cuit-cuil": {
+    "message": "Podaj CUIT lub CUIL"
+  },
+  "muralpay.placeholder.enter-account-number": {
+    "message": "Podaj numer konta"
+  },
+  "muralpay.placeholder.enter-branch-code": {
+    "message": "Podaj kod oddziału"
+  },
+  "muralpay.placeholder.enter-clabe": {
+    "message": "Podaj 18-cyfrowe CLABE"
+  },
+  "muralpay.placeholder.enter-cpf-cnpj": {
+    "message": "Podaj CPF lub CNPJ"
+  },
+  "muralpay.placeholder.enter-iban": {
+    "message": "Podaj IBAN"
+  },
+  "muralpay.placeholder.enter-pix-email": {
+    "message": "Podaj e-mail PIX"
+  },
+  "muralpay.placeholder.enter-routing-number": {
+    "message": "Podaj 9-cyfrowy numer rozliczeniowy"
+  },
+  "muralpay.placeholder.enter-swift-bic": {
+    "message": "Podaj kod SWIFT/BIC"
+  },
+  "muralpay.placeholder.iban-crc": {
+    "message": "Podaj kostarykański IBAN"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
+  "muralpay.rail.fiat-ars.name": {
+    "message": "Przelew bankowy (ARS)"
+  },
+  "muralpay.rail.fiat-brl.name": {
+    "message": "Przelew PIX (BRL)"
+  },
+  "muralpay.rail.fiat-clp.name": {
+    "message": "Przelew bankowy (CLP)"
+  },
+  "muralpay.rail.fiat-cop.name": {
+    "message": "Przelew bankowy (COP)"
+  },
+  "muralpay.rail.fiat-crc.name": {
+    "message": "Przelew bankowy (CRC)"
+  },
+  "muralpay.rail.fiat-eur.name": {
+    "message": "Przelew bankowy (EUR)"
+  },
+  "muralpay.rail.fiat-mxn.name": {
+    "message": "Przelew bankowy (MXN)"
+  },
+  "muralpay.rail.fiat-pen.name": {
+    "message": "Przelew bankowy (PEN)"
+  },
+  "muralpay.rail.fiat-usd-peru.name": {
+    "message": "Przelew bankowy (USD - Peru)"
+  },
+  "muralpay.rail.fiat-usd.name": {
+    "message": "Przelew bankowy (USD)"
+  },
+  "muralpay.rail.fiat-zar.name": {
+    "message": "Przelew bankowy (ZAR)"
+  },
+  "muralpay.rail.usdc-base.name": {
+    "message": "USDC (Base)"
+  },
+  "muralpay.rail.usdc-celo.name": {
+    "message": "USDC (Celo)"
+  },
+  "muralpay.rail.usdc-ethereum.name": {
+    "message": "USDC (Ethereum)"
+  },
+  "muralpay.rail.usdc-polygon.name": {
+    "message": "Krypto (USDC)"
+  },
+  "muralpay.warning.wallet-address": {
+    "message": "Sprawdź podwójnie adres portfela. Fundusze przesłane na nieprawidłowy portfel nie mogą być odzyskane."
+  },
   "profile.bio.fallback.creator": {
     "message": "Twórca Modrinth."
   },
@@ -1130,6 +1769,12 @@
   "profile.button.manage-projects": {
     "message": "Zarządzaj projektami"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Usuń afiliację"
+  },
+  "profile.button.set-affiliate": {
+    "message": "Ustaw jako afiliację"
+  },
   "profile.details.label.auth-providers": {
     "message": "Dostawcy uwierzytelniania"
   },
@@ -1154,6 +1799,9 @@
   "profile.error.not-found": {
     "message": "Nie znaleziono użytkownika"
   },
+  "profile.label.affiliate": {
+    "message": "Afiliacja"
+  },
   "profile.label.badges": {
     "message": "Odznaki"
   },
@@ -1251,7 +1899,7 @@
     "message": "Wyślij ponownie do przeglądu"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Twój projekt został {status} przez pracowników Modrinth. W większości przypadków możesz ponownie przesłać go do oceny po uwzględnieniu uwag pracowników."
+    "message": "Twój projekt został {status, select, rejected {odrzucony} witheld {wstrzymany} other {{status}}} przez zespół Modrinth. W większości przypadków możesz ponownie wysłać swój projekt do sprawdzenia po rozwiązaniu wspomnianego problemu."
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Należy wykonać wszystkie czynności wymienione w liście kontrolnej dotyczącej publikacji!"
@@ -1658,18 +2306,6 @@
   "report.submit": {
     "message": "Wyślij zgłoszenie"
   },
-  "revenue.transfers.total": {
-    "message": "Razem wypłacono {amount}."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Wypłacono {amount} przez {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "W roku {year} wypłaciłeś kwotę {amount}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "W roku {year} wypłaciłeś {amount} za pomocą {method}."
-  },
   "scopes.analytics.description": {
     "message": "Dostęp do danych analityki"
   },
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index d56e337d..3e6335f6 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -566,6 +566,15 @@
   "create.project.visibility-unlisted": {
     "message": "Não listado"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Criar link de afiliado"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Seus links de afiliado"
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Revogar"
+  },
   "dashboard.collections.button.create-new": {
     "message": "Criar nova"
   },
@@ -614,6 +623,30 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "Você é um cidadão americano?"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Preencha o formulário fiscal"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Detalhes"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Taxa"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "Seu limite de saque é de <b>{amount}</b>. <tax-link>Preencha um formulário fiscal</tax-link> para sacar mais."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@usuário"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "Detalhes"
+  },
+  "dashboard.revenue.balance": {
+    "message": "Saldo"
+  },
+  "dashboard.revenue.withdraw.card.description": {
+    "message": "Transfira o saldo disponível usando o método de pagamento desejado."
+  },
   "error.collection.404.list_item.1": {
     "message": "Você pode ter digitado incorretamente o URL da coleção."
   },
@@ -869,6 +902,9 @@
   "layout.action.lookup-by-email": {
     "message": "Procurar por e-mail"
   },
+  "layout.action.manage-affiliates": {
+    "message": "Gerenciar links de afiliado"
+  },
   "layout.action.manage-server-notices": {
     "message": "Gerenciar notificações do servidor"
   },
@@ -1130,6 +1166,9 @@
   "profile.button.manage-projects": {
     "message": "Gerenciar projetos"
   },
+  "profile.button.remove-affiliate": {
+    "message": "Remover como afiliado"
+  },
   "profile.details.label.auth-providers": {
     "message": "Provedores de autenticação"
   },
@@ -1154,6 +1193,9 @@
   "profile.error.not-found": {
     "message": "Usuário não encontrado"
   },
+  "profile.label.affiliate": {
+    "message": "Afiliado"
+  },
   "profile.label.badges": {
     "message": "Emblemas"
   },
@@ -1250,9 +1292,6 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "Reenviar para revisão"
   },
-  "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Seu projeto foi {status} pela equipe do Modrinth. Na maioria dos casos, você pode enviar uma revisão após resolver a mensagem da equipe."
-  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Você precisa completar as etapas necessárias nas tarefas de publicação!"
   },
@@ -1658,18 +1697,6 @@
   "report.submit": {
     "message": "Enviar denúncia"
   },
-  "revenue.transfers.total": {
-    "message": "Você sacou {amount} no total."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Você sacou {amount} através de {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Você sacou {amount} em {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Você sacou {amount} em {year} através de {method}."
-  },
   "scopes.analytics.description": {
     "message": "Acessas suas estatísticas"
   },
@@ -1934,12 +1961,6 @@
   "servers.backups.item.creating-backup": {
     "message": "Criando backup..."
   },
-  "servers.backups.item.downloading": {
-    "message": "Baixando"
-  },
-  "servers.backups.item.downloading-backup": {
-    "message": "Baixando backup..."
-  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Falha ao criar um backup"
   },
diff --git a/apps/frontend/src/locales/pt-PT/index.json b/apps/frontend/src/locales/pt-PT/index.json
index ef322e6f..a03661d2 100644
--- a/apps/frontend/src/locales/pt-PT/index.json
+++ b/apps/frontend/src/locales/pt-PT/index.json
@@ -425,6 +425,168 @@
   "common.yes": {
     "message": "Sim"
   },
+  "create.collection.cancel": {
+    "message": "Cancelar"
+  },
+  "create.collection.collection-info": {
+    "message": "A tua nova coleção vai ser criada como uma coleção pública {count, plural,=0 {sem projetos}one {com # projeto}other {com # projetos}}."
+  },
+  "create.collection.create-collection": {
+    "message": "Criar coleção"
+  },
+  "create.collection.error-title": {
+    "message": "Ocorreu um erro"
+  },
+  "create.collection.name-label": {
+    "message": "Nome"
+  },
+  "create.collection.name-placeholder": {
+    "message": "Insere o nome da coleção..."
+  },
+  "create.collection.summary-description": {
+    "message": "Uma ou duas frases que descrevem a tua coleção."
+  },
+  "create.collection.summary-label": {
+    "message": "Resumo"
+  },
+  "create.collection.summary-placeholder": {
+    "message": "Isto é uma coleção de..."
+  },
+  "create.collection.title": {
+    "message": "Criar uma coleção"
+  },
+  "create.limit-alert.approaching-limit": {
+    "message": "A alcançar o limite de {typePlural} ({current}/{max})"
+  },
+  "create.limit-alert.approaching-limit-description": {
+    "message": "Estás prestes a atingir o limite de {typePlural}, por favor contacta o suporte se precisas de mais do que {max} {typePlural}."
+  },
+  "create.limit-alert.contact-support": {
+    "message": "Contacta o suporte"
+  },
+  "create.limit-alert.limit-reached": {
+    "message": "limite de {typePlural} atingido"
+  },
+  "create.limit-alert.limit-reached-description": {
+    "message": "Atingiste o teu limite de {typePlural} de {max}. Por favor contacta o suporte para aumentar o teu limite."
+  },
+  "create.limit-alert.type-collection": {
+    "message": "coleção"
+  },
+  "create.limit-alert.type-organization": {
+    "message": "organização"
+  },
+  "create.limit-alert.type-plural-collection": {
+    "message": "coleções"
+  },
+  "create.limit-alert.type-plural-organization": {
+    "message": "organizações"
+  },
+  "create.limit-alert.type-plural-project": {
+    "message": "projetos"
+  },
+  "create.limit-alert.type-project": {
+    "message": "projeto"
+  },
+  "create.organization.cancel": {
+    "message": "Cancelar"
+  },
+  "create.organization.create-organization": {
+    "message": "Criar organização"
+  },
+  "create.organization.error-title": {
+    "message": "Ocorreu um erro"
+  },
+  "create.organization.name-label": {
+    "message": "Nome"
+  },
+  "create.organization.name-placeholder": {
+    "message": "Inserir nome da organização..."
+  },
+  "create.organization.ownership-info": {
+    "message": "Serás o dono desta organização, mas podes convidar outros membros e transferir o cargo de dono a qualquer momento."
+  },
+  "create.organization.summary-description": {
+    "message": "Uma ou duas frases que descrevem a tua organização."
+  },
+  "create.organization.summary-label": {
+    "message": "Resumo"
+  },
+  "create.organization.summary-placeholder": {
+    "message": "Uma organização para..."
+  },
+  "create.organization.title": {
+    "message": "Criar uma organização"
+  },
+  "create.organization.url-label": {
+    "message": "URL"
+  },
+  "create.project.cancel": {
+    "message": "Cancelar"
+  },
+  "create.project.create-project": {
+    "message": "Criar projeto"
+  },
+  "create.project.error-title": {
+    "message": "Ocorreu um erro"
+  },
+  "create.project.name-label": {
+    "message": "Nome"
+  },
+  "create.project.name-placeholder": {
+    "message": "Insere o nome do projeto..."
+  },
+  "create.project.summary-description": {
+    "message": "Uma ou duas frases que descrevem o teu projeto."
+  },
+  "create.project.summary-label": {
+    "message": "Resumo"
+  },
+  "create.project.summary-placeholder": {
+    "message": "Este projeto adiciona..."
+  },
+  "create.project.title": {
+    "message": "Criar um projeto"
+  },
+  "create.project.url-label": {
+    "message": "URL"
+  },
+  "create.project.visibility-description": {
+    "message": "A visibilidade do teu projeto após ser aprovado."
+  },
+  "create.project.visibility-label": {
+    "message": "Visibilidade"
+  },
+  "create.project.visibility-private": {
+    "message": "Privado"
+  },
+  "create.project.visibility-public": {
+    "message": "Público"
+  },
+  "create.project.visibility-unlisted": {
+    "message": "Não listado"
+  },
+  "dashboard.affiliate-links.create.button": {
+    "message": "Criar link de afiliado"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Erro a carregar links de afiliado"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "Os teus links de afiliado"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Isto vai revogar permanentemente o código de afiliado \"{id}\" e quaisquer links partilhados com este código deixarão de ser válidos."
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "Revogar"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "Tens a certeza que queres revogar o teu link de afiliado \"{title}\"?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Procurar links de afiliado..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "Criar nova"
   },
@@ -437,6 +599,105 @@
   "dashboard.collections.long-title": {
     "message": "As tuas coleções"
   },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Transferir {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.success": {
+    "message": "O teu formulário de imposto {formType} foi enviado com sucesso!"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.support-text": {
+    "message": "Podes levantar fundos livremente agora. Se tiveres dúvidas ou precisares de atualizar os teus detalhes <support-link>contacta o suporte</support-link>."
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Está tudo feito! 🎉"
+  },
+  "dashboard.creator-tax-form-modal.entity.description": {
+    "message": "Uma entidade estrangeira é uma entidade empresarial organizada fora dos Estados Unidos (tais como uma corporação, parceria ou LLC não americanas)."
+  },
+  "dashboard.creator-tax-form-modal.entity.foreign-entity": {
+    "message": "Entidade estrangeira"
+  },
+  "dashboard.creator-tax-form-modal.entity.private-individual": {
+    "message": "Indivíduo privado"
+  },
+  "dashboard.creator-tax-form-modal.entity.question": {
+    "message": "És um indivíduo privado ou parte de uma entidade estrangeira?"
+  },
+  "dashboard.creator-tax-form-modal.header": {
+    "message": "Formulário de imposto"
+  },
+  "dashboard.creator-tax-form-modal.security.description": {
+    "message": "Modrinth usa o provedor externo Track1099 para recolher e armazenar os teus formulários de imposto com segurança. <security-link>Sabe mais aqui.</security-link>"
+  },
+  "dashboard.creator-tax-form-modal.security.header": {
+    "message": "Práticas de segurança"
+  },
+  "dashboard.creator-tax-form-modal.us-citizen.question": {
+    "message": "És um cidadão dos EUA?"
+  },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Completar o formulário de imposto"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Continuar com limite"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Detalhes"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Quantia"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "Taxa de câmbio"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Taxa"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Valor líquido"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Entidade empresarial"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "Uma entidade empresarial refere-se a uma organização registada tais como uma corporação, parceria, ou LLC."
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "Estás a levantar como indivíduo ou como negócio?"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Indivíduo privado"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Seleciona o teu país"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Pesquisar países..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "Não foi possível obter os métodos de pagamento disponíveis. Tenta novamente mais tarde."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Erro a carregar os métodos de pagamento"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Região"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Moeda"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Guardar"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Guardado"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@nome de utilizador"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Levantar"
+  },
   "error.collection.404.list_item.1": {
     "message": "Podes ter inserido incorretamente o URL da coleção."
   },
@@ -612,7 +873,7 @@
     "message": "plugins"
   },
   "landing.heading.the-place-for-minecraft.resource-packs": {
-    "message": "pacote de recursos"
+    "message": "pacotes de recursos"
   },
   "landing.heading.the-place-for-minecraft.servers": {
     "message": "servidores"
@@ -881,6 +1142,69 @@
   "moderation.technical.search.placeholder": {
     "message": "Pesquisar revisões técnicas..."
   },
+  "muralpay.country.at": {
+    "message": "Áustria"
+  },
+  "muralpay.country.be": {
+    "message": "Bélgica"
+  },
+  "muralpay.country.cy": {
+    "message": "Chipre"
+  },
+  "muralpay.country.de": {
+    "message": "Alemanha"
+  },
+  "muralpay.country.ee": {
+    "message": "Estónia"
+  },
+  "muralpay.country.es": {
+    "message": "Espanha"
+  },
+  "muralpay.country.fi": {
+    "message": "Finlândia"
+  },
+  "muralpay.country.fr": {
+    "message": "França"
+  },
+  "muralpay.country.gr": {
+    "message": "Grécia"
+  },
+  "muralpay.country.ie": {
+    "message": "Irlanda"
+  },
+  "muralpay.country.it": {
+    "message": "Itália"
+  },
+  "muralpay.country.lt": {
+    "message": "Lituânia"
+  },
+  "muralpay.country.lu": {
+    "message": "Luxemburgo"
+  },
+  "muralpay.country.lv": {
+    "message": "Letónia"
+  },
+  "muralpay.country.mt": {
+    "message": "Malta"
+  },
+  "muralpay.country.nl": {
+    "message": "Holanda"
+  },
+  "muralpay.country.pt": {
+    "message": "Portugal"
+  },
+  "muralpay.country.sk": {
+    "message": "Eslováquia"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
   "profile.button.billing": {
     "message": "Gerir faturação do utilizador"
   },
@@ -899,6 +1223,9 @@
   "profile.label.details": {
     "message": "Detalhes"
   },
+  "profile.label.no": {
+    "message": "Não"
+  },
   "profile.label.no-collections": {
     "message": "Este utilizador não tem coleções!"
   },
@@ -914,6 +1241,12 @@
   "profile.label.organizations": {
     "message": "Organizações"
   },
+  "profile.label.saving": {
+    "message": "A guardar..."
+  },
+  "profile.label.yes": {
+    "message": "Sim"
+  },
   "profile.meta.description": {
     "message": "Transfere os projetos de {username} no Modrinth"
   },
@@ -965,9 +1298,6 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "Reenviar para revisão"
   },
-  "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "O teu projeto foi {status} pela equipa do Modrinth. Na maior parte dos casos, podes reenviar para revisão após resolver o que foi mencionado na mensagem da equipa."
-  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Deves completar os passos necessários na lista de verificação de publicação!"
   },
@@ -1367,18 +1697,6 @@
   "report.submit": {
     "message": "Enviar denúncia"
   },
-  "revenue.transfers.total": {
-    "message": "Levantaste {amount} no total."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Levantaste {amount} através de {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Levantaste {amount} em {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Levantaste {amount} em {year} através de {method}."
-  },
   "scopes.analytics.description": {
     "message": "Acede às tuas estatísticas"
   },
diff --git a/apps/frontend/src/locales/ro-RO/index.json b/apps/frontend/src/locales/ro-RO/index.json
index a034388b..fb137378 100644
--- a/apps/frontend/src/locales/ro-RO/index.json
+++ b/apps/frontend/src/locales/ro-RO/index.json
@@ -1190,9 +1190,6 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "Retrimite pentru revizuire"
   },
-  "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Proiectul tău a fost {status} de către echipa Modrinth. În cele mai multe cazuri, poți retrimite pentru revizuire după ce ai rezolvat mesajul echipei."
-  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Trebuie să completezi pașii necesari din lista de verificare pentru publicare!"
   },
@@ -1598,18 +1595,6 @@
   "report.submit": {
     "message": "Trimite raportul"
   },
-  "revenue.transfers.total": {
-    "message": "Ați retras în total {amount}."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Ați retras {amount} prin {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Ați retras {amount} în {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Ați retras suma de {amount} în anul {year} prin intermediul {method}."
-  },
   "scopes.analytics.description": {
     "message": "Accesați-vă datele analitice"
   },
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index 47fded6d..341c7f8d 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -108,7 +108,7 @@
     "message": "% ЦП"
   },
   "app-marketing.features.performance.description": {
-    "message": "Modrinth App работает лучше многих популярных Launchers, используя лишь 150 МБ ОЗУ!"
+    "message": "Modrinth App работает лучше многих популярных лаунчеров, используя лишь 150 МБ ОЗУ!"
   },
   "app-marketing.features.performance.discord": {
     "message": "Discord"
@@ -635,6 +635,339 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "Вы гражданин США?"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Заполнить налоговую форму"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Продолжить с лимитом"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Реквизиты"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Сумма"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "Валютный курс"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Сбор"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Чистая сумма"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Юридическое лицо"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "Юридическое лицо — зарегистрированная организация, например: компания, партнёрство или ООО."
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "Вы выводите как физическое или юридическое лицо?"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Физическое лицо"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Выберите страну"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Поиск стран..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "Не удалось получить список доступных способов вывода. Повторите попытку позже."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Ошибка загрузки способов вывода"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Регион"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Доступность способов вывода зависит от региона."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Выберите способ вывода"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "Можно вывести ещё <b>{amount}</b>. <tax-link>Заполните налоговую форму</tax-link>, чтобы вывести больше."
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Владелец счёта"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Криптовалюта"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Проверьте адрес кошелька"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "Номер национального удостоверения"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "Введите номер национального удостоверения"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "Номер паспорта"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "Введите номер паспорта"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
+    "message": "Номер вида на жительство"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "Введите номер вида на жительство"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "Номер RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "Введите номер RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "ИНН"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "Введите ИНН"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Сеть"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "Почти исчерпан лимит вывода: доступно ещё <b>{amountRemaining}</b>. Заполните налоговую форму, чтобы вывести больше."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Учётная запись"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Отвязать учётную запись"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Способ вывода"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "Учётная запись PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Подключите свой PayPal и получайте выплаты напрямую."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Сохранить"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Профиль Venmo успешно сохранён!"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Сохранено"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Войти через PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "Введите свой профиль Venmo и получайте выплаты."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Профиль Venmo"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@username"
+  },
+  "dashboard.creator-withdraw-modal.stage.completion": {
+    "message": "Завершение"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Способ"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Реквизиты счёта"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "Идентификация"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "Налоговая форма"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "Реквизиты"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "Чтобы вывести все <b>{available}</b> средства, пожалуйста, заполните форму ниже. Это необходимо для налоговой отчётности и нужно сделать только один раз."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body-with-limit": {
+    "message": "Для отчётности Modrinth и соблюдения налогового законодательства нужно заполнить форму W-9 или W-8."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.header": {
+    "message": "Требуется налоговая форма"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Способ вывода"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward": {
+    "message": "Вознаграждение"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "Выберите вознаграждение"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
+    "message": "Вознаграждения"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "Непроверенная почта"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message": {
+    "message": "Указанная почта не связана с учётной записью Modrinth. Вознаграждения, отправленные на неверный адрес, невозможно восстановить."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
+    "message": "Можно снизить сборы"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message": {
+    "message": "Выбран PayPal International с USD. <direct-paypal-link>Используйте PayPal напрямую</direct-paypal-link>, чтобы снизить сборы (≈2% вместо ≈6%)."
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Вывести средства"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit": {
+    "message": "Лимит вывода"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit-used": {
+    "message": "Достигнут лимит вывода в <b>{withdrawLimit}</b>. Заполните налоговую форму, чтобы вывести больше."
+  },
+  "dashboard.revenue.available-now": {
+    "message": "Доступно"
+  },
+  "dashboard.revenue.balance": {
+    "message": "Баланс"
+  },
+  "dashboard.revenue.estimated-tooltip.msg1": {
+    "message": "Сумма может измениться, прежде чем станет доступна."
+  },
+  "dashboard.revenue.estimated-tooltip.msg2": {
+    "message": "Нажмите, чтобы узнать, как Modrinth рассчитывает доход."
+  },
+  "dashboard.revenue.estimated-with-date": {
+    "message": "Ожидается {date}"
+  },
+  "dashboard.revenue.processing": {
+    "message": "В обработке"
+  },
+  "dashboard.revenue.processing.tooltip": {
+    "message": "Средства остаются в обработке до конца месяца и становятся доступными через 60 дней."
+  },
+  "dashboard.revenue.stats.received": {
+    "message": "Получено"
+  },
+  "dashboard.revenue.stats.transactions": {
+    "message": "Транзакций"
+  },
+  "dashboard.revenue.stats.withdrawn": {
+    "message": "Выведено"
+  },
+  "dashboard.revenue.tos": {
+    "message": "Загружая проекты на Modrinth и выводя деньги со своего счёта, вы соглашаетесь с нашими <terms-link>Условиями программы вознаграждений</terms-link>. Узнайте больше о <info-link>программе вознаграждений</info-link>."
+  },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "Скачать в формате CSV"
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "Транзакции"
+  },
+  "dashboard.revenue.transactions.none": {
+    "message": "Нет транзакций"
+  },
+  "dashboard.revenue.transactions.none.desc": {
+    "message": "Ваши выплаты и выводы появятся здесь."
+  },
+  "dashboard.revenue.transactions.see-all": {
+    "message": "Посмотреть все"
+  },
+  "dashboard.revenue.withdraw.blocked-tin-mismatch": {
+    "message": "Вывод средств временно заблокирован — указанный TIN или SSN не совпал с данными IRS. Свяжитесь с поддержкой для повторной отправки формы."
+  },
+  "dashboard.revenue.withdraw.card.description": {
+    "message": "Выведите средства с баланса любым из доступных способов."
+  },
+  "dashboard.revenue.withdraw.card.title": {
+    "message": "Вывести средства"
+  },
+  "dashboard.revenue.withdraw.header": {
+    "message": "Вывод средств"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "Счёт"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Сумма"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Закрыть"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Дата"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "Письмо с инструкциями по активации отправлено на <b>{email}</b>."
+  },
+  "dashboard.withdraw.completion.exchange-rate": {
+    "message": "Валютный курс"
+  },
+  "dashboard.withdraw.completion.fee": {
+    "message": "Сбор"
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "Способ"
+  },
+  "dashboard.withdraw.completion.net-amount": {
+    "message": "Чистая сумма"
+  },
+  "dashboard.withdraw.completion.recipient": {
+    "message": "Получатель"
+  },
+  "dashboard.withdraw.completion.title": {
+    "message": "Средства отправлены"
+  },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "Транзакции"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "Кошелёк"
+  },
+  "dashboard.withdraw.error.generic.text": {
+    "message": "Не удалось обработать запрос на вывод средств. Проверьте реквизиты или свяжитесь с поддержкой."
+  },
+  "dashboard.withdraw.error.generic.title": {
+    "message": "Не удалось вывести средства"
+  },
+  "dashboard.withdraw.error.invalid-address.text": {
+    "message": "Не удалось подтвердить указанный адрес. Проверьте правильность данных."
+  },
+  "dashboard.withdraw.error.invalid-address.title": {
+    "message": "Ошибка проверки адреса"
+  },
+  "dashboard.withdraw.error.invalid-bank.text": {
+    "message": "Указанные реквизиты банковского счёта недействительны. Перепроверьте их."
+  },
+  "dashboard.withdraw.error.invalid-bank.title": {
+    "message": "Неверные банковские реквизиты"
+  },
+  "dashboard.withdraw.error.invalid-wallet.text": {
+    "message": "Указанный адрес криптокошелька недействителен. Перепроверьте его и попробуйте снова."
+  },
+  "dashboard.withdraw.error.invalid-wallet.title": {
+    "message": "Неверный адрес кошелька"
+  },
+  "dashboard.withdraw.error.minimum-not-met.text": {
+    "message": "Сумма вывода после вычета сборов меньше минимально допустимой. Укажите более крупную сумму."
+  },
+  "dashboard.withdraw.error.minimum-not-met.title": {
+    "message": "Сумма слишком мала"
+  },
+  "dashboard.withdraw.error.tax-form.text": {
+    "message": "Чтобы отправить запрос на вывод средств, необходимо заполнить налоговую форму."
+  },
+  "dashboard.withdraw.error.tax-form.title": {
+    "message": "Заполните налоговую форму"
+  },
   "error.collection.404.list_item.1": {
     "message": "URL-адрес коллекции мог быть введён неправильно."
   },
@@ -789,7 +1122,7 @@
     "message": "Следите за тем, что нравится"
   },
   "landing.feature.launcher.description": {
-    "message": "Наш открытый API позволяет глубже интегрироваться с Modrinth — используйте <link>наше приложение</link> или сторонние Launchers наподобие ATLauncher, MultiMC и Prism Launcher."
+    "message": "Наш открытый API позволяет глубже интегрироваться с Modrinth — используйте <link>наше приложение</link> или сторонние лаунчеры наподобие ATLauncher, MultiMC и Prism Launcher."
   },
   "landing.feature.launcher.heading": {
     "message": "Играйте с вашим любимым launcher"
@@ -986,6 +1319,9 @@
   "layout.footer.about.status": {
     "message": "Статус"
   },
+  "layout.footer.copyright": {
+    "message": "© Rinth, Inc., {year}"
+  },
   "layout.footer.legal": {
     "message": "Правовой материал"
   },
@@ -1064,6 +1400,15 @@
   "layout.meta.og-description": {
     "message": "Ищите и публикуйте проекты для Minecraft!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Закрыть меню"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Открыть меню"
+  },
+  "layout.nav.active-reports": {
+    "message": "Активные жалобы"
+  },
   "layout.nav.analytics": {
     "message": "Аналитика"
   },
@@ -1091,6 +1436,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Главная страница Modrinth"
   },
+  "layout.nav.my-servers": {
+    "message": "Мои серверы"
+  },
   "layout.nav.organizations": {
     "message": "Организации"
   },
@@ -1110,7 +1458,7 @@
     "message": "Поиск"
   },
   "layout.nav.upgrade-to-modrinth-plus": {
-    "message": "Обновиться до Modrinth+"
+    "message": "Перейти на Modrinth+"
   },
   "moderation.filter.by": {
     "message": "Фильтры"
@@ -1136,6 +1484,273 @@
   "moderation.technical.search.placeholder": {
     "message": "Поиск техпроверок..."
   },
+  "muralpay.account-type.checking": {
+    "message": "Расчётный"
+  },
+  "muralpay.account-type.savings": {
+    "message": "Сберегательный"
+  },
+  "muralpay.country.at": {
+    "message": "Австрия"
+  },
+  "muralpay.country.be": {
+    "message": "Бельгия"
+  },
+  "muralpay.country.cy": {
+    "message": "Кипр"
+  },
+  "muralpay.country.de": {
+    "message": "Германия"
+  },
+  "muralpay.country.ee": {
+    "message": "Эстония"
+  },
+  "muralpay.country.es": {
+    "message": "Испания"
+  },
+  "muralpay.country.fi": {
+    "message": "Финляндия"
+  },
+  "muralpay.country.fr": {
+    "message": "Франция"
+  },
+  "muralpay.country.gr": {
+    "message": "Греция"
+  },
+  "muralpay.country.ie": {
+    "message": "Ирландия"
+  },
+  "muralpay.country.it": {
+    "message": "Италия"
+  },
+  "muralpay.country.lt": {
+    "message": "Литва"
+  },
+  "muralpay.country.lu": {
+    "message": "Люксембург"
+  },
+  "muralpay.country.lv": {
+    "message": "Латвия"
+  },
+  "muralpay.country.mt": {
+    "message": "Мальта"
+  },
+  "muralpay.country.nl": {
+    "message": "Нидерланды"
+  },
+  "muralpay.country.pt": {
+    "message": "Португалия"
+  },
+  "muralpay.country.sk": {
+    "message": "Словакия"
+  },
+  "muralpay.document-type.national-id": {
+    "message": "Национальное удостоверение личности"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Паспорт"
+  },
+  "muralpay.document-type.resident-id": {
+    "message": "Вид на жительство"
+  },
+  "muralpay.document-type.ruc": {
+    "message": "RUC"
+  },
+  "muralpay.document-type.tax-id": {
+    "message": "ИНН"
+  },
+  "muralpay.field.account-number": {
+    "message": "Номер счёта"
+  },
+  "muralpay.field.account-number-cbu-cvu": {
+    "message": "Номер счёта (CBU/CVU)"
+  },
+  "muralpay.field.account-number-cci": {
+    "message": "Номер счёта (CCI)"
+  },
+  "muralpay.field.account-number-type": {
+    "message": "Тип номера счёта"
+  },
+  "muralpay.field.account-type": {
+    "message": "Тип счёта"
+  },
+  "muralpay.field.bank-account-number": {
+    "message": "Номер счёта"
+  },
+  "muralpay.field.branch-code": {
+    "message": "Код филиала"
+  },
+  "muralpay.field.clabe": {
+    "message": "CLABE"
+  },
+  "muralpay.field.country": {
+    "message": "Страна"
+  },
+  "muralpay.field.cpf-cnpj": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.field.cuit-cuil": {
+    "message": "CUIT/CUIL"
+  },
+  "muralpay.field.document-type": {
+    "message": "Тип документа"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.field.phone-number": {
+    "message": "Номер телефона"
+  },
+  "muralpay.field.pix-email": {
+    "message": "Электронная почта PIX"
+  },
+  "muralpay.field.pix-key-type": {
+    "message": "Тип ключа PIX"
+  },
+  "muralpay.field.pix-phone": {
+    "message": "Телефон PIX"
+  },
+  "muralpay.field.routing-number": {
+    "message": "Маршрутный номер"
+  },
+  "muralpay.field.swift-bic": {
+    "message": "SWIFT/BIC"
+  },
+  "muralpay.field.wallet-address": {
+    "message": "Адрес кошелька"
+  },
+  "muralpay.help.cbu-cvu": {
+    "message": "Clave Bancaria Uniforme или Clave Virtual Uniforme"
+  },
+  "muralpay.help.cci": {
+    "message": "Código de Cuenta Interbancaria"
+  },
+  "muralpay.help.clabe": {
+    "message": "Clave Bancaria Estandarizada (номер счёта в мексиканском банке)"
+  },
+  "muralpay.help.cpf-cnpj": {
+    "message": "Бразильский идентификационный номер налогоплательщика"
+  },
+  "muralpay.help.cuit-cuil": {
+    "message": "Аргентинский идентификационный номер налогоплательщика"
+  },
+  "muralpay.help.iban": {
+    "message": "Международный номер банковского счёта"
+  },
+  "muralpay.help.swift-bic": {
+    "message": "Банковский идентификационный код"
+  },
+  "muralpay.pix-type.bank-account": {
+    "message": "Банковский счёт"
+  },
+  "muralpay.pix-type.document": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.pix-type.email": {
+    "message": "Электронная почта"
+  },
+  "muralpay.pix-type.phone": {
+    "message": "Номер телефона"
+  },
+  "muralpay.placeholder.account-number": {
+    "message": "Введите номер счёта"
+  },
+  "muralpay.placeholder.cbu-cvu": {
+    "message": "Введите CBU или CVU"
+  },
+  "muralpay.placeholder.cbu-cvu-type": {
+    "message": "CBU или CVU"
+  },
+  "muralpay.placeholder.cci": {
+    "message": "Введите 20-значный CCI"
+  },
+  "muralpay.placeholder.cuit-cuil": {
+    "message": "Введите CUIT или CUIL"
+  },
+  "muralpay.placeholder.enter-account-number": {
+    "message": "Введите номер счёта"
+  },
+  "muralpay.placeholder.enter-branch-code": {
+    "message": "Введите код филиала"
+  },
+  "muralpay.placeholder.enter-clabe": {
+    "message": "Введите 18-значный CLABE"
+  },
+  "muralpay.placeholder.enter-cpf-cnpj": {
+    "message": "Введите CPF или CNPJ"
+  },
+  "muralpay.placeholder.enter-iban": {
+    "message": "Введите IBAN"
+  },
+  "muralpay.placeholder.enter-pix-email": {
+    "message": "Введите электронную почту PIX"
+  },
+  "muralpay.placeholder.enter-routing-number": {
+    "message": "Введите 9-значный маршрутный номер"
+  },
+  "muralpay.placeholder.enter-swift-bic": {
+    "message": "Введите SWIFT/BIC-код"
+  },
+  "muralpay.placeholder.iban-crc": {
+    "message": "Введите коста-риканский IBAN"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
+  "muralpay.rail.fiat-ars.name": {
+    "message": "Банковский перевод (ARS)"
+  },
+  "muralpay.rail.fiat-brl.name": {
+    "message": "Перевод через PIX (BRL)"
+  },
+  "muralpay.rail.fiat-clp.name": {
+    "message": "Банковский перевод (CLP)"
+  },
+  "muralpay.rail.fiat-cop.name": {
+    "message": "Банковский перевод (COP)"
+  },
+  "muralpay.rail.fiat-crc.name": {
+    "message": "Банковский перевод (CRC)"
+  },
+  "muralpay.rail.fiat-eur.name": {
+    "message": "Банковский перевод (EUR)"
+  },
+  "muralpay.rail.fiat-mxn.name": {
+    "message": "Банковский перевод (MXN)"
+  },
+  "muralpay.rail.fiat-pen.name": {
+    "message": "Банковский перевод (PEN)"
+  },
+  "muralpay.rail.fiat-usd-peru.name": {
+    "message": "Банковский перевод (USD — Перу)"
+  },
+  "muralpay.rail.fiat-usd.name": {
+    "message": "Банковский перевод (USD)"
+  },
+  "muralpay.rail.fiat-zar.name": {
+    "message": "Банковский перевод (ZAR)"
+  },
+  "muralpay.rail.usdc-base.name": {
+    "message": "USDC (Base)"
+  },
+  "muralpay.rail.usdc-celo.name": {
+    "message": "USDC (Celo)"
+  },
+  "muralpay.rail.usdc-ethereum.name": {
+    "message": "USDC (Ethereum)"
+  },
+  "muralpay.rail.usdc-polygon.name": {
+    "message": "Криптовалюта (USDC)"
+  },
+  "muralpay.warning.wallet-address": {
+    "message": "Перепроверьте адрес кошелька. Средства, отправленные на неверный адрес, невозможно вернуть."
+  },
   "profile.bio.fallback.creator": {
     "message": "Автор на Modrinth."
   },
@@ -1284,7 +1899,7 @@
     "message": "Запросите перепроверку"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Ваш проект был {status} персоналом Modrinth. В большинстве случаев Вы можете повторно отправить на рассмотрение после прочтения сообщения персонала."
+    "message": "Проект {status, select, rejected {отклонён} withheld {на удержании} other {{status}}} командой Modrinth. Обычно после решения указанных модератором проблем можно снова запросить проверку."
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Необходимо выполнить обязательные действия в контрольном списке!"
@@ -1296,7 +1911,7 @@
     "message": "Отправить на проверку"
   },
   "project-moderation-nags.submit-for-review-desc": {
-    "message": "Ваш проект доступен для просмотра только участникам проекта. Для публикации он должен быть проверен модераторами."
+    "message": "Проект сейчас виден только участникам. Для публикации он должен пройти проверку модераторами."
   },
   "project-moderation-nags.suggestion": {
     "message": "Предложение"
@@ -1691,18 +2306,6 @@
   "report.submit": {
     "message": "Отправить жалобу"
   },
-  "revenue.transfers.total": {
-    "message": "Всего вы вывели {amount}."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Вы вывели {amount} через {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "В {year} году вы вывели {amount}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "В {year} году вы вывели {amount} через {method}."
-  },
   "scopes.analytics.description": {
     "message": "Просматривать данные аналитики"
   },
@@ -1967,12 +2570,6 @@
   "servers.backups.item.creating-backup": {
     "message": "Создание резервной копии..."
   },
-  "servers.backups.item.downloading": {
-    "message": "Скачивание"
-  },
-  "servers.backups.item.downloading-backup": {
-    "message": "Скачивание резервной копии..."
-  },
   "servers.backups.item.failed-to-create-backup": {
     "message": "Не удалось создать резервную копию"
   },
diff --git a/apps/frontend/src/locales/sr-CS/index.json b/apps/frontend/src/locales/sr-CS/index.json
index 77fff4be..708aaab0 100644
--- a/apps/frontend/src/locales/sr-CS/index.json
+++ b/apps/frontend/src/locales/sr-CS/index.json
@@ -737,18 +737,6 @@
   "report.submit": {
     "message": "Pošaljite prijavu"
   },
-  "revenue.transfers.total": {
-    "message": "Isplatili ste ukupno {amount}."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Isplatili ste {amount} putem {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Isplatili ste {amount} u {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Isplatili ste {amount} u {year} putem {method}."
-  },
   "scopes.analytics.description": {
     "message": "Pristupite svojim analitičkim podacima"
   },
diff --git a/apps/frontend/src/locales/sv-SE/index.json b/apps/frontend/src/locales/sv-SE/index.json
index 247ffedb..99d82c09 100644
--- a/apps/frontend/src/locales/sv-SE/index.json
+++ b/apps/frontend/src/locales/sv-SE/index.json
@@ -1,4 +1,10 @@
 {
+  "action.cancel": {
+    "message": "Avbryt"
+  },
+  "action.continue": {
+    "message": "Fortsätt"
+  },
   "admin.billing.error.not-found": {
     "message": "Användaren hittades inte"
   },
@@ -170,6 +176,9 @@
   "app-marketing.features.youve-used-before": {
     "message": "du använt förut"
   },
+  "app-marketing.hero.app-screenshot-alt": {
+    "message": "Skärmdump av Modrinth App med en Cobblemon-instans öppen på sidan ”Innehåll”."
+  },
   "app-marketing.hero.description": {
     "message": "Modrinth App är en unik launcher med öppen källkod som låter dig spela dina favoritmods och hålla de uppdaterade, allt i ett smidigt litet paket."
   },
@@ -182,6 +191,9 @@
   "app-marketing.hero.download-modrinth-app-for-os": {
     "message": "Ladda ner Modrinth App för {os}"
   },
+  "app-marketing.hero.minecraft-screenshot-alt": {
+    "message": "Skärmdump av huvudmenyn i Cobblemon-instansen."
+  },
   "app-marketing.hero.more-download-options": {
     "message": "Fler nerladdningsalternativ"
   },
@@ -407,6 +419,87 @@
   "collection.title": {
     "message": "{name} - samling"
   },
+  "common.no": {
+    "message": "Nej"
+  },
+  "common.yes": {
+    "message": "Ja"
+  },
+  "create.collection.cancel": {
+    "message": "Avbryt"
+  },
+  "create.collection.collection-info": {
+    "message": "Din nya samling kommer skapas som en offentlig samling med {count, plural, =0 {inga projekt} one {# projekt} other {# projekt}}."
+  },
+  "create.collection.create-collection": {
+    "message": "Skapa samling"
+  },
+  "create.collection.error-title": {
+    "message": "Ett fel inträffade"
+  },
+  "create.collection.name-label": {
+    "message": "Namn"
+  },
+  "create.collection.name-placeholder": {
+    "message": "Ange samlingens namn..."
+  },
+  "create.collection.summary-description": {
+    "message": "En mening eller två som beskriver din samling."
+  },
+  "create.collection.summary-label": {
+    "message": "Sammanfattning"
+  },
+  "create.collection.summary-placeholder": {
+    "message": "Det här är en samling av..."
+  },
+  "create.collection.title": {
+    "message": "Skapar samling"
+  },
+  "create.limit-alert.approaching-limit": {
+    "message": "Nära {type}gränsen ({current}/{max})"
+  },
+  "create.limit-alert.approaching-limit-description": {
+    "message": "Du är nära {type}gränsen, kontakta support om du behöver mer än {max} {typePlural}."
+  },
+  "create.limit-alert.contact-support": {
+    "message": "Kontakta support"
+  },
+  "create.limit-alert.limit-reached": {
+    "message": "{type}gräns nådd"
+  },
+  "create.limit-alert.limit-reached-description": {
+    "message": "Du har nått din {type}gräns av {max}. Vänligen kontakta support för att öka gränsen."
+  },
+  "create.limit-alert.type-collection": {
+    "message": "samling"
+  },
+  "create.limit-alert.type-organization": {
+    "message": "organisation"
+  },
+  "create.limit-alert.type-plural-collection": {
+    "message": "samling"
+  },
+  "create.limit-alert.type-plural-organization": {
+    "message": "organisationer"
+  },
+  "create.limit-alert.type-plural-project": {
+    "message": "projekt"
+  },
+  "create.limit-alert.type-project": {
+    "message": "projekt"
+  },
+  "create.organization.cancel": {
+    "message": "Avbryt"
+  },
+  "create.organization.create-organization": {
+    "message": "Skapa organisation"
+  },
+  "create.organization.error-title": {
+    "message": "Ett fel inträffade"
+  },
+  "create.organization.name-label": {
+    "message": "Namn"
+  },
   "create.organization.summary-label": {
     "message": "Sammanfattning"
   },
@@ -422,6 +515,15 @@
   "dashboard.collections.long-title": {
     "message": "Dina samlingar"
   },
+  "dashboard.creator-tax-form-modal.entity.foreign-entity": {
+    "message": "Främmande entitet"
+  },
+  "dashboard.creator-tax-form-modal.entity.private-individual": {
+    "message": "Privat individ"
+  },
+  "dashboard.creator-tax-form-modal.entity.question": {
+    "message": "Är du en privat individ eller en del av en främmande entitet?"
+  },
   "error.collection.404.list_item.1": {
     "message": "Du kan ha skrivit fel på samlingens URL."
   },
@@ -971,9 +1073,6 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "Begär ny granskning"
   },
-  "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Ditt projekt har blivit {status} av Modrinths moderatorer. Vanligtvis kan du skicka in projektet igen efter du har åtgärdat problemet."
-  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Du måste sltuföra alla steg i checklistan för publicering!"
   },
diff --git a/apps/frontend/src/locales/tr-TR/index.json b/apps/frontend/src/locales/tr-TR/index.json
index 19006534..fd3ea4fc 100644
--- a/apps/frontend/src/locales/tr-TR/index.json
+++ b/apps/frontend/src/locales/tr-TR/index.json
@@ -1250,9 +1250,6 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "İncelemeye yeniden gönder"
   },
-  "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Modrinth'in kadrosu tarafından projeniz {status} hale getirildi. Çoğu durumda, kadronun mesajına değindikten sonra incelemeye yeniden yollayabilirsiniz."
-  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Yayımlama kontrol listesindeki gerekli adımları tamamlamalısınız!"
   },
@@ -1658,18 +1655,6 @@
   "report.submit": {
     "message": "Rapor gönder"
   },
-  "revenue.transfers.total": {
-    "message": "Toplam {amount} çektiniz."
-  },
-  "revenue.transfers.total.method": {
-    "message": "{method} yoluyla toplam {amount} çektiniz."
-  },
-  "revenue.transfers.total.year": {
-    "message": "{year} yılında toplam {amount} çektiniz."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "{method} yoluyla, {year} yılında toplam {amount} çektiniz."
-  },
   "scopes.analytics.description": {
     "message": "Analiz verilerinize erişin"
   },
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index cf1c70d4..4e4e4802 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -635,6 +635,93 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "Чи ви громадянин США?"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "Заповнити податкову форму"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Продовжити з лімітом"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Деталі"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Кількість"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "Комісія"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Чиста кількість"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Юридична особа"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "Юридичною особою є зареєстрована організація, як-от корпорація, товариство або ТОВ."
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Фізична особа"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Виберіть свою країну"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Шукати країни…"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "Неможливо отримати доступні способи оплати. Будь ласка, спробуйте знову пізніше."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Не вдалося завантажити способи оплати"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Регіон"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Деякі способи оплати недоступні в певних регіонах."
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Власник рахунка"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Монета"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Підтвердьте адресу свого гаманця"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Рахунок"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Від’єднати рахунок"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "Рахунок PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "З’єднайте свій рахунок PayPal, щоб отримувати платежі напряму."
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Деталі рахунка"
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "Транзакції"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "Рахунок"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Кількість"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Закрити"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Дата"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "Гаманець"
+  },
   "error.collection.404.list_item.1": {
     "message": "Ви, можливо, помилилися під час написання URL добірки."
   },
@@ -986,6 +1073,9 @@
   "layout.footer.about.status": {
     "message": "Статус"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "Угоди"
   },
@@ -1064,6 +1154,12 @@
   "layout.meta.og-description": {
     "message": "Досліджуйте інший та публікуйте свій уміст для Minecraft!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Закрити меню"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Відкрити меню"
+  },
   "layout.nav.analytics": {
     "message": "Аналітика"
   },
@@ -1091,6 +1187,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Головна сторінка Modrinth"
   },
+  "layout.nav.my-servers": {
+    "message": "Мої сервери"
+  },
   "layout.nav.organizations": {
     "message": "Організації"
   },
@@ -1136,6 +1235,66 @@
   "moderation.technical.search.placeholder": {
     "message": "Пошук технічних оглядів…"
   },
+  "muralpay.account-type.savings": {
+    "message": "Заощадження"
+  },
+  "muralpay.country.at": {
+    "message": "Австрія"
+  },
+  "muralpay.country.be": {
+    "message": "Бельгія"
+  },
+  "muralpay.country.cy": {
+    "message": "Кіпр"
+  },
+  "muralpay.country.de": {
+    "message": "Німеччина"
+  },
+  "muralpay.country.ee": {
+    "message": "Естонія"
+  },
+  "muralpay.country.es": {
+    "message": "Іспанія"
+  },
+  "muralpay.country.fi": {
+    "message": "Фінляндія"
+  },
+  "muralpay.country.fr": {
+    "message": "Франція"
+  },
+  "muralpay.country.gr": {
+    "message": "Греція"
+  },
+  "muralpay.country.ie": {
+    "message": "Ірландія"
+  },
+  "muralpay.country.it": {
+    "message": "Італія"
+  },
+  "muralpay.country.lt": {
+    "message": "Литва"
+  },
+  "muralpay.country.lu": {
+    "message": "Люксембург"
+  },
+  "muralpay.country.lv": {
+    "message": "Латвія"
+  },
+  "muralpay.country.mt": {
+    "message": "Мальта"
+  },
+  "muralpay.country.nl": {
+    "message": "Нідерланди"
+  },
+  "muralpay.country.pt": {
+    "message": "Португалія"
+  },
+  "muralpay.country.sk": {
+    "message": "Словаччина"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Паспорт"
+  },
   "profile.bio.fallback.creator": {
     "message": "Творець Modrinth."
   },
@@ -1283,9 +1442,6 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "Надіслати на повторний розгляд"
   },
-  "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Ваш проєкт був {status} персоналом Modrinth. У більшості випадків ви можете повторно подати проєкт на розгляд після врахування повідомлення персоналу."
-  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Ви повинні завершити всі обов’язкові кроки в контрольному списку для публікації!"
   },
@@ -1691,18 +1847,6 @@
   "report.submit": {
     "message": "Відправити скаргу"
   },
-  "revenue.transfers.total": {
-    "message": "Ви вивели {amount} загалом."
-  },
-  "revenue.transfers.total.method": {
-    "message": "Ви вивели {amount} за допомогою {method}."
-  },
-  "revenue.transfers.total.year": {
-    "message": "Ви вивели {amount} протягом {year}."
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "Ви вивели {amount} протягом {year} за допомогою {method}."
-  },
   "scopes.analytics.description": {
     "message": "Доступ до ваших даних аналітики"
   },
@@ -1967,14 +2111,8 @@
   "servers.backups.item.creating-backup": {
     "message": "Створення резервної копії…"
   },
-  "servers.backups.item.downloading": {
-    "message": "Завантаження"
-  },
-  "servers.backups.item.downloading-backup": {
-    "message": "Завантаження резервної копії…"
-  },
   "servers.backups.item.failed-to-create-backup": {
-    "message": "Помилка в створенні резервної копії"
+    "message": "Не вдалося створити резервну копію"
   },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Помилка в відновленні з резервної копії"
@@ -2340,7 +2478,7 @@
     "message": "Завершити сеанс"
   },
   "settings.sessions.created-ago": {
-    "message": "Створенно {ago}"
+    "message": "Створено {ago}"
   },
   "settings.sessions.current-session": {
     "message": "Поточний сеанс"
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index 19f861be..167ca5fd 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "未列出的"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "创建推广链接"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "加载推广链接时出错"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "你的推广链接"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "这将永久撤销关联代码 `{id}`，任何分享的此代码链接将不再有效。"
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "撤销"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "你确定要撤销你的 ''{title}'' 推广链接吗？"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "搜索推广链接……"
+  },
   "dashboard.collections.button.create-new": {
     "message": "新建"
   },
@@ -614,6 +635,339 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "你是美国公民吗？"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "填写税务表格"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "有限制的下一步"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "详情"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "金额"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "外汇汇率"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "费用"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "净额"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "企业实体"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "企业实体指的是如公司、合伙企业或有限责任公司等注册组织。"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "你是作为个人还是企业进行提现？"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "私人个体"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "选择你的国家"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "搜索国家……"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "无法获取可用的支付方式。请稍后再试。"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "加载支付方式失败"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "地区"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "某些支付方式在特定地区不可用。"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "选择提现方式"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "你的提现限额为<b>{amount}</b>，<tax-link>填写税务表格</tax-link>即可提高提现额度。"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "账户所有者"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "硬币"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "确认你的钱包地址"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "国民身份证号码"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "输入国民身份证号码"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "护照号码"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "输入护照号码"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
+    "message": "居民身份证号码"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "输入居民身份证号码"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "唯一纳税人登记号"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "输入唯一纳税人登记号"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "税务识别号"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "输入税务识别号"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "网络"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "你即将到达提现限额。你现在仅可以提取<b>{amountRemaining}</b>，提取更多需要填写税务表格。"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "账户"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "断开账户关联"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "支付方式"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "PayPal 账户"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "关联你的 PayPal 账户用于直接接收付款。"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "保存"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Venmo 处理保存成功！"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "已保存"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "使用 PayPal 登录"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "输入你的 Venmo 账号以接收付款。"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Venmo 账号"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@username"
+  },
+  "dashboard.creator-withdraw-modal.stage.completion": {
+    "message": "完成"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "方法"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "账户详情"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "核实"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "税务表格"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "详情"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "如需提取你全部的<b>{available}</b>可用余额，请填写下方表格。此操作仅需完成一次，系税务申报所需。"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body-with-limit": {
+    "message": "你必须填写 W-9 或 W-8 表格以供 Modrinth 存档，确保我们符合税务法规要求。"
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.header": {
+    "message": "需要填写税务表格"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "支付方式"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward": {
+    "message": "奖励"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "选择奖励"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
+    "message": "奖励"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "未验证的电子邮件"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message": {
+    "message": "你输入的收件邮箱未与你的 Modrinth 账户关联。若奖励发送至错误邮箱地址，Modrinth 将无法进行追回。"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
+    "message": "有更低的服务费可用"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message": {
+    "message": "你已为 PayPal 国际支付选择美元。<direct-paypal-link>切换至直接 PayPal 支付</direct-paypal-link>可享受更优惠的手续费（≈2%而非≈6%）。"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "提现"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit": {
+    "message": "提现限额"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit-used": {
+    "message": "你已用尽<b>{withdrawLimit}</b>的提现额度。若需继续提现，请先完成税务表格填写。"
+  },
+  "dashboard.revenue.available-now": {
+    "message": "现在可用"
+  },
+  "dashboard.revenue.balance": {
+    "message": "平衡"
+  },
+  "dashboard.revenue.estimated-tooltip.msg1": {
+    "message": "预估收入可能随时变更，直至正式公布为止。"
+  },
+  "dashboard.revenue.estimated-tooltip.msg2": {
+    "message": "点击了解 Modrinth 如何处理你的收入。"
+  },
+  "dashboard.revenue.estimated-with-date": {
+    "message": "预计日期：{date}"
+  },
+  "dashboard.revenue.processing": {
+    "message": "处理中"
+  },
+  "dashboard.revenue.processing.tooltip": {
+    "message": "收入将维持在处理状态直至月底结束，随后在60天后方可使用。"
+  },
+  "dashboard.revenue.stats.received": {
+    "message": "接收"
+  },
+  "dashboard.revenue.stats.transactions": {
+    "message": "交易"
+  },
+  "dashboard.revenue.stats.withdrawn": {
+    "message": "撤回"
+  },
+  "dashboard.revenue.tos": {
+    "message": "通过将项目上传至 Modrinth 并从账户中提取资金，即表示你同意我们的<terms-link>激励计划条款</terms-link>。了解更多关于<info-link>激励计划</info-link>的信息。"
+  },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "以 CSV 格式下载"
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "交易"
+  },
+  "dashboard.revenue.transactions.none": {
+    "message": "没有交易"
+  },
+  "dashboard.revenue.transactions.none.desc": {
+    "message": "您的支付和提现将在这里显示。"
+  },
+  "dashboard.revenue.transactions.see-all": {
+    "message": "查看所有"
+  },
+  "dashboard.revenue.withdraw.blocked-tin-mismatch": {
+    "message": "由于你的纳税人识别号或社会安全号码与美国国税局记录不符，你的提现被暂时锁定。请联系客服重置并重新提交你的税表。"
+  },
+  "dashboard.revenue.withdraw.card.description": {
+    "message": "从可用余额中提现至任何支付方式。"
+  },
+  "dashboard.revenue.withdraw.card.title": {
+    "message": "提现"
+  },
+  "dashboard.revenue.withdraw.header": {
+    "message": "提现"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "账户"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "金额"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "关闭"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "日期"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "你将收到一封发至<b>{email}</b>的电子邮件，其中包含兑换提现的说明。"
+  },
+  "dashboard.withdraw.completion.exchange-rate": {
+    "message": "汇率"
+  },
+  "dashboard.withdraw.completion.fee": {
+    "message": "费用"
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "方法"
+  },
+  "dashboard.withdraw.completion.net-amount": {
+    "message": "净额"
+  },
+  "dashboard.withdraw.completion.recipient": {
+    "message": "收件人"
+  },
+  "dashboard.withdraw.completion.title": {
+    "message": "提现完成"
+  },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "交易"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "钱包"
+  },
+  "dashboard.withdraw.error.generic.text": {
+    "message": "我们无法提交你的提现请求，请检查你的详细信息或联系客服。"
+  },
+  "dashboard.withdraw.error.generic.title": {
+    "message": "无法提现"
+  },
+  "dashboard.withdraw.error.invalid-address.text": {
+    "message": "你提供的地址无法验证。请检查你的地址信息。"
+  },
+  "dashboard.withdraw.error.invalid-address.title": {
+    "message": "地址验证失败"
+  },
+  "dashboard.withdraw.error.invalid-bank.text": {
+    "message": "你提供的银行账户信息无效。请核实你的信息。"
+  },
+  "dashboard.withdraw.error.invalid-bank.title": {
+    "message": "无效的银行信息"
+  },
+  "dashboard.withdraw.error.invalid-wallet.text": {
+    "message": "你提供的加密钱包地址无效。请仔细核对后重新尝试。"
+  },
+  "dashboard.withdraw.error.invalid-wallet.title": {
+    "message": "无效的钱包地址"
+  },
+  "dashboard.withdraw.error.minimum-not-met.text": {
+    "message": "提现金额（扣除手续费后）未达到最低要求。请增加提现金额。"
+  },
+  "dashboard.withdraw.error.minimum-not-met.title": {
+    "message": "金额过低"
+  },
+  "dashboard.withdraw.error.tax-form.text": {
+    "message": "。"
+  },
+  "dashboard.withdraw.error.tax-form.title": {
+    "message": ""
+  },
   "error.collection.404.list_item.1": {
     "message": "你可能输错了收藏夹的连接。"
   },
@@ -869,6 +1223,9 @@
   "layout.action.lookup-by-email": {
     "message": "通过电子邮箱查找"
   },
+  "layout.action.manage-affiliates": {
+    "message": "管理推广链接"
+  },
   "layout.action.manage-server-notices": {
     "message": "管理服务器通知"
   },
@@ -924,7 +1281,7 @@
     "message": "填写税务表格"
   },
   "layout.banner.tax.description": {
-    "message": "你今年已经从Modrinth提款了超过600美元。为了遵守税务规定，你需要填写一份税务表格。你的提款操作将暂停，直到提交此表格为止。"
+    "message": "你今年已经从Modrinth提现了超过600美元。为了遵守税务规定，你需要填写一份税务表格。你的提现操作将暂停，直到提交此表格为止。"
   },
   "layout.banner.tax.title": {
     "message": "需要填写税务表格"
@@ -933,7 +1290,7 @@
     "message": "联系客服"
   },
   "layout.banner.tin-mismatch.description": {
-    "message": "由于你的纳税人识别号或社会安全号码与美国国税局记录不符，你的提款被暂时锁定。请联系客服重置并重新提交你的税表。"
+    "message": "由于你的纳税人识别号或社会安全号码与美国国税局记录不符，你的提现被暂时锁定。请联系客服重置并重新提交你的税表。"
   },
   "layout.banner.tin-mismatch.title": {
     "message": "税务表格上报失败"
@@ -962,6 +1319,9 @@
   "layout.footer.about.status": {
     "message": "服务器状态"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "法律文件"
   },
@@ -1040,6 +1400,9 @@
   "layout.meta.og-description": {
     "message": "浏览及发布 Minecraft 内容！"
   },
+  "layout.mobile.close-menu": {
+    "message": ""
+  },
   "layout.nav.analytics": {
     "message": "数据"
   },
@@ -1112,6 +1475,108 @@
   "moderation.technical.search.placeholder": {
     "message": "搜索技术评价……"
   },
+  "muralpay.document-type.national-id": {
+    "message": "国民身份证"
+  },
+  "muralpay.document-type.passport": {
+    "message": "护照"
+  },
+  "muralpay.document-type.resident-id": {
+    "message": "居民身份证"
+  },
+  "muralpay.document-type.ruc": {
+    "message": "唯一纳税人登记号"
+  },
+  "muralpay.field.clabe": {
+    "message": "CLABE"
+  },
+  "muralpay.field.cpf-cnpj": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.field.cuit-cuil": {
+    "message": "CUIT/CUIL"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.field.phone-number": {
+    "message": "电话号码"
+  },
+  "muralpay.pix-type.document": {
+    "message": "个人纳税人身份号/公司纳税人身份号"
+  },
+  "muralpay.pix-type.email": {
+    "message": "电子邮箱"
+  },
+  "muralpay.pix-type.phone": {
+    "message": "电话号码"
+  },
+  "muralpay.placeholder.account-number": {
+    "message": "输入账户号码"
+  },
+  "muralpay.placeholder.enter-account-number": {
+    "message": "输入账户号码"
+  },
+  "muralpay.placeholder.enter-branch-code": {
+    "message": "输入分行代码"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
+  "muralpay.rail.fiat-ars.name": {
+    "message": "银行转账（阿根廷比索）"
+  },
+  "muralpay.rail.fiat-brl.name": {
+    "message": "PIX转账（巴西雷亚尔）"
+  },
+  "muralpay.rail.fiat-clp.name": {
+    "message": "银行转账（智利比索）"
+  },
+  "muralpay.rail.fiat-cop.name": {
+    "message": "银行转账（哥伦比亚比索）"
+  },
+  "muralpay.rail.fiat-crc.name": {
+    "message": "银行转账（哥斯达黎加科朗）"
+  },
+  "muralpay.rail.fiat-eur.name": {
+    "message": "银行转账（欧元）"
+  },
+  "muralpay.rail.fiat-mxn.name": {
+    "message": "银行转账（墨西哥比索）"
+  },
+  "muralpay.rail.fiat-pen.name": {
+    "message": "银行转账（秘鲁新索尔）"
+  },
+  "muralpay.rail.fiat-usd-peru.name": {
+    "message": "银行转账（美元 - 秘鲁）"
+  },
+  "muralpay.rail.fiat-usd.name": {
+    "message": "银行转账（美元）"
+  },
+  "muralpay.rail.fiat-zar.name": {
+    "message": "银行转账（南非兰特）"
+  },
+  "muralpay.rail.usdc-base.name": {
+    "message": "USDC (Base)"
+  },
+  "muralpay.rail.usdc-celo.name": {
+    "message": "USDC (Celo)"
+  },
+  "muralpay.rail.usdc-ethereum.name": {
+    "message": "USDC (Ethereum)"
+  },
+  "muralpay.rail.usdc-polygon.name": {
+    "message": "加密货币 (USDC)"
+  },
+  "muralpay.warning.wallet-address": {
+    "message": "请再次确认你的钱包地址。发送到错误地址的资金将无法追回。"
+  },
   "profile.bio.fallback.creator": {
     "message": "一位 Modrinth 创作者。"
   },
@@ -1130,6 +1595,12 @@
   "profile.button.manage-projects": {
     "message": "管理项目"
   },
+  "profile.button.remove-affiliate": {
+    "message": "解除作为联盟伙伴"
+  },
+  "profile.button.set-affiliate": {
+    "message": "设置为联盟伙伴"
+  },
   "profile.details.label.auth-providers": {
     "message": "身份验证提供者"
   },
@@ -1154,6 +1625,9 @@
   "profile.error.not-found": {
     "message": "未找到用户"
   },
+  "profile.label.affiliate": {
+    "message": "联盟"
+  },
   "profile.label.badges": {
     "message": "徽章"
   },
@@ -1251,7 +1725,7 @@
     "message": "重新提交审核"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "你的项目被Modrinth管理人员列为{status}。一般来说，在解决管理人员的消息里提到的问题后，就可以重新提交审核。"
+    "message": "你的项目已被 Modrinth 工作人员{status, select, rejected {拒绝} withheld {暂缓} other { {status}}} 。在多数情况下，你可在处理工作人员反馈后重新提交审核。"
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "你必须完成发布前检查单中必需的步骤！"
@@ -1658,18 +2132,6 @@
   "report.submit": {
     "message": "提交举报"
   },
-  "revenue.transfers.total": {
-    "message": "你总共提现了 {amount} 。"
-  },
-  "revenue.transfers.total.method": {
-    "message": "你通过 {method} 提现了 {amount} 。"
-  },
-  "revenue.transfers.total.year": {
-    "message": "你在 {year} 年提现了 {amount} 。"
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "你在 {year} 年通过 {method} 提现了 {amount} 。"
-  },
   "scopes.analytics.description": {
     "message": "访问你的分析数据"
   },
@@ -1761,7 +2223,7 @@
     "message": "写入个人访问令牌"
   },
   "scopes.payoutsRead.description": {
-    "message": "读取你的提款数据"
+    "message": "读取你的提现数据"
   },
   "scopes.payoutsRead.label": {
     "message": "读取提款"
@@ -2019,13 +2481,13 @@
     "message": "确定要取消订阅吗？"
   },
   "settings.billing.modal.delete.action": {
-    "message": "移除这个付款方式"
+    "message": "移除这个支付方式"
   },
   "settings.billing.modal.delete.description": {
-    "message": "这将永久（真的是永远）删除此付款方式。"
+    "message": "这将永久（真的是永远）删除此支付方式。"
   },
   "settings.billing.modal.delete.title": {
-    "message": "确定要删除这个付款方式吗？"
+    "message": "确定要删除这个支付方式吗？"
   },
   "settings.billing.payment_method.action.add": {
     "message": "添加支付方式"
@@ -2034,7 +2496,7 @@
     "message": "查看更改历史记录"
   },
   "settings.billing.payment_method.action.primary": {
-    "message": "设为主要付款方式"
+    "message": "设为主要支付方式"
   },
   "settings.billing.payment_method.card_display": {
     "message": "{card_brand} 尾号 {last_four}"
@@ -2043,13 +2505,13 @@
     "message": "有效期至 {year} 年 {month} 月"
   },
   "settings.billing.payment_method.none": {
-    "message": "你还没有添加付款方式。"
+    "message": "你还没有添加支付方式。"
   },
   "settings.billing.payment_method.primary": {
     "message": "主要"
   },
   "settings.billing.payment_method.title": {
-    "message": "付款方式"
+    "message": "支付方式"
   },
   "settings.billing.payment_method_type.amazon_pay": {
     "message": "Amazon Pay"
@@ -2082,7 +2544,7 @@
     "message": "银联"
   },
   "settings.billing.payment_method_type.unknown": {
-    "message": "未知付款方式"
+    "message": "未知支付方式"
   },
   "settings.billing.payment_method_type.visa": {
     "message": "Visa"
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index a13d77a5..8af5b3c7 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -566,6 +566,27 @@
   "create.project.visibility-unlisted": {
     "message": "不公開"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "建立聯盟行銷連結"
+  },
+  "dashboard.affiliate-links.error.title": {
+    "message": "載入聯盟行銷連結時發生錯誤"
+  },
+  "dashboard.affiliate-links.header": {
+    "message": "你的聯盟行銷連結"
+  },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "這將永久撤銷聯盟行銷代碼 {id}，並且任何使用這個代碼的現有連結將不再有效。"
+  },
+  "dashboard.affiliate-links.revoke-confirm.button": {
+    "message": "撤銷"
+  },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "你確定要撤銷你的「{title}」聯盟行銷連結嗎？"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "搜尋聯盟行銷連結..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "新增"
   },
@@ -614,6 +635,27 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "您是美國公民嗎？"
   },
+  "dashboard.creator-withdraw-modal.complete-tax-form": {
+    "message": "填寫稅表"
+  },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "在有限制的情況下繼續"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "詳細資訊"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "金額"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "匯率"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
+    "message": "費用"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "淨額"
+  },
   "error.collection.404.list_item.1": {
     "message": "你可能輸錯了該收藏的網址。"
   },
@@ -869,6 +911,9 @@
   "layout.action.lookup-by-email": {
     "message": "依電子郵件查詢"
   },
+  "layout.action.manage-affiliates": {
+    "message": "管理聯盟行銷連結"
+  },
   "layout.action.manage-server-notices": {
     "message": "管理伺服器通知"
   },
@@ -1130,6 +1175,12 @@
   "profile.button.manage-projects": {
     "message": "管理專案"
   },
+  "profile.button.remove-affiliate": {
+    "message": "移除聯盟行銷夥伴資格"
+  },
+  "profile.button.set-affiliate": {
+    "message": "設為聯盟行銷夥伴"
+  },
   "profile.details.label.auth-providers": {
     "message": "驗證提供者"
   },
@@ -1154,6 +1205,9 @@
   "profile.error.not-found": {
     "message": "找不到使用者"
   },
+  "profile.label.affiliate": {
+    "message": "聯盟行銷"
+  },
   "profile.label.badges": {
     "message": "徽章"
   },
@@ -1161,7 +1215,7 @@
     "message": "收藏"
   },
   "profile.label.details": {
-    "message": "詳細資料"
+    "message": "詳細資訊"
   },
   "profile.label.downloads": {
     "message": "{count} 次下載"
@@ -1250,9 +1304,6 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "重新提交審核"
   },
-  "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "你的專案已由 Modrinth 的工作人員設為{status}。大部分情況下，在處理了工作人員訊息中提到的問題後，即可重新提交以供審核。"
-  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "你必須完成發布檢查清單中的必要步驟！"
   },
@@ -1335,7 +1386,7 @@
     "message": "提交於 {date}"
   },
   "project.about.details.title": {
-    "message": "詳細資料"
+    "message": "詳細資訊"
   },
   "project.about.details.updated": {
     "message": "更新於 {date}"
@@ -1658,18 +1709,6 @@
   "report.submit": {
     "message": "提交檢舉"
   },
-  "revenue.transfers.total": {
-    "message": "你總共提款了 {amount} 美元。"
-  },
-  "revenue.transfers.total.method": {
-    "message": "你透過 {method} 提款了 {amount} 美元。"
-  },
-  "revenue.transfers.total.year": {
-    "message": "你在 {year} 年提款了 {amount} 美元。"
-  },
-  "revenue.transfers.total.year_method": {
-    "message": "你透過 {method} 在 {year} 年提款了 {amount} 美元。"
-  },
   "scopes.analytics.description": {
     "message": "存取你的分析資料"
   },
diff --git a/packages/moderation/src/locales/cs-CZ/index.json b/packages/moderation/src/locales/cs-CZ/index.json
index a83efed7..63d68af3 100644
--- a/packages/moderation/src/locales/cs-CZ/index.json
+++ b/packages/moderation/src/locales/cs-CZ/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Přidat externí odkazy"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Vybrali jste všechny dostupné značky {totalAvailableTags}. To popírá účel značek, které mají uživatelům pomoci najít relevantní projekty. Vyberte prosím pouze tagy, které jsou pro váš projekt relevantní."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Vyberte vhodné tagy"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Váš popis má {length} čitelných znaků. Pro vytvoření srozumitelného a informativního popisu se doporučuje alespoň {minChars} znaků."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Rozšířit popisek"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Navštivte stránku galerie"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Váš {projectType} používá licenci, která vyžaduje dostupnost zdrojového kódu. Pro každou další verzi uveďte odkaz na zdrojový kód, zdrojový soubor, nebo zvažte použití jiné licence."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Poskytnutí zdrojového kódu"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Před opětovným odesláním zkontrolujte a vyřešte všechny připomínky moderátorského týmu."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Zpětná vazba moderátora"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Vybral jsi {count} tagy rozlišení ({tags}). Balíčky s texturami by obvykle měly mít pouze jeden tag rozlišení, který odpovídá jejich primárnímu rozlišení."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Vyberte správné rozlišení"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "Vyberte prostředí, ve kterých váš {projectType} funguje."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "Zvolte prostředí"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Vyberte licenci, pod kterou je váš {projectType} distribuován."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Vybrat licenci"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Vyjasněte si shrnutí"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Vaše shrnutí má {length} znaků. Pro vytvoření informativního a lákavého shrnutí se doporučuje alespoň {minChars} znaků."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Rozšířte shrnutí"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Udržování čistého názvu projektu usnadňuje jeho zapamatovatelnost a hledání. Informace o verzi a zavaděči se automaticky zobrazují vedle vašeho projektu."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Vyčistěte název"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Vybrali jste {tagCount} tagů. Zvažte snížení počtu na {maxTagCount} nebo méně, aby se váš projekt zobrazoval v relevantních výsledcích vyhledávání."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Vyberte odpovídající tagy"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "K prezentaci obsahu vašeho {type}{resourcepackMessage} je zapotřebí alespoň jeden obrázek v galerii."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Nahrání obrázku do galerie"
   },
diff --git a/packages/moderation/src/locales/de-CH/index.json b/packages/moderation/src/locales/de-CH/index.json
index d2175345..2f7e0c1b 100644
--- a/packages/moderation/src/locales/de-CH/index.json
+++ b/packages/moderation/src/locales/de-CH/index.json
@@ -18,13 +18,13 @@
     "defaultMessage": "Externe Links hinzufügen"
   },
   "nags.all-tags-selected.description": {
-    "defaultMessage": "Du hast alle {totalAvailableTags} verfügbaren Tags ausgewählt. Dies zerstört den Zweck von Tags, welche dem Benutzer helfen sollen, relevante Projecte zu finden. Bitte wähle nur Tags aus, welche für dein Projekt relevant sind."
+    "defaultMessage": "Du hast {totalAvailableTags, plural, one {# verfügbaren Tag} other {alle # verfügbaren Tags}} ausgewählt. Dies zerstört den Zweck von tags, welche Nutzern helfen sollen, relevante Projekte zu finden. Bitte wähle nur die Tags aus, die für dein projekt relevant sind."
   },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Wähle akkurate Tags aus"
   },
   "nags.description-too-short.description": {
-    "defaultMessage": "Deine Beschreibung is {length} lesbare Zeichen lang. Mindestens {minChars} lesbare Zeichen sind empfohlen, um eine klare und informative Beschreibung zu erstellen."
+    "defaultMessage": "Deine Beschreibung ist {length, plural, one {# lesbares Zeichen} other {# lesbare Zeichen}} lang. Mindestens {minChars, plural, one {1 Zeichen} other {# Zeichen}} sind empfohlen, um eine klare uns informative Beschreibung zu erstellen."
   },
   "nags.description-too-short.title": {
     "defaultMessage": "Beschreibung erweitern"
@@ -54,7 +54,7 @@
     "defaultMessage": "Gallerie-Seite besuchen"
   },
   "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Dein {projectType} verwendet eine Lizenz, welche das bereitstellen des Quellcodes verlangt. Bitte stelle für jede weitere Version einen Link zum Quellcode oder eine Quelldatei bereit, oder verwende einenandere Lizenz."
+    "defaultMessage": "Dein{type, select, mod {e Mod} plugin { Plugin} other { Projekt}} verwendet eine Lizenz, welche es verlangt, den Quellcode verfügbar zu machen. Bitte gib einen Link zum Quellcode an, stelle Quelldateien für jede zusätzliche Version bereit, oder verwende eine andere Lizenz."
   },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Quellcode bereitstellen"
@@ -114,22 +114,22 @@
     "defaultMessage": "Überprüfe und behandle alle Bedenken des Moderationsteams, befor du das Projekt erneut einreichst."
   },
   "nags.moderator-feedback.title": {
-    "defaultMessage": "Moderatoren-Feedback ansehen"
+    "defaultMessage": "Feedback überprüfen"
   },
   "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Du hast {count} Auflösungs-Tags ({tags}) ausgewählt. Ressourcenpakete sollten in der Regel nur einen Auflösungs-Tag haben, welches Ihre hauptauflösung entspricht."
+    "defaultMessage": "Du hast {count, plural, one {einen Auflösungs-Tag} other {# Auflösungs-Tags}} ausgewählt ({tags}). Resourcenpakete haben in der Regel nur einen Auflösungs-Tag welches Ihrer primären Auflösung entspricht."
   },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Richtige Auflösung auswählen"
   },
   "nags.select-environments.description": {
-    "defaultMessage": "Wähle die Umgebungen aus, in welcher dein {projectType} funktioniert."
+    "defaultMessage": "Wähle die Umgebung auf welche dein{type, select, mod {e Mod} modpack { Modpaket} other {Projekt}} funktionieren soll."
   },
   "nags.select-environments.title": {
     "defaultMessage": "Umbgebung auswählen"
   },
   "nags.select-license.description": {
-    "defaultMessage": "Wähle die Lizenz, unter welche dein {projectType} vertrieben wird."
+    "defaultMessage": "Wähle die Lizenz, unter welcher dein{type, select, mod {e Mod} modpack { Modpaket} resourcepack { Resourcenpaket} shader { Shader} plugin { Plugin} other { Projekt}} vertrieben wird."
   },
   "nags.select-license.title": {
     "defaultMessage": "Lizenz auswählen"
@@ -171,25 +171,25 @@
     "defaultMessage": "Zusammenfassung bereinigen"
   },
   "nags.summary-too-short.description": {
-    "defaultMessage": "Deine Zusammenfassung ist {length} Zeichen lang. Mindestens {minChars} sind empfohlen, um eine informative und anregende Zusammenfassung zu erstellen."
+    "defaultMessage": "Deine Zusammenfassung ist {length, plural, one {1 Zeichen} other {# Zeichen}} lang. Mindestens {minChars, plural, one {1 Zeichen} other {# Zeichen}} sind empfohlen, um eine anregende und informative Zusammenfassung zu erstellen."
   },
   "nags.summary-too-short.title": {
     "defaultMessage": "Zusammenfassung erweitern"
   },
   "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Halte den Namen deines Projekts übersichtlich und einprägsam, damit es leichter zu finden ist. Versionen und Loader werden automatisch neben deinem Projekt angezeigt."
+    "defaultMessage": "Halte den Namen deines Projekts übersichtlich und einprägsam, damit es leichter zu merken und finden ist. Versionen- und Loader-Informationen werden automatisch neben deinem Projekt angezeigt."
   },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Namen bereinigen"
   },
   "nags.too-many-tags.description": {
-    "defaultMessage": "Du hast {tagCount} tags ausgewählt. Erwäge die Anzahl auf {maxTagCount} oder weniger zu reduzieren, damit dein Projekt in relevanten Suchanfragen erscheint."
+    "defaultMessage": "Du hast {tagCount, plural, one {1 Tag} other {# Tags}} ausgewählt. Erwäge die Anzahl auf {maxTagCount} oder weniger zu reduzieren, damit dein Projekt in relevanten Suchen erscheint."
   },
   "nags.too-many-tags.title": {
     "defaultMessage": "Wähle akkurate Tags aus"
   },
   "nags.upload-gallery-image.description": {
-    "defaultMessage": "Mindestens ein Galleriebild wird benötigt, um den Inhalt deines {type}{resourcepackMessage} zu präsentieren."
+    "defaultMessage": "Mindestens ein Galleriebild ist nötig um den Inhalt {type, select, resourcepack {deines Resourcenpakets - mit ausnahme von Lokalisierungspaketen. Bitte wähle die passenden Tags sollte dies zutreffen. -} shader {deiner Shader} other {deines Projekts}} zu zeigen."
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Lade ein Galleriebild hoch"
diff --git a/packages/moderation/src/locales/de-DE/index.json b/packages/moderation/src/locales/de-DE/index.json
index d7147585..217a3ef8 100644
--- a/packages/moderation/src/locales/de-DE/index.json
+++ b/packages/moderation/src/locales/de-DE/index.json
@@ -18,13 +18,13 @@
     "defaultMessage": "Externe Links hinzufügen"
   },
   "nags.all-tags-selected.description": {
-    "defaultMessage": "Sie haben alle {totalAvailableTags} verfügbaren Tags ausgewählt. Dies widerspricht dem Zweck von Tags, die den Benutzern helfen sollen, relevante Projekte zu finden. Bitte wählen Sie nur die Tags aus, die für Ihr Projekt relevant sind."
+    "defaultMessage": "Du hast alle {totalAvailableTags, plural, one {# verfügbaren Tag} other {# verfügbaren Tags}} ausgewählt. Das widerspricht dem Zweck von Tags, die dazu dienen, Nutzern zu helfen, relevante Projekte zu finden. Bitte wähle nur die Tags aus, die wirklich zu deinem Projekt passen."
   },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Wählen Sie sinnvolle Tags aus"
   },
   "nags.description-too-short.description": {
-    "defaultMessage": "Ihre Beschreibung umfasst {length} lesbare Zeichen. Es werden mindestens {minChars} Zeichen empfohlen, um eine klare und informative Beschreibung zu erstellen."
+    "defaultMessage": "Deine Beschreibung enthält {length, plural, one {# lesbares Zeichen} other {# lesbare Zeichen}}. Es wird empfohlen, mindestens {minChars, plural, one {# Zeichen} other {# Zeichen}} zu verwenden, um eine klare und informative Beschreibung zu erstellen."
   },
   "nags.description-too-short.title": {
     "defaultMessage": "Beschreibung erweitern"
@@ -54,7 +54,7 @@
     "defaultMessage": "Zur Galerie-Seite"
   },
   "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Dein {projectType} verwendet eine Lizenz, die die Verfügbarkeit des Quellcodes vorschreibt. Bitte stelle für jede zusätzliche Version einen Link zum Quellcode oder eine Quelldatei bereit oder verwende eine andere Lizenz."
+    "defaultMessage": "Dein {type, select, mod {Mod} plugin {Plugin} other {Projekt}} verwendet eine Lizenz, die erfordert, dass der Quellcode verfügbar ist. Bitte gib für jede zusätzliche Version einen Link zum Quellcode oder eine Quelldatei an, oder erwäge, eine andere Lizenz zu verwenden."
   },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Quellcode bereitstellen"
@@ -114,22 +114,22 @@
     "defaultMessage": "Überprüfen Sie alle Bedenken des Moderationsteams und gehen Sie darauf ein, bevor Sie den Beitrag erneut einreichen."
   },
   "nags.moderator-feedback.title": {
-    "defaultMessage": "Sehen sie sich das Feedback von den Moderatoren an"
+    "defaultMessage": "Feedback überprüfen"
   },
   "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Du hast {count} Auflösungs-Tags ausgewählt ({tags}). Ressourcenpakete sollten in der Regel nur ein Auflösungs-Tag haben, das der primären Auflösung entspricht."
+    "defaultMessage": "Du hast {count, plural, one {# Auflösungs-Tag} other {# Auflösungs-Tags}} ({tags}) ausgewählt. Ressourcenpakete sollten in der Regel nur ein Auflösungs-Tag haben, das ihrer Hauptauflösung entspricht."
   },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Wählen Sie die richtige Auflösung aus"
   },
   "nags.select-environments.description": {
-    "defaultMessage": "Wähle die Umgebungen aus, auf denen dein {projectType} funktioniert."
+    "defaultMessage": "Wähle die Umgebungen aus, in denen dein {type, select, mod {Mod} modpack {Modpack} other {Projekt}} funktioniert."
   },
   "nags.select-environments.title": {
     "defaultMessage": "Umgebung auswählen"
   },
   "nags.select-license.description": {
-    "defaultMessage": "Wählen Sie die Lizenz aus, unter der Ihr {projectType} veröffentlicht wird."
+    "defaultMessage": "Wähle die Lizenz aus, unter der dein {type, select, mod {Mod} modpack {Modpack} resourcepack {Ressourcenpaket} shader {Shader} plugin {Plugin} datapack {Datenpaket} other {Projekt}} veröffentlicht wird."
   },
   "nags.select-license.title": {
     "defaultMessage": "Lizenz auswählen"
@@ -171,25 +171,25 @@
     "defaultMessage": "Zusammenfassung bereinigen"
   },
   "nags.summary-too-short.description": {
-    "defaultMessage": "Ihre Zusammenfassung umfasst {length} Zeichen. Es werden mindestens {minChars} Zeichen empfohlen, um eine informative und ansprechende Zusammenfassung zu erstellen."
+    "defaultMessage": "Deine Zusammenfassung enthält {length, plural, one {# Zeichen} other {# Zeichen}}. Es wird empfohlen, mindestens {minChars, plural, one {# Zeichen} other {# Zeichen}} zu verwenden, um eine informative und ansprechende Zusammenfassung zu erstellen."
   },
   "nags.summary-too-short.title": {
     "defaultMessage": "Zusammenfassung erweitern"
   },
   "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Halten Sie den Namen Ihres Projekts übersichtlich und einprägsam, damit es leichter zu finden ist. Versions- und Loader-Informationen werden automatisch neben Ihrem Projekt angezeigt."
+    "defaultMessage": "Ein klarer, übersichtlicher Name macht dein Projekt einprägsamer und leichter auffindbar. Versions- und Loader-Informationen werden automatisch neben deinem Projekt angezeigt."
   },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Namen bereinigen"
   },
   "nags.too-many-tags.description": {
-    "defaultMessage": "Sie haben {tagCount} Tags ausgewählt. Reduzieren Sie die Anzahl auf {maxTagCount} oder weniger, damit Ihr Projekt in den relevanten Suchergebnissen angezeigt wird."
+    "defaultMessage": "Du hast {tagCount, plural, one {# Tag} other {# Tags}} ausgewählt. Reduziere die Anzahl auf {maxTagCount} oder weniger, damit dein Projekt in den relevanten Suchergebnissen erscheint."
   },
   "nags.too-many-tags.title": {
     "defaultMessage": "Wählen Sie genaue Tags aus"
   },
   "nags.upload-gallery-image.description": {
-    "defaultMessage": "Es ist mindestens ein Galeriebild erforderlich, um den Inhalt Ihres {type}{resourcepackMessage} zu präsentieren."
+    "defaultMessage": "Mindestens ein Galeriebild ist erforderlich, um den Inhalt deines {type, select,\nresourcepack {Ressourcenpakets zu präsentieren, außer bei Audio- oder Sprachpaketen. Wenn dies auf dein Paket zutrifft, wähle bitte das entsprechende Tag aus} shader {Shaders} other {Projekts}} zu zeigen."
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Galeriebild hochladen"
diff --git a/packages/moderation/src/locales/es-419/index.json b/packages/moderation/src/locales/es-419/index.json
index 8ff4ba51..7be3f9b3 100644
--- a/packages/moderation/src/locales/es-419/index.json
+++ b/packages/moderation/src/locales/es-419/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Agregar enlaces externos"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Has seleccionado todas las {totalAvailableTags} etiquetas disponibles. Esto va en contra del propósito de las etiquetas, que es ayudar a los usuarios a encontrar proyectos relevantes. Selecciona solo las etiquetas que sean relevantes para tu proyecto."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Selecciona las etiquetas adecuadas"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Tu descripción tiene {length} caracteres legibles. Se recomienda al menos {minChars} caracteres para que la descripción sea clara e informativa."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Expandir la descripción"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Ver galería"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Tu {projectType} usa una licencia que requiere que el código fuente esté disponible. Proporciona un enlace al código fuente o un archivo de fuentes para cada versión adicional, o considera usar otra licencia."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Proporciona el código fuente"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Revisa y atiende todas las inquietudes del equipo de moderación antes de volver a enviar."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Revisar comentarios del moderador"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Has seleccionado {count} etiquetas de resolución ({tags}). Los paquetes de recursos normalmente solo deben tener una etiqueta de resolución que coincida con la resolución principal."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Elige la resolución correcta"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "Selecciona los entornos en los que funciona tu {projectType}."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "Selecciona entornos"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Selecciona la licencia bajo la cual se distribuye tu {projectType}."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Selecciona una licencia"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Hacer el resumen más claro"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Tu resumen tiene {length} caracteres. Se recomienda un mínimo de {minChars} caracteres para crear un resumen claro e informativo."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Ampliar el resumen"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Mantener el nombre de tu proyecto limpio y fácil de recordar facilita que sea más fácil de encontrar. La información sobre la versión y el loader se muestra automáticamente junto a tu proyecto."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Hacer el nombre más claro"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Has seleccionado {tagCount} etiquetas. Considera reducir el número a {maxTagCount} o menos para asegurarte de que tu proyecto aparezca en los resultados de búsqueda relevantes."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Selecciona etiquetas adecuadas"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "Se requiere al menos una imagen en la galería para mostrar el contenido de tu {type}{resourcepackMessage}."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Subir una imagen a la galería"
   },
diff --git a/packages/moderation/src/locales/es-ES/index.json b/packages/moderation/src/locales/es-ES/index.json
index 5beaf4c7..90285ced 100644
--- a/packages/moderation/src/locales/es-ES/index.json
+++ b/packages/moderation/src/locales/es-ES/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Añadir enlaces externos"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Ha seleccionado todas las {totalAvailableTags} etiquetas disponibles. Esto va en contra del propósito de las etiquetas, que es ayudar a los usuarios a encontrar proyectos relevantes. Seleccione solo las etiquetas que sean relevantes para su proyecto."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Selecciona etiquetas precisas"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Tu descripción tiene {length} caracteres legibles. Se recomienda un mínimo de {minChars} caracteres para crear una descripción clara e informativa."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Amplíe la descripción"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Visitar la página de la galería"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Tu {projectType} utiliza una licencia que requiere que el código fuente esté disponible. Proporciona un enlace al código fuente o un archivo de fuentes para cada versión adicional, o considera la posibilidad de utilizar una licencia diferente."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Proporcionar el código fuente"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Revisa y aborda todas las inquietudes del equipo de moderación antes de volver a enviar."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Revisar los comentarios del moderador"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Has seleccionado {count} etiquetas de resolución ({tags}). Los paquetes de recursos normalmente solo deben tener una etiqueta de resolución que coincida con su resolución principal."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Selecciona la resolución correcta"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "Seleccione los entornos en los que funciona su {projectType}."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "Seleccionar entornos"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Seleccione la licencia bajo la cual se distribuye su {projectType}."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Seleccionar una licencia"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Aclara el resumen"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Tu resumen tiene {length} caracteres. Se recomienda un mínimo de {minChars} caracteres para crear un resumen informativo y atractivo."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Expandir el resumen"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Mantener el Nombre de tu proyecto limpio y fácil de recordar facilita su búsqueda. La información sobre la versión y el cargador se muestra automáticamente junto a tu proyecto."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Limpiar el nombre"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Has seleccionado {tagCount} etiquetas. Considera reducir el número a {maxTagCount} o menos para asegurarte de que tu proyecto aparezca en los resultados de búsqueda relevantes."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Selecciona etiquetas precisas"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "Se requiere al menos una imagen de galería para mostrar el contenido de tu {type}{resourcepackMessage}."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Subir una imagen a la galería"
   },
diff --git a/packages/moderation/src/locales/fi-FI/index.json b/packages/moderation/src/locales/fi-FI/index.json
index 12ab2a96..ec17047c 100644
--- a/packages/moderation/src/locales/fi-FI/index.json
+++ b/packages/moderation/src/locales/fi-FI/index.json
@@ -38,9 +38,6 @@
   "nags.minecraft-title-clause.description": {
     "defaultMessage": "Projektit eivät saa käyttää Minecraftin brändäystä tai sisältää \"Minecraft\" sanaa suurena osana nimeä."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Tarkasta moderaattorien palaute"
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Valitse oikea resoluutio"
   },
diff --git a/packages/moderation/src/locales/fr-FR/index.json b/packages/moderation/src/locales/fr-FR/index.json
index 12224dfa..591740b2 100644
--- a/packages/moderation/src/locales/fr-FR/index.json
+++ b/packages/moderation/src/locales/fr-FR/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Ajouter des liens externes"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Vous avez sélectionné les {totalAvailableTags} tags disponibles. Cela va à l’encontre de l’objectif des tags, qui sont censés aider les utilisateurs à trouver des projets pertinents. Veuillez ne sélectionner que les tags qui sont réellement liés à votre projet."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Sélectionnez des tags précis"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Votre description contient {length} caractères lisibles. Il est recommandé d’en avoir au moins {minChars} pour créer une description claire et informative."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Développer la description"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Voir la galerie"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Votre {projectType} utilise une licence qui exige que le code source soit disponible. Veuillez fournir un lien vers le code source ou un fichier contenant les sources pour chaque version supplémentaire, ou envisagez d’utiliser une autre licence."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Fournir le code source"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Examinez et traitez toutes les remarques de l’équipe de modération avant de soumettre à nouveau."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Examiner les retours des modérateurs"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Vous avez sélectionné {count} tags de résolution ({tags}). Les packs de ressources ne devraient généralement avoir qu’un seul tag de résolution correspondant à leur résolution principale."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Sélectionner la bonne résolution"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "Sélectionnez les environnements où votre {projectType} fonctionne."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "Sélectionner l'environnement"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Sélectionnez la licence sous laquelle votre {projectType} est distribué."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Sélectionner une licence"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Nettoyer le résumé"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Votre résumé contient {length} caractères. Il est recommandé d’en avoir au moins {minChars} pour créer un résumé informatif et attrayant."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Développer le résumé"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Garder le nom de votre projet clair le rend plus mémorable et plus facile à trouver. \nLes informations sur la version et le chargeur sont affichées automatiquement avec votre projet."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Nettoyer le nom"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Vous avez sélectionné {tagCount} tags. Envisagez de réduire à {maxTagCount} ou moins afin que votre projet apparaisse dans les résultats de recherche pertinents."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Sélectionnez des tags précis"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "Au moins une image de la galerie est requise pour présenter le contenu de votre {type}{resourcepackMessage}."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Ajouter une image à la galerie"
   },
diff --git a/packages/moderation/src/locales/he-IL/index.json b/packages/moderation/src/locales/he-IL/index.json
index d5b79470..723663d8 100644
--- a/packages/moderation/src/locales/he-IL/index.json
+++ b/packages/moderation/src/locales/he-IL/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "הוסף קישורים חיצוניים"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "בחרת בכל {totalAvailableTags} התגיות הזמינות. הדבר מנוגד למטרת התגיות, שנועדו לעזור למשתמשים למצוא פרויקטים רלוונטיים. אנא בחר רק את התגיות הרלוונטיות לפרויקט שלך."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "בחר תגיות מדויקות"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "התיאור שלך מכיל {length} תווים קריאים. מומלץ לכלול לפחות {minChars} תווים כדי ליצור תיאור ברור ואינפורמטיבי."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "הרחב את התיאור"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "בקר בדף הגלריה"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "ה-{projectType} שלך משתמש ברישיון הדורש קוד מקור זמין. אנא ספק קישור לקוד המקור או קובץ מקורות עבור כל גרסה נוספת, או שקול להשתמש ברישיון אחר."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "ספק קוד מקור"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "עיין בחוות הדעת של צוות הפיקוח והבקרה וטפל בכל הבעיות לפני הגשה חוזרת."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "עיין בחוות דעת של מפקחים"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "בחרת ב-{count} תגיות רזולוציה ({tags}). חבילות משאבים צריכות בדרך כלל לכלול תגית רזולוציה אחת בלבד, התואמת לרזולוציה הראשית שלהן."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "בחר רזולוציה נכונה"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "בחר את הסביבות שבהן ה-{projectType} שלך פועל."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "בחר סביבות"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "בחר את הרישיון שבו מופץ ה-{projectType} שלך."
-  },
   "nags.select-license.title": {
     "defaultMessage": "בחירת רישיון"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "נקה את התקציר"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "התקציר שלך באורך {length} תווים. מומלץ לרשום לפחות {minChars} תווים על מנת ליצור תקציר אינפורמטיבי ומעניין."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "הארך את התקציר"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "שמירת שם הפרוייקט שלך נקי הופך אותו לקל יותר לזכירה ולמציאה. פרטים אודות גרסה וטוען המודים מופיעים באופן אוטומטי לצד שם הפרוייקט."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "נקה את השם"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "בחרת {tagCount} תגים. שקול להפחית את כמות התגים ל {maxTagCount} או פחות על מנת שהפרוייקט שלך יופיע בחיפושים הרלוונטיים."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "בחר תגים מדוייקים"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "לפחות תמונת גלריה אחת נדרשת בכדי להציג את התוכן של {type}{resourcepackMessage}."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "העלה תמונת גלריה"
   },
diff --git a/packages/moderation/src/locales/id-ID/index.json b/packages/moderation/src/locales/id-ID/index.json
index aa4271ec..eb36d5d2 100644
--- a/packages/moderation/src/locales/id-ID/index.json
+++ b/packages/moderation/src/locales/id-ID/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Tambah tautan eksternal"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Anda memilih {totalAvailableTags} etiket tersedia. Ini bertentangan dengan tujuan etiket, yang bertujuan membantu pengguna mencari proyek yang relevan. Mohon hanya pilih etiket yang relevan dengan proyek Anda."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Pilih etiket yang tepat"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Panjang keterangan Anda adalah {length} karakter yang dapat dibaca. Setidaknya {minChars} karakter disarankan untuk membuat keterangan yang jelas dan informatif."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Kembangkan keterangan"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Kunjungi laman galeri"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "{projectType} Anda menggunakan lisensi yang memerlukan kode sumber agar dapat tersedia. Mohon berikan tautan kode sumber atau berkas sumber untuk setiap versi tambahan, atau pertimbangkan untuk menggunakan lisensi lain."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Berikan kode sumber"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Tinjau dan tanggapi semua kekhawatiran dari tim moderasi sebelum menyerahkan ulang."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Tinjau umpan balik moderator"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Anda memilih {count} etiket resolusi ({tags}). Paket sumber seharusnya hanya memiliki satu etiket resolusi yang sepadan dengan resolusi utamanya."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Pilih resolusi yang benar"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "Pilih lingkungan di mana {projectType} Anda berfungsi."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "Pilih lingkungan"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Pilih lisensi yang digunakan untuk distribusi {projectType} Anda."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Pilih lisensi"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Bersihkan ringkasan"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Panjang ringkasan Anda adalah {length} karakter. Setidaknya {minChars} karakter disarankan untuk membuat ringkasan yang informatif dan menarik."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Kembangkan ringkasan"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Nama proyek yang ringkas dan mudah diingat akan memudahkan pencarian. Informasi versi dan pemuat akan ditampilkan bersamaan secara otomatis dengan proyek Anda."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Bersihkan nama"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Anda memilih {tagCount} etiket. Pertimbangkan untuk menguranginya menjadi {maxTagCount} atau kurang untuk memastikan proyek Anda muncul pada hasil pencarian yang relevan."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Pilih etiket yang tepat"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "Setidaknya satu gambar galeri diperlukan untuk memamerkan konten dari {type}{resourcepackMessage} Anda."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Unggah gambar galeri"
   },
diff --git a/packages/moderation/src/locales/it-IT/index.json b/packages/moderation/src/locales/it-IT/index.json
index 869aa85d..6bed4aa3 100644
--- a/packages/moderation/src/locales/it-IT/index.json
+++ b/packages/moderation/src/locales/it-IT/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Aggiungi link esterni"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Hai selezionato tutti i {totalAvailableTags} tag disponibili. Questo rende i tag, che servono ad aiutare gli utenti a trovare progetti pertinenti, del tutto inutili. Si prega di selezionare solo i tag pertinenti al tuo progetto."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Seleziona tag accurati"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "La tua descrizione è di {length} caratteri leggibili. Si consiglia di scrivere almeno {minChars} caratteri per avere una descrizione pulita e informativa."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Espandi la descrizione"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Visita la galleria"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Il tuo {projectType} utilizza una licenza che necessita che sia disponibile il codice sorgente. Si prega di fornire un link al codice sorgente, o un file sorgente per ogni versione aggiuntiva, oppure potresti scegliere un'altra licenza."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Fornisci codice sorgente"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Controlla e rispondi a tutte le richieste del team di moderazione prima di reinviare."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Controlla il feedback dei moderatori"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Hai selezionato {count} tag di risoluzione ({tags}). I pacchetti di risorse dovrebbero avere un solo tag di risoluzione che corrisponda alla loro risoluzione primaria."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Seleziona risoluzione corretta"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "Seleziona gli ambienti su cui il tuo {projectType} funziona."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "Seleziona ambienti"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Seleziona la licenza con la quale il tuo {projectType} è distribuito."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Scegli una licenza"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Rivedi il riepilogo"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Il tuo riepilogo è di {length} caratteri. Ѐ consigliato utilizzare almeno {minChars} caratteri perché il riepilogo sia informativo e accattivante."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Espandi il riepilogo"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Mantenere il nome del progetto semplice lo rende semplice da memorizzare e trovare. Le informazioni sulla versione e sul loader vengono mostrate automaticamente insieme al progetto."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Rivedi il nome"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Hai selezionato {tagCount} tag. Considera di ridurli a {maxTagCount} o meno per assicurarti che il tuo progetto appaia solo nelle ricerche più rilevanti."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Seleziona tag accurati"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "È necessaria almeno un'immagine di galleria per mostrare il contenuto del tuo {type}{resourcepackMessage}."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Carica un'immagine"
   },
diff --git a/packages/moderation/src/locales/ja-JP/index.json b/packages/moderation/src/locales/ja-JP/index.json
index a30876c3..b199e7ea 100644
--- a/packages/moderation/src/locales/ja-JP/index.json
+++ b/packages/moderation/src/locales/ja-JP/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "外部リンクを追加する"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "使用できるすべてのタグ {totalAvailableTags} を使用しています。これではタグから関連するプロジェクトを検索することができなくなってしまうので、プロジェクトに関係するタグのみを選択してください。"
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "プロジェクトと関係のあるタグを選択する"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "プロジェクトの説明が{length}文字しかありません。分かりやすく十分な情報を提供するために、少なくとも{minChars}文字以上の説明をおすすめします。"
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "さらに説明を追加する"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "ギャラリーのページを閲覧する"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "この{projectType}はソースコードの公開が必要なライセンスを使用しています。ソースコードのリンクの追加、バージョンごとのソースファイルの添付またはライセンスの変更を行ってください。"
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "ソースコードのリンクの追加"
   },
@@ -113,24 +104,15 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "モデレーターチームからのすべての懸念事項を確認し、対応した上で再提出してください。"
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "レビューモデレーターからのフィードバックを確認"
-  },
   "nags.multiple-resolution-tags.description": {
     "defaultMessage": "{count}個の解像度タグ（{tags}）を選択しました。リソースパックは通常、主要な解像度と一致する1つの解像度タグのみを含むべきです。"
   },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "正しい解像度を選択"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "{projectType} が機能する環境を選択ください。"
-  },
   "nags.select-environments.title": {
     "defaultMessage": "環境を選択"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "{projectType}が配布されているライセンスを選択してください。"
-  },
   "nags.select-license.title": {
     "defaultMessage": "ライセンスを選択"
   },
@@ -170,27 +152,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "要約を整理"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "要約は{length}文字です。情報豊富で魅力的な要約を作成するには、少なくとも{minChars}文字以上を推奨します。"
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "要約を展開"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "プロジェクトの名前はシンプルで覚えやすくすることで、検索しやすくなります。\nバージョンとローダー情報は、プロジェクトと共に自動的に表示されます。"
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "名前を整理"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "{tagCount}個のタグを選択しました。関連する検索結果に表示されるように、{maxTagCount}個以下に減らすことを検討してください。"
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "正確なタグを選択"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "{type}{resourcepackMessage}の内容を展示するために、少なくとも1つのギャラリー画像が必要です。"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "ギャラリー画像をアップロード"
   },
diff --git a/packages/moderation/src/locales/ms-Arab/index.json b/packages/moderation/src/locales/ms-Arab/index.json
index 74f89ec7..9194c2b2 100644
--- a/packages/moderation/src/locales/ms-Arab/index.json
+++ b/packages/moderation/src/locales/ms-Arab/index.json
@@ -18,13 +18,13 @@
     "defaultMessage": "تمبه ڤاءوتن لوارن"
   },
   "nags.all-tags-selected.description": {
-    "defaultMessage": "اندا تله مميليه کسموا {totalAvailableTags} تݢ يڠ ترسديا. اين مڠالهکن توجوان تݢ⹁ يڠ برتوجوان اونتوق ممبنتو ڤڠݢونا منچاري ڤروجيک يڠ برکاءيتن. سيلا ڤيليه هاڽ تݢ يڠ برکاءيتن دڠن ڤروجيک اندا."
+    "defaultMessage": "Anda telah memilih kesemua {totalAvailableTags, plural, other {# tag yang tersedia}}. Ini mengalahkan tujuan tag, yang bertujuan untuk membantu pengguna mencari projek yang berkaitan. Sila pilih hanya tag yang berkaitan dengan projek anda."
   },
   "nags.all-tags-selected.title": {
     "defaultMessage": "ڤيليه تݢ يڠ تڤت"
   },
   "nags.description-too-short.description": {
-    "defaultMessage": "ڤنجڠ کترڠن اندا اياله {length} اکسارا يڠ بوليه دباچ. سکورڠ٢ڽ {minChars} اکسارا دشورکن اونتوق ممبوات کترڠن يڠ جلس دان برمعلومت."
+    "defaultMessage": "Panjang keterangan anda ialah {length, plural, other {# aksara yang boleh dibaca}}. Sekurang-kurangnya {minChars, plural, other {# aksara}} disyorkan untuk membuat keterangan yang jelas dan bermaklumat."
   },
   "nags.description-too-short.title": {
     "defaultMessage": "کمبڠکن کترڠن"
@@ -54,7 +54,7 @@
     "defaultMessage": "لاوت لامن ݢالري"
   },
   "nags.gpl-license-source-required.description": {
-    "defaultMessage": "{projectType} اندا مڠݢوناکن ليسين يڠ ممرلوکن کود سومبر ترسديا. سيلا برايکن ڤاءوتن کود سومبر اتاو فاءيل سومبر اونتوق ستياڤ ۏرسي تمبهن اتاو ڤرتيمبڠکن اونتوق مڠݢوناکن ليسين يڠ بربيذا."
+    "defaultMessage": "{type, select, mod {Mod} plugin {Pemalam} other {Projek}} anda sedang menggunakan lesen yang memerlukan kod sumber tersedia. Sila berikan pautan kod sumber atau fail sumber untuk setiap versi tambahan atau pertimbangkan untuk menggunakan lesen yang berbeza."
   },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "سدياکن کود سومبر"
@@ -114,22 +114,22 @@
     "defaultMessage": "سيمق دان تاڠني سموا کبيمبڠن درڤد ڤاسوقن ڤڽدرهان سبلوم مڽرهکن سمولا."
   },
   "nags.moderator-feedback.title": {
-    "defaultMessage": "سيمق معلوم بالس ڤڽدرهان"
+    "defaultMessage": "Semak maklum balas"
   },
   "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "اندا تله مميليه {count} تݢ ريسولوسي ({tags}). ڤيک سومبر بياساڽ هاڽ ممڤوڽاءي ساتو تݢ ريسولوسي يڠ سڤادن دڠن ريسولوسي اوتامڽ."
+    "defaultMessage": "Anda telah memilih {count, plural, other {# tag resolusi}} ({tags}). Pek sumber biasanya hanya mempunyai satu tag resolusi yang sepadan dengan resolusi utamanya."
   },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "ڤيليه ريسولوسي يڠ بتول"
   },
   "nags.select-environments.description": {
-    "defaultMessage": "ڤيليه ڤرسکيترن دمان {projectType} اندا برفوڠسي."
+    "defaultMessage": "Pilih persekitaran di mana {type, select, mod {mod} modpack {pek mod} other {projek}} anda berfungsi."
   },
   "nags.select-environments.title": {
     "defaultMessage": "ڤيليه ڤرسکيترن"
   },
   "nags.select-license.description": {
-    "defaultMessage": "ڤيليه ليسين يڠ دݢوناکن اونتوق ڤڠيدرن {projectType} اندا."
+    "defaultMessage": "Pilih lesen yang digunakan untuk pengedaran {type, select, mod {mod} modpack {pek mod} resourcepack {pek sumber} shader {pembayang} plugin {pemalam} datapack {pek data} other {projek}} anda."
   },
   "nags.select-license.title": {
     "defaultMessage": "ڤيليه ليسين"
@@ -171,25 +171,25 @@
     "defaultMessage": "برسيهکن ريڠکسن"
   },
   "nags.summary-too-short.description": {
-    "defaultMessage": "ڤنجڠ ريڠکسن اندا اياله {length} اکسارا. سکورڠ٢ڽ {minChars} اکسارا دشورکن اونتوق ممبوات ريڠکسن يڠ برمعلومت دان مناريق."
+    "defaultMessage": "Panjang ringkasan anda ialah {length, plural, other {# aksara}}. Sekurang-kurangnya {minChars, plural, other {# aksara}} disyorkan untuk membuat ringkasan yang bermaklumat dan menarik."
   },
   "nags.summary-too-short.title": {
     "defaultMessage": "کمبڠکن ريڠکسن"
   },
   "nags.title-contains-technical-info.description": {
-    "defaultMessage": "نام ڤروجيک اندا يڠ کمس دان دايڠتي اکن منجاديکنڽ موده اونتوق دچاري. معلومت ۏرسي دان ڤموات دڤاڤرکن سچارا اءوتوماتيک برسام ڤروجيک اندا."
+    "defaultMessage": "Nama projek anda yang kemas akan menjadikannya lebih diingati dan mudah untuk dicari. Maklumat versi dan pemuat dipaparkan secara automatik bersama projek anda."
   },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "برسيهکن نام"
   },
   "nags.too-many-tags.description": {
-    "defaultMessage": "اندا تله مميليه سباڽق {tagCount} تݢ. ڤرتيمبڠکن اونتوق مڠورڠکنڽ کڤد {maxTagCount} اتاو کورڠ اونتوق ممستيکن ڤروجيک اندا دڤاڤرکن دالم حاصيل چارين يڠ برکاءيتن."
+    "defaultMessage": "Anda telah memilih sebanyak {tagCount, plural, other {# tag}} Pertimbangkan untuk mengurangkannya kepada kurang atau sama dengan {maxTagCount} untuk memastikan projek anda dipaparkan dalam hasil carian yang berkaitan."
   },
   "nags.too-many-tags.title": {
     "defaultMessage": "ڤيليه تݢ يڠ تڤت"
   },
   "nags.upload-gallery-image.description": {
-    "defaultMessage": "سکورڠ٢ڽ ساتو ݢمبر ݢالري دڤرلوکن اونتوق ممڤاميرکن کاندوڠن {type}{resourcepackMessage} اندا."
+    "defaultMessage": "Sekurang-kurangnya satu gambar galeri diperlukan untuk mempamerkan kandungan {type, select, resourcepack {pek sumber anda, melainkan ianya pek audio atau terjemahan. Jika pek ini adalah pek audio atau terjemahan, sila pilih tag yang sesuai} shader {pembayang anda} other {projek anda}}."
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "موات ناءيق ݢمبر ݢالري"
diff --git a/packages/moderation/src/locales/ms-MY/index.json b/packages/moderation/src/locales/ms-MY/index.json
index 254950c3..c8e7cc62 100644
--- a/packages/moderation/src/locales/ms-MY/index.json
+++ b/packages/moderation/src/locales/ms-MY/index.json
@@ -18,13 +18,13 @@
     "defaultMessage": "Tambah pautan luaran"
   },
   "nags.all-tags-selected.description": {
-    "defaultMessage": "Anda telah memilih kesemua {totalAvailableTags} tag yang tersedia. Ini mengalahkan tujuan tag, yang bertujuan untuk membantu pengguna mencari projek yang berkaitan. Sila pilih hanya tag yang berkaitan dengan projek anda."
+    "defaultMessage": "Anda telah memilih kesemua {totalAvailableTags, plural, other {# tag yang tersedia}}. Ini mengalahkan tujuan tag, yang bertujuan untuk membantu pengguna mencari projek yang berkaitan. Sila pilih hanya tag yang berkaitan dengan projek anda."
   },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Pilih tag yang tepat"
   },
   "nags.description-too-short.description": {
-    "defaultMessage": "Panjang keterangan anda ialah {length} aksara yang boleh dibaca. Sekurang-kurangnya {minChars} aksara disyorkan untuk membuat keterangan yang jelas dan bermaklumat."
+    "defaultMessage": "Panjang keterangan anda ialah {length, plural, other {# aksara yang boleh dibaca}}. Sekurang-kurangnya {minChars, plural, other {# aksara}} disyorkan untuk membuat keterangan yang jelas dan bermaklumat."
   },
   "nags.description-too-short.title": {
     "defaultMessage": "Kembangkan keterangan"
@@ -54,7 +54,7 @@
     "defaultMessage": "Lawat laman galeri"
   },
   "nags.gpl-license-source-required.description": {
-    "defaultMessage": "{projectType} anda menggunakan lesen yang memerlukan kod sumber tersedia. Sila berikan pautan kod sumber atau fail sumber untuk setiap versi tambahan atau pertimbangkan untuk menggunakan lesen yang berbeza."
+    "defaultMessage": "{type, select, mod {Mod} plugin {Pemalam} other {Projek}} anda sedang menggunakan lesen yang memerlukan kod sumber tersedia. Sila berikan pautan kod sumber atau fail sumber untuk setiap versi tambahan atau pertimbangkan untuk menggunakan lesen yang berbeza."
   },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Sediakan kod sumber"
@@ -114,22 +114,22 @@
     "defaultMessage": "Semak dan tangani semua kebimbangan daripada pasukan penyederhana sebelum menyerahkan semula."
   },
   "nags.moderator-feedback.title": {
-    "defaultMessage": "Semak maklum balas penyederhana"
+    "defaultMessage": "Semak maklum balas"
   },
   "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Anda telah memilih {count} tag resolusi ({tags}). Pek sumber biasanya hanya mempunyai satu tag resolusi yang sepadan dengan resolusi utamanya."
+    "defaultMessage": "Anda telah memilih {count, plural, other {# tag resolusi}} ({tags}). Pek sumber biasanya hanya mempunyai satu tag resolusi yang sepadan dengan resolusi utamanya."
   },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Pilih resolusi yang betul"
   },
   "nags.select-environments.description": {
-    "defaultMessage": "Pilih persekitaran di mana {projectType} anda berfungsi."
+    "defaultMessage": "Pilih persekitaran di mana {type, select, mod {mod} modpack {pek mod} other {projek}} anda berfungsi."
   },
   "nags.select-environments.title": {
     "defaultMessage": "Pilih persekitaran"
   },
   "nags.select-license.description": {
-    "defaultMessage": "Pilih lesen yang digunakan untuk pengedaran {projectType} anda."
+    "defaultMessage": "Pilih lesen yang digunakan untuk pengedaran {type, select, mod {mod} modpack {pek mod} resourcepack {pek sumber} shader {pembayang} plugin {pemalam} datapack {pek data} other {projek}} anda."
   },
   "nags.select-license.title": {
     "defaultMessage": "Pilih lesen"
@@ -171,25 +171,25 @@
     "defaultMessage": "Bersihkan ringkasan"
   },
   "nags.summary-too-short.description": {
-    "defaultMessage": "Panjang ringkasan anda ialah {length} aksara. Sekurang-kurangnya {minChars} aksara disyorkan untuk membuat ringkasan yang bermaklumat dan menarik."
+    "defaultMessage": "Panjang ringkasan anda ialah {length, plural, other {# aksara}}. Sekurang-kurangnya {minChars, plural, other {# aksara}} disyorkan untuk membuat ringkasan yang bermaklumat dan menarik."
   },
   "nags.summary-too-short.title": {
     "defaultMessage": "Kembangkan ringkasan"
   },
   "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Nama projek anda yang kemas dan diingati akan menjadikannya mudah untuk dicari. Maklumat versi dan pemuat dipaparkan secara automatik bersama projek anda."
+    "defaultMessage": "Nama projek anda yang kemas akan menjadikannya lebih diingati dan mudah untuk dicari. Maklumat versi dan pemuat dipaparkan secara automatik bersama projek anda."
   },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Bersihkan nama"
   },
   "nags.too-many-tags.description": {
-    "defaultMessage": "Anda telah memilih sebanyak {tagCount} tag. Pertimbangkan untuk mengurangkannya kepada {maxTagCount} atau kurang untuk memastikan projek anda dipaparkan dalam hasil carian yang berkaitan."
+    "defaultMessage": "Anda telah memilih sebanyak {tagCount, plural, other {# tag}} Pertimbangkan untuk mengurangkannya kepada kurang atau sama dengan {maxTagCount} untuk memastikan projek anda dipaparkan dalam hasil carian yang berkaitan."
   },
   "nags.too-many-tags.title": {
     "defaultMessage": "Pilih tag yang tepat"
   },
   "nags.upload-gallery-image.description": {
-    "defaultMessage": "Sekurang-kurangnya satu gambar galeri diperlukan untuk mempamerkan kandungan {type}{resourcepackMessage} anda."
+    "defaultMessage": "Sekurang-kurangnya satu gambar galeri diperlukan untuk mempamerkan kandungan {type, select, resourcepack {pek sumber anda, melainkan ianya pek audio atau terjemahan. Jika pek ini adalah pek audio atau terjemahan, sila pilih tag yang sesuai} shader {pembayang anda} other {projek anda}}."
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Muat naik gambar galeri"
diff --git a/packages/moderation/src/locales/nl-NL/index.json b/packages/moderation/src/locales/nl-NL/index.json
index 73bd7301..df707ab5 100644
--- a/packages/moderation/src/locales/nl-NL/index.json
+++ b/packages/moderation/src/locales/nl-NL/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Voeg externe links toe"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Je hebt alle {totalAvailableTags} beschikbare tags geselecteerd. Dit gaat in tegen het doel van tags, die bedoeld zijn om gebruikers te helpen relevante projecten te vinden. Selecteer alleen de tags die relevant zijn voor je project."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Selecteer relevante tags"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Jouw beschrijving is {length} leesbare karakters. Minstens {minChars} karakters zijn aanbevolen om een duidelijke en informatieve beschrijving te maken."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Verleng de beschrijving"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Bezoek galerij pagina"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Uw {projectType} gebruikt een licentie die vereist dat de bron code beschikbaar is. Voeg alstublieft een link naar de bron code of bron bestand of overweeg een andere licentie te gebruiken."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Bied bron code aan"
   },
@@ -107,15 +98,9 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Bekijk en verhelp alle bezwaren van het moderatieteam voordat je het opnieuw indient."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Bekijk moderatie feedback"
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Selecteer juiste resolutie"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Selecteer de licentie waaronder jouw {projectType} is uitgebracht."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Selecteer een licentie"
   },
@@ -152,27 +137,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Verhelder de samenvatting"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Jouw samenvatting is {length} karakters langs. Tenminste {minChars} karakters zijn aanbevolen om een informatieve en aantrekkelijke samenvatting te maken."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Breidt de samenvatting uit"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "De naam van je project duidelijk houden zorgt ervoor dat het makkelijk te vinden is. Versie en lader informatie is automatisch bij je project uitgelicht."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Maak de naam duidelijk"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Je hebt {tagCount} tags geselecteerd. Overweeg om het aantal te verlagen naar {maxTagCount} of minder om ervoor te zorgen dat je project in relevante zoekresultaten verschijnt."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Selecteer relevante tags"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "Minimaal één galerijafbeelding is nodig om de inhoud van uw {type}{resourcepackMessage} te tonen."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Upload een galerijafbeelding"
   },
diff --git a/packages/moderation/src/locales/pl-PL/index.json b/packages/moderation/src/locales/pl-PL/index.json
index 7e666a42..944bc711 100644
--- a/packages/moderation/src/locales/pl-PL/index.json
+++ b/packages/moderation/src/locales/pl-PL/index.json
@@ -18,13 +18,13 @@
     "defaultMessage": "Dodaj zewnętrzne linki"
   },
   "nags.all-tags-selected.description": {
-    "defaultMessage": "Wybrano wszystkie z {totalAvailableTags} dostępnych tagów. To mija się z celem tagów, które mają pomagać użytkownikom znaleźć trafne projekty. Wybierz jedynie tagi, które dotyczą twojego projektu."
+    "defaultMessage": "Wybrano {totalAvailableTags, plural, one {jedyny dostępny tag} other {wszystkie z # dostępnych tagów}}. To mija się z celem tagów, które mają pomóc użytkownikom znaleźć to, czego szukają. Wybierz tylko te tagi, które opisują Twój projekt."
   },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Wybierz odpowiednie tagi"
   },
   "nags.description-too-short.description": {
-    "defaultMessage": "Twój opis ma jedynie {length, plural, one {# czytelny znak} few {# czytelne znaki} other {# czytelnych znaków}}. Zalecane jest użycie przynajmniej {minChars, plural, one {# znaku} other {# znaków}}, by stworzyć czytelny i informatywny opis."
+    "defaultMessage": "Twój opis składa się z {length, plural, one {# czytenego znaku} other {# czytelnych znaków}}. Zalecane jest użycie chociaż {minChars, plural, one {# znaku} other {# znaków}} by stworzyć przejrzysty i informatywny opis."
   },
   "nags.description-too-short.title": {
     "defaultMessage": "Rozwiń opis"
@@ -54,7 +54,7 @@
     "defaultMessage": "Odwiedź stronę galerii"
   },
   "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Twój {projectType} używa licencji, która wymaga dostępności kodu źródłowego. Podaj link do kodu źródłowego lub plik ze źródłami dla każdej dodatkowej wersji albo rozważ użycie innej licencji."
+    "defaultMessage": "Twój {type, select, mod {mod} plugin {plugin} other {projekt}} używa licencji, która wymaga publikacji kodu źródłowego. Podaj link do kodu źródłowego, plik z źródłami dla każdej podanej wersji lub rozważ użycie innej licencji."
   },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Podaj kod źródłowy"
@@ -114,22 +114,22 @@
     "defaultMessage": "Przejrzyj oraz rozwiąż wszystkie obawy zespołu moderacji przed ponownym przesłaniem."
   },
   "nags.moderator-feedback.title": {
-    "defaultMessage": "Przejrzyj informację zwrotną moderatorów"
+    "defaultMessage": "Przejrzyj informacje zwrotne"
   },
   "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Wybrano {count} tagów rozdzielczości ({tags}). Paczki zasobów powinny mieć tylko jeden tag rozdzielczości, który pasuje do ich głównej rozdzielczości."
+    "defaultMessage": "Wybrano {count, plural, one {# tag rozdzielczości} few {# tagi rozdzielczości} other {# tagów rozdzielczości}} ({tags}). Paczki zasobów zwykle powinny mieć tylko jeden tag rozdzielczości opisujący ich główną rozdzielczość."
   },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Wybierz poprawną rozdzielczość"
   },
   "nags.select-environments.description": {
-    "defaultMessage": "Wybierz środowiska, na których działa twój {projectType}."
+    "defaultMessage": "Wybierz środowisko, w którym działa {type, select, mod {Twój mod} modpack {Twoja paczka modów} other {Twój projekt}}."
   },
   "nags.select-environments.title": {
     "defaultMessage": "Wybierz środowiska"
   },
   "nags.select-license.description": {
-    "defaultMessage": "Wybierz licencję, pod którą twój {projectType} jest dystrybuowany."
+    "defaultMessage": "Wybierz licencje, pod którą {type, select, mod {udostępniony jest Twój mod} modpack {udostępniona jest Twoja paczka modów} resourcepack {udostępniona jest Twoja paczka zasobów} shader {udostępnione są Twoje shadery} plugin {udostępniony jest Twój plugin} datapack {udostępniona jest Twoja paczka danych} other {udostępniony jest Twój projekt}}."
   },
   "nags.select-license.title": {
     "defaultMessage": "Zaznacz licencje"
@@ -171,25 +171,25 @@
     "defaultMessage": "Wyjaśnij podsumowanie"
   },
   "nags.summary-too-short.description": {
-    "defaultMessage": "Twoje streszczenie ma {length} znaków. Aby stworzyć streszczenie zawierające wiele informacji i zachęcającego podsumowania, zaleca się użycie co najmniej {minChars} znaków."
+    "defaultMessage": "Twoje podsumowanie składa się z {length, plural, one {# znaku} other {# znaków}}. Zalecane jest użycie chociaż {minChars, plural, one {# znaku} other {# znaków}} by stworzyć informatywne i ciekawe podsumowanie."
   },
   "nags.summary-too-short.title": {
     "defaultMessage": "Poszerz podsumowanie"
   },
   "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Utrzymanie nazwy projektu w czystości sprawia, że łatwiej ją zapamiętać i znaleźć. Informacje o wersji i programie ładującym są automatycznie wyświetlane obok projektu."
+    "defaultMessage": "Utrzymanie nazwy projektu w czystości sprawia, że łatwiej ją zapamiętać i znaleźć. Informacje o wersji i loaderze są automatycznie wyświetlane obok projektu."
   },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Oczyść nazwę"
   },
   "nags.too-many-tags.description": {
-    "defaultMessage": "Wybrałeś {tagCount} tagów. Rozważ zmniejszenie liczby tagów do {maxTagCount} lub mniej, aby mieć pewność, że twój projekt pojawi się w odpowiednich wynikach wyszukiwania."
+    "defaultMessage": "Wybrano {tagCount, plural, one {# tag} few {# tagi} other {# tagów}}. Spróbuj użyć {maxTagCount} lub mniej tagów, by Twój projekt był łatwiejszy to znalezienia."
   },
   "nags.too-many-tags.title": {
     "defaultMessage": "Wybierz odpowiednie tagi"
   },
   "nags.upload-gallery-image.description": {
-    "defaultMessage": "Przynajmniej jedne z obrazów w galery musi pokazywać kontent twojego {type}{resourcepackMessage}."
+    "defaultMessage": "Przynajmniej jeden obrazek w galerii jest wymagany, by pokazać zawartość {type, select, resourcepack {Twojej paczki zasobów, z wyjątkiem paczek zawierających tylko dźwięki lub tłumaczenia. Jeżeli opisuje to Twoją paczkę, wybierz odpowiedni tag} shader {Twojego shadera} other {Twojego projektu}}."
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Prześlij obraz do galerii"
diff --git a/packages/moderation/src/locales/pt-BR/index.json b/packages/moderation/src/locales/pt-BR/index.json
index 51aa1b9f..ae781875 100644
--- a/packages/moderation/src/locales/pt-BR/index.json
+++ b/packages/moderation/src/locales/pt-BR/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Adicione links externos"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Você selecionou todas as {totalAvailableTags} etiquetas disponíveis. Isso desvia do propósito das etiquetas, cujo intuito é o de ajudar os usuários a encontrar projetos relevantes. Selecione somente as etiquetas relevantes para o seu projeto."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Selecione etiquetas específicas"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Sua descrição possui {length} caracteres legíveis. É recomendado ao menos {minChars} caracteres para criar uma descrição clara e informativa."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Expandir a descrição"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Visitar página da galeria"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Seu {projectType} utiliza uma licença que exige um código-fonte para ser disponibilizado. Forneça um link de código-fonte ou seus arquivos de origem para cada versão adicional, ou considere utilizar outra licença."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Forneça o código-fonte"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Revise e resolva todos os problemas listados pela moderação antes de reenviar."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Revise opinião de Moderador"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Você selecionou {count} etiquetas de resolução ({tags}). Os pacotes de recursos devem normalmente ter uma etiqueta de resolução que corresponda à resolução principal."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Selecione a resolução correta"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "Selecione os ambientes em que seu {projectType} funciona."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "Selecione um ambiente"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Selecione a licença sob a qual seu {projectType} é distribuído."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Selecione uma licença"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Limpe o resumo"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Seu resumo tem {length} caracteres. Recomendamos um mínimo de {minChars} caracteres para criar um resumo informativo e atraente."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Aumente o resumo"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Mantenha o nome do seu projeto limpo e fácil de memorizar para facilitar a localização. As informações sobre a versão e o carregador são exibidas automaticamente junto com o seu projeto."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Limpe o nome"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Você selecionou {tagCount} etiquetas. Considere reduzir para {maxTagCount} ou menos para garantir que seu projeto apareça em resultados de buscas relevantes."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Selecione etiquetas específicas"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "Pelo menos uma imagem de galeria é necessária para mostrar o conteúdo do seu {type}{resourcepackMessage}."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Envie uma imagem para a galeria"
   },
diff --git a/packages/moderation/src/locales/pt-PT/index.json b/packages/moderation/src/locales/pt-PT/index.json
index b250adba..afeb6479 100644
--- a/packages/moderation/src/locales/pt-PT/index.json
+++ b/packages/moderation/src/locales/pt-PT/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Adiciona links externos"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Selecionaste todas as {totalAvailableTags} etiquetas disponíveis. Isto contraria o propósito das etiquetas, que visam ajudar os utilizadores a encontrar projetos relevantes. Seleciona apenas as etiquetas relevantes para o teu projeto."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Seleciona etiquetas adequadas"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "A tua descrição tem {length} caracteres legíveis. Pelo menos {minChars} caracteres são recomendados para criar uma descrição clara e informativa."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Expande a descrição"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Vê a página da galeria"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "O teu {projectType} usa uma licença que requer que o código-fonte esteja disponível. Por favor, fornece um link para o código-fonte ou um ficheiro de fonte para cada versão adicional, ou considera usar uma licença diferente."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Fornece o código-fonte"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Revê e resolve todos os problemas apontados pela equipa de moderação antes de submeter novamente."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Rever feedback do moderador"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Selecionaste {count} etiquetas de resolução ({tags}). Pacotes de recursos devem normalmente ter apenas uma etiqueta de resolução que corresponda à sua resolução primária."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Seleciona a resolução correta"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "Seleciona os ambientes em que o teu {projectType} funciona."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "Seleciona ambientes"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Seleciona a licença sob a qual o teu {projectType} é distribuído."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Seleciona uma licença"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Limpa o sumário"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "O teu sumário tem {length} caracteres. Pelo menos {minChars} caracteres são recomendados para criar um sumário informativo e apelativo."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Expande o sumário"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Manter o Nome do teu projeto limpo e simples fá-lo memorável e fácil de encontrar. Informação de versão e carregador é mostrada automaticamente com o teu projeto."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Limpa o nome"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Selecionaste {tagCount} etiquetas. Considera reduzi-las para {maxTagCount} ou menos para garantir que o teu projeto apareça em resultados de pesquisa relevantes."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Seleciona etiquetas precisas"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "Pelo menos uma imagem na galeria é necessária para mostrar o conteúdo do teu {type}{resourcepackMessage}."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Adiciona uma imagem à galeria"
   },
diff --git a/packages/moderation/src/locales/ro-RO/index.json b/packages/moderation/src/locales/ro-RO/index.json
index c4fa2bc9..a8df30df 100644
--- a/packages/moderation/src/locales/ro-RO/index.json
+++ b/packages/moderation/src/locales/ro-RO/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Adaugă link-uri externe"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Ai selectat toate cele {totalAvailableTags} etichete disponibile. Acest lucru anulează scopul etichetelor, care sunt menite să-i ajute pe utilizatori să găsească proiecte relevante. Te rugăm să selectezi doar etichetele care sunt relevante pentru proiectul tău."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Selectează etichete precise"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Descrierea ta are {length} caractere lizibile. Se recomandă cel puțin {minChars} caractere pentru a crea o descriere clară și informativă."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Extinde descrierea"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Vizitează pagina galeriei"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Proiectul tău {projectType} folosește o licență care necesită codul sursă să fie disponibil. Te rog să furnizezi un link către codul sursă sau un fișier cu surse pentru fiecare versiune suplimentară, sau ia în considerare utilizarea unei alte licențe."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Oferă codul sursă"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Analizează și abordează toate problemele semnalate de echipa de moderare înainte de a retrimite."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Analizează opinia moderatorilor"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Ai selectat {count} etichete de rezoluție ({tags}). Pachetele de resurse ar trebui să aibă de obicei o singură etichetă de rezoluție care să corespundă rezoluției lor principale."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Selectează rezoluția corectă"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "Selectează mediile pe care funcționează {projectType}."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "Selectează medii"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Selectează licența sub care este distribuit {projectType}."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Selectează o licență"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Curăță rezumatul"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Sumarul tău are {length} caractere. Cel puțin {minChars} caractere este recomandat pentru a crea un sumar informativ și atractiv."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Extinde rezumatul"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Păstrează numele proiectului clar și memorabil pentru a fi mai ușor de găsit. Informațiile precum versiunea și loader-ul sunt automat afișate împreună cu proiectul tău."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Curăță numele"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Ai selectat {tagCount} etichete. Consideră în a le reduce la {maxTagCount} sau mai puține pentru a fii sigur că proiectul tău apare în rezultatele de căutare relevante."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Selectează etichete exacte"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "Este necesară cel puțin o singură imagine în galerie pentru a afișa conținutul {type}{resourcepackMessage}."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Încarcă o imagine în galerie"
   },
diff --git a/packages/moderation/src/locales/ru-RU/index.json b/packages/moderation/src/locales/ru-RU/index.json
index 0d2a32b7..2b358bd0 100644
--- a/packages/moderation/src/locales/ru-RU/index.json
+++ b/packages/moderation/src/locales/ru-RU/index.json
@@ -1,30 +1,30 @@
 {
   "nags.add-description.description": {
-    "defaultMessage": "Необходимо описание, которое чётко описывает цель и функцию проекта."
+    "defaultMessage": "Требуется понятное описание функциональности и назначения проекта."
   },
   "nags.add-description.title": {
     "defaultMessage": "Добавьте описание"
   },
   "nags.add-icon.description": {
-    "defaultMessage": "Добавление уникальной, соответствующей и привлекательной иконки делает ваш проект узнаваемым и помогает выделяться."
+    "defaultMessage": "Уникальный, подходящий и привлекательный значок сделает проект узнаваемым и заметным."
   },
   "nags.add-icon.title": {
     "defaultMessage": "Добавьте значок"
   },
   "nags.add-links.description": {
-    "defaultMessage": "Добавьте любые соответствующие ссылки, ведущие за пределы Modrinth, например: открытый код, трекер проблем или приглашение на Discord сервер."
+    "defaultMessage": "Добавьте релевантные ссылки, ведущие за пределы Modrinth, например на исходный код, трекер проблем или сервер Discord."
   },
   "nags.add-links.title": {
     "defaultMessage": "Добавьте внешние ссылки"
   },
   "nags.all-tags-selected.description": {
-    "defaultMessage": "Вы выбрали все {totalAvailableTags} доступных тегов. Это противоречит цели тегов, которые должны помочь пользователям найти подходящие проекты. Пожалуйста, выберите только те теги, которые подходят вашему проекту."
+    "defaultMessage": "Выбраны все {totalAvailableTags, plural, one {# тег} few {# тега} many {# тегов} other {# тега}}. Не достигается их цель помогать искать релевантные результаты. Выберите только относящиеся к проекту теги."
   },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Укажите точные теги"
   },
   "nags.description-too-short.description": {
-    "defaultMessage": "Ваше описание содержит {length} читабельных символов. Как минимум {minChars} рекомендовано для создания чистого и информативного описания."
+    "defaultMessage": "Описание содержит {length, plural, one {# читаемый символ} few {# читаемых символа} many {# читаемых символов} other {# читаемого символа}}. Для ясного и информативного описания рекомендуется не менее {minChars, plural, one {# символа} few {# символов} many {# символов} other {# символа}}."
   },
   "nags.description-too-short.title": {
     "defaultMessage": "Расширьте описание"
@@ -45,7 +45,7 @@
     "defaultMessage": "Изменить название"
   },
   "nags.feature-gallery-image.description": {
-    "defaultMessage": "Избранное изображение в галерее часто влияет на первое впечатление."
+    "defaultMessage": "Выделенное изображение в галерее часто создаёт первое впечатление о проекте."
   },
   "nags.feature-gallery-image.title": {
     "defaultMessage": "Выделите изображение"
@@ -54,55 +54,55 @@
     "defaultMessage": "Открыть галерею"
   },
   "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Ваш {projectType} использует лицензию, которая требует, чтобы был доступен исходный код. Пожалуйста, предоставьте ссылку на исходный код или файл с исходным кодом для каждой дополнительной версии или подумайте об использовании другой лицензии."
+    "defaultMessage": "Лицензия {type, select, mod {мода} plugin {плагина} other {проекта}} обязывает публиковать исходный код. Укажите ссылку на исходный код или файл с исходным кодом для каждой версии или выберите другую лицензию."
   },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Укажите исходный код"
   },
   "nags.image-heavy-description.description": {
-    "defaultMessage": "Описание должно содержать достаточное количество обычного текста или альтернативного текста изображения, чтобы оно было доступно для тех, кто пользуется программами чтения с экрана или медленным интернет соединением."
+    "defaultMessage": "Укажите в описании обычный и альтернативный текст для изображений, чтобы сделать его доступным для средств чтения с экрана и при медленном интернете."
   },
   "nags.image-heavy-description.title": {
     "defaultMessage": "Обеспечьте доступность"
   },
   "nags.invalid-license-url.description.default": {
-    "defaultMessage": "Недействительный URL лицензии."
+    "defaultMessage": "Ссылка на лицензию недействительна."
   },
   "nags.invalid-license-url.description.domain": {
-    "defaultMessage": "Ваш URL лицензии ведёт на {domain}, который не подходит для информации о лицензии. Ссылки на лицензии должны вести прямо на файл вашей лицензии, не социальные сети, игровые платформы и т. д."
+    "defaultMessage": "Домен {domain} не подходит для лицензий. Ссылка должна вести на файл лицензии, а не на соцсети, игровые платформы и т. п."
   },
   "nags.invalid-license-url.description.malformed": {
-    "defaultMessage": "URL вашей лицензии, по-видимому, неверен. Пожалуйста, предоставьте действительный URL на текст вашей лицензии."
+    "defaultMessage": "Не удаётся распознать URL лицензии. Укажите действительную ссылку на текст лицензии."
   },
   "nags.invalid-license-url.title": {
     "defaultMessage": "Исправьте URL лицензии"
   },
   "nags.link-shortener-usage.description": {
-    "defaultMessage": "Использование сокращённых ссылок или других методов сокрытия того, на какие сторонние сервисы или ссылки на лицензии, запрещены, пожалуйста, используйте только соответствующие полноразмерные ссылки."
+    "defaultMessage": "Использование сервисов сокращения ссылок или других способов скрытия конечного адреса в ссылке на лицензию или во внешних ссылках запрещено. Указывайте полные ссылки."
   },
   "nags.link-shortener-usage.title": {
     "defaultMessage": "Не сокращайте ссылки"
   },
   "nags.long-headers.description": {
-    "defaultMessage": "{count, plural, one {# Заголовок} other {# Заголовка (-ов)}} в вашем описании {count, plural, one {слишком длинный} other {слишком длинные}}. Заголовки должны быть краткими и выступать в роли названий разделов, а не полных предложений."
+    "defaultMessage": "{count, plural, one {# заголовок} few {# заголовка} many {# заголовков} other {# заголовка}} в описании слишком {count, plural, one {длинный} other {длинные}}. Заголовки должны быть краткими названиями разделов, а не предложениями."
   },
   "nags.long-headers.title": {
     "defaultMessage": "Сократите заголовки"
   },
   "nags.minecraft-title-clause.description": {
-    "defaultMessage": "Проекты не должны содержать брендовый контент Minecraft или включать \"Minecraft\" как значительную часть названия."
+    "defaultMessage": "Проект не должен использовать бренд Minecraft или использовать «Minecraft» как основную часть названия."
   },
   "nags.minecraft-title-clause.title": {
     "defaultMessage": "Соблюдайте права бренда"
   },
   "nags.missing-alt-text.description": {
-    "defaultMessage": "У некоторых ваших изображений отсутствует текстовое описание, которое важно для доступности, особенно для слабовидящих пользователей."
+    "defaultMessage": "У некоторых изображений нет альтернативного текста, нужного для доступности, особенно для слабовидящих пользователей."
   },
   "nags.missing-alt-text.title": {
     "defaultMessage": "Опишите изображения"
   },
   "nags.misused-discord-link-description": {
-    "defaultMessage": "Приглашения на Discord сервера не могут быть использованы для других типов ссылок. Пожалуйста, вставьте ссылку-приглашение Discord только в поле сыллки-приглашения Discord."
+    "defaultMessage": "Приглашение в Discord нельзя указывать не для своего типа ссылок. Переместите приглашение в предназначенное для него поле."
   },
   "nags.misused-discord-link.title": {
     "defaultMessage": "Переместите Discord"
@@ -111,34 +111,34 @@
     "defaultMessage": "Открыть ветку модерации"
   },
   "nags.moderator-feedback.description": {
-    "defaultMessage": "Перед повторной отправкой проверьте и устраните все замечания, высказанные модерацией."
+    "defaultMessage": "Перед повторной отправкой проекта на проверку исправьте все замечания модерации."
   },
   "nags.moderator-feedback.title": {
     "defaultMessage": "Посмотрите замечания"
   },
   "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Вы выбрали {count} тегов разрешения ({tags}). Ресурс паки должны иметь только один тег разрешения, который соответствует их основному разрешению."
+    "defaultMessage": "{count, plural, one {Выбран # тег} few {Выбрано # тега} many {Выбрано # тегов} other {Выбрано # тега}} разрешения ({tags}). Рекомендуется оставить один тег с основным разрешением."
   },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Укажите одно разрешение"
   },
   "nags.select-environments.description": {
-    "defaultMessage": "Укажите среду в которой ваш {projectType} работает."
+    "defaultMessage": "Выберите среды, в которых работает {type, select, mod {мод} modpack {сборка} other {проект}}."
   },
   "nags.select-environments.title": {
     "defaultMessage": "Укажите среду"
   },
   "nags.select-license.description": {
-    "defaultMessage": "Выберите лицензию, по которой распространяется ваш {projectType}."
+    "defaultMessage": "Выберите лицензию, по которой распространяется {type, select, mod {мод} modpack {сборка} resourcepack {набор ресурсов} shader {шейдер} plugin {плагин} datapack {набор данных} other {проект}}."
   },
   "nags.select-license.title": {
     "defaultMessage": "Выберите лицензию"
   },
   "nags.select-tags.description": {
-    "defaultMessage": "Выберите теги, которые подходят к вашему проекту, чтобы помогите нужным пользователям найти его."
+    "defaultMessage": "Выберите подходящие проекту теги, чтобы его могла найти своя аудитория."
   },
   "nags.select-tags.title": {
-    "defaultMessage": "Укажите тег"
+    "defaultMessage": "Укажите теги"
   },
   "nags.settings.description.title": {
     "defaultMessage": "Настроить описание"
@@ -159,49 +159,49 @@
     "defaultMessage": "Открыть настройки"
   },
   "nags.summary-same-as-title.description": {
-    "defaultMessage": "Ваше краткое описание не может быть названием проекта. Важно создать информативное и привлекательное краткое содержание."
+    "defaultMessage": "Сводка не может совпадать с названием проекта. Сделайте её понятной и интересной."
   },
   "nags.summary-same-as-title.title": {
     "defaultMessage": "Разнообразьте сводку"
   },
   "nags.summary-special-formatting.description": {
-    "defaultMessage": "Ваше краткое описание не должно содержать форматирования, строк, специальных символов или ссылок, так как краткое содержание отображает только простой текст."
+    "defaultMessage": "Сводка отображается как простой текст. Она не должна содержать форматирование, переносы строк, ссылки и спецсимволы."
   },
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Уберите лишнее из краткого содержания"
   },
   "nags.summary-too-short.description": {
-    "defaultMessage": "Ваше краткое содержание состоит из {length} символов. Хотя бы {minChars} символов рекомендовано для создания информативного и привлекательного краткого содержания."
+    "defaultMessage": "Сводка содержит {length, plural, one {# символ} few {# символа} many {# символов} other {# символа}}. Для понятной и интересной сводки рекомендуется не менее {minChars, plural, one {# символа} few {# символов} many {# символов} other {# символа}}."
   },
   "nags.summary-too-short.title": {
     "defaultMessage": "Увеличьте краткое содержание"
   },
   "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Сохраняйте название вашего проекта понятным и делайте его более запоминающимся и легким для поиска. Информация о версии и загрузчике автоматически отобразится с вашим проектом."
+    "defaultMessage": "Проект с простым названием проще запомнить и найти. Информация о версии и загрузчике указывается автоматически."
   },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Сделайте название понятным"
   },
   "nags.too-many-tags.description": {
-    "defaultMessage": "Вы выбрали {tagCount} тегов. Сократите их количество до {maxTagCount} или меньше, чтобы убедиться, что ваш проект появится при релевантных результатах поиска."
+    "defaultMessage": "{tagCount, plural, one {Выбран # тег} few {Выбрано # тега} many {Выбрано # тегов} other {Выбрано # тега}}. Рекомендуется оставить не более {maxTagCount}, чтобы повысить релевантность проекта в поиске."
   },
   "nags.too-many-tags.title": {
     "defaultMessage": "Укажите точные теги"
   },
   "nags.upload-gallery-image.description": {
-    "defaultMessage": "Хотя бы одно изображение в галерее требуется, чтобы показать контент вашего {type}{resourcepackMessage}."
+    "defaultMessage": "В галерее требуется хотя бы одно изображение, в котором показано содержимое {type, select, resourcepack {набора ресурсов. Если он содержит только звуки или переводы, укажите это в тегах} shader {шейдера} other {проекта}}."
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Пополните галерею"
   },
   "nags.upload-version.description": {
-    "defaultMessage": "Хотя бы одна версия должна быть выбрана, чтобы отправить проект на проверку."
+    "defaultMessage": "Требуется хотя бы одна версия перед отправкой проекта на проверку."
   },
   "nags.upload-version.title": {
     "defaultMessage": "Загрузите версию"
   },
   "nags.verify-external-links.description": {
-    "defaultMessage": "Некоторые из ваших внешних ссылок могут использовать домены, неподходящий для этого типа ссылок."
+    "defaultMessage": "Одна из внешних ссылок использует домен, возможно, не подходящий для типа этой ссылки."
   },
   "nags.verify-external-links.title": {
     "defaultMessage": "Проверьте ссылки"
diff --git a/packages/moderation/src/locales/tr-TR/index.json b/packages/moderation/src/locales/tr-TR/index.json
index 9851e726..542d3044 100644
--- a/packages/moderation/src/locales/tr-TR/index.json
+++ b/packages/moderation/src/locales/tr-TR/index.json
@@ -18,13 +18,13 @@
     "defaultMessage": "Dış bağlantı ekle"
   },
   "nags.all-tags-selected.description": {
-    "defaultMessage": "Mevcut {totalAvailableTags} etiketin tamamını seçtiniz. Etiketlerin amacı, kullanıcıların ilgili projeleri bulmasına yardımcı olmaktır. Lütfen yalnızca projenizle alakalı etiketleri seçiniz."
+    "defaultMessage": "Tüm {totalAvailableTags, plural, one {# mevcut etiketi} other {# mevcut etiketi}} seçtin. Bu, etiketlerin amacını ortadan kaldırır; etiketler, kullanıcıların ilgili projeleri bulmasına yardımcı olmak için vardır. Lütfen projenle yalnızca ilgili etiketleri seç."
   },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Uygun etiketleri seç"
   },
   "nags.description-too-short.description": {
-    "defaultMessage": "Açıklamanızda {length} okunabilir karakter var. Açık ve bilgilendirici bir açıklama için en az {minChars} karakter önerilir."
+    "defaultMessage": "Açıklamanız {length, plural, one {# okunabilir karakter} other {# okunabilir karakter}} uzunluğunda. Net ve bilgilendirici bir açıklama oluşturmak için en az {minChars, plural, one {# karakter} other {# karakter}} önerilir."
   },
   "nags.description-too-short.title": {
     "defaultMessage": "Açıklamayı uzat"
@@ -54,7 +54,7 @@
     "defaultMessage": "Galeriye göz at"
   },
   "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Kullandığın lisans kaynak kodunun açık olmasını gerektiriyor. Lütfen kaynak kodun için bir bağlantı veya her sürüm için kaynak dosyası ekle ya da başka bir lisans kullan."
+    "defaultMessage": "Senin {type, select, mod {mod} plugin {plugin} other {project}} bir lisans kullanıyor ve bu lisans, kaynak kodun erişilebilir olmasını gerektirir. Lütfen her ek sürüm için bir kaynak kod bağlantısı veya kaynak dosyası sağla ya da farklı bir lisans kullanmayı düşün."
   },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Kaynak kodu sun"
@@ -114,22 +114,22 @@
     "defaultMessage": "Tekrar göndermeden önce moderasyon ekibinin dediği şeyleri gözden geçir"
   },
   "nags.moderator-feedback.title": {
-    "defaultMessage": "Moderasyon ekibini dinle"
+    "defaultMessage": "Geri bildirimi incele"
   },
   "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "{count} tane boyut etiketi seçtin ({tags}). Kaynak paketleri genelde sadece bir boyut etiketine olmalı ve bu etiket birincil boyutları ile aynı olmalı."
+    "defaultMessage": "Seçtin {count, plural, one {# çözünürlük etiketi} other {# çözünürlük etiketi}} ({tags}). Kaynak paketlerin genellikle yalnızca bir çözünürlük etiketi olması ve bu etiketin ana çözünürlükle eşleşmesi gerekir."
   },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Doğru boyutu seç"
   },
   "nags.select-environments.description": {
-    "defaultMessage": "Projenin çalıştığı ortamları seçin."
+    "defaultMessage": "Senin {type, select, mod {mod} modpack {modpack} other {project}} hangi ortamlar da çalışıyor, seç."
   },
   "nags.select-environments.title": {
     "defaultMessage": "Ortamları seç"
   },
   "nags.select-license.description": {
-    "defaultMessage": "Projenin altında paylaşıldığı lisansı seçin."
+    "defaultMessage": "Senin {type, select, mod {mod} modpack {modpack} resourcepack {resource pack} shader {shader} plugin {plugin} datapack {data pack} other {project}} hangi lisans altında dağıtılıyor, seç."
   },
   "nags.select-license.title": {
     "defaultMessage": "Bir lisans seç"
@@ -170,27 +170,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Özetini düzenle"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Özetin {length} karakter. Bilgilendirici ve ilgi çekici bir özet için en az {minChars} karakter önerilir."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Özeti uzat"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Projenin ismini hatırlanabilir ve kolayca bulunabilir bir şey yap. Sürüm ve yükleyici bilgisi projenin yanında otomatik olarak gözükecek."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "İsmi düzenle"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "{tagCount} etiket seçtin. Projenin alakalı aramalarda çıkması için {maxTagCount} veya daha az etiket seçtiğine emin ol."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Uygun etiketleri seç"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "İçeriğini göstermek için en az bir galeri resmi zorunlu."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Galeriye resim yükle"
   },
diff --git a/packages/moderation/src/locales/uk-UA/index.json b/packages/moderation/src/locales/uk-UA/index.json
index a58baa6e..71cbf842 100644
--- a/packages/moderation/src/locales/uk-UA/index.json
+++ b/packages/moderation/src/locales/uk-UA/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "Додати зовнішні посилання"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "Ви вибрали всі {totalAvailableTags} доступні теги. Це суперечить меті тегів, які повинні допомагати користувачам знаходити відповідні проєкти. Будь ласка, виберіть лише ті теги, що стосуються вашого проєкту."
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Виберіть відповідні теги"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Ваш опис складається з {length} читабельних символів. Мінімум {minChars} символів рекомендується для короткого та інформативного опису."
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "Розширити опис"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "Перейти на сторінку галереї"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Ваш {projectType} використовує ліцензію, яка потребує щоб вихідний код був доступним. Будь ласка, надайте посилання на вихідний код або на вихідні файли для кожної додаткової версії, або розгляньте можливість використання іншої ліцензії."
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Надайте вихідний код"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Перегляньте та вирішіть усі зауваження модераторів перед поновним відправленням."
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Переглянути відгук модератора"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "Ви вибрали {count} теґів роздільної здатности ({tags}). Пакети ресурсів мають зазвичай мати тільки один теґ роздільної здатности, який відповідає їхній первинній роздільній здатності."
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Вибрати поправну роздільну здатність"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "Оберіть середовища, які ваш {projectType} використовує."
-  },
   "nags.select-environments.title": {
     "defaultMessage": "Оберіть середовища"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "Виберіть ліцензію за якою ваш {projectType} поширений."
-  },
   "nags.select-license.title": {
     "defaultMessage": "Вибрати ліцензію"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Очистити зміст"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Ваш зміст має {length} символів. Для створення інформативного та привабливого змісту рекомендується мати щонайменше {minChars} символів."
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Розвинути зміст"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Зберігайте Назву вашого проєкту чистою та легкою для пошуку. Версія та інформація завантажувача автоматично відображається біля вашого проєкту."
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Очистити назву"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "Ви вибрали {tagCount} теґів. Зменште кількість до {maxTagCount} або менше, щоб ваш проєкт відображався у відповідних результатах пошуку."
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Виберіть відповідні теґи"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "Потрібно щонайменше одне зображення з галереї, щоб показати контент вашого {type}{resourcepackMessage}."
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Завантажити зображення до галереї"
   },
diff --git a/packages/moderation/src/locales/zh-CN/index.json b/packages/moderation/src/locales/zh-CN/index.json
index 84929b0b..b20ab96b 100644
--- a/packages/moderation/src/locales/zh-CN/index.json
+++ b/packages/moderation/src/locales/zh-CN/index.json
@@ -18,13 +18,13 @@
     "defaultMessage": "添加外部链接"
   },
   "nags.all-tags-selected.description": {
-    "defaultMessage": "你已选择全部 {totalAvailableTags} 个可用标签。这违背了标签的初衷——帮助用户发现相关项目。请仅选择与你项目相关的标签。"
+    "defaultMessage": "你已选择全部 {totalAvailableTags, plural, other {# 个可用标签}}。这违背了标签的初衷——帮助用户发现相关项目。请仅选择与你项目相关的标签。"
   },
   "nags.all-tags-selected.title": {
     "defaultMessage": "选择准确的标签"
   },
   "nags.description-too-short.description": {
-    "defaultMessage": "你的描述包含{length}个可读字符。建议描述至少包含{minChars}个字符，以便撰写清晰且信息充实的描述文案。"
+    "defaultMessage": "你的描述包含 {length, plural, other {# 个可读字符}}。建议描述至少包含 {minChars, plural, other {# 个字符}}，以便撰写清晰且信息充实的描述文案。"
   },
   "nags.description-too-short.title": {
     "defaultMessage": "扩展描述"
@@ -54,7 +54,7 @@
     "defaultMessage": "访问图库界面"
   },
   "nags.gpl-license-source-required.description": {
-    "defaultMessage": "你的{projectType}所使用的版权许可要求源代码必须公开。请为每个新增版本提供源代码地址或源文件，或考虑使用其他的版权许可。"
+    "defaultMessage": "你的{type, select, mod {模组} plugin {插件} other {项目}}所使用的版权许可要求源代码必须公开。请为每个新增版本提供源代码地址或源文件，或考虑使用其他的版权许可。"
   },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "提供源代码"
@@ -114,22 +114,22 @@
     "defaultMessage": "请在重新提交前，检查并处理审核团队提出的所有问题。"
   },
   "nags.moderator-feedback.title": {
-    "defaultMessage": "查看审核员反馈"
+    "defaultMessage": "Review feedback"
   },
   "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "你已选择{count}个分辨率标签（{tags}）。资源包通常应仅保留一个与其主要分辨率相匹配的标签。"
+    "defaultMessage": "你已选择 {count, plural, other {# 个分辨率标签}} ({tags})。资源包通常应仅保留一个与其主要分辨率相匹配的标签。"
   },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "选择正确的分辨率"
   },
   "nags.select-environments.description": {
-    "defaultMessage": "选择你的{projectType}运行的环境。"
+    "defaultMessage": "选择你的{type, select, mod {模组} modpack {整合包} other {项目}}功能所适用的环境。"
   },
   "nags.select-environments.title": {
     "defaultMessage": "选择环境"
   },
   "nags.select-license.description": {
-    "defaultMessage": "请选择你的{projectType}所遵循的许可证。"
+    "defaultMessage": "选择你的{type, select, mod {模组} modpack {整合包} resourcepack {资源包} shader {光影包} plugin {插件} datapack {数据包} other {项目}}所采用的许可证类型。"
   },
   "nags.select-license.title": {
     "defaultMessage": "选择一个许可证"
@@ -171,7 +171,7 @@
     "defaultMessage": "清除简介"
   },
   "nags.summary-too-short.description": {
-    "defaultMessage": "你的简介包含 {length} 个字符。建议：简介要至少包含 {minChars} 个字符，以便撰写兼具信息量与吸引力的内容。"
+    "defaultMessage": "你的摘要包含 {length, plural, other {# 个字符}}。建议至少达到 {minChars, plural, other {# 个字符}}，以创建信息丰富且引人入胜的摘要。"
   },
   "nags.summary-too-short.title": {
     "defaultMessage": "扩充你的简介"
@@ -183,13 +183,13 @@
     "defaultMessage": "清除名称"
   },
   "nags.too-many-tags.description": {
-    "defaultMessage": "你已经选择了{tagCount}个标签了。建议将其数量减少到 {maxTagCount} 个或更少，以确保你的项目能准确地出现在相关搜索的结果中。"
+    "defaultMessage": "你已经选择了 {tagCount, plural, other {# 个标签}}了。建议将其数量减少到 {maxTagCount} 个或更少，以确保你的项目能准确地出现在相关搜索的结果中。"
   },
   "nags.too-many-tags.title": {
     "defaultMessage": "选择准确的标签"
   },
   "nags.upload-gallery-image.description": {
-    "defaultMessage": "至少需要上传一张图片来展示你的{type}{resourcepackMessage} 的内容。"
+    "defaultMessage": "展示你的{type, select, resourcepack {资源包，音频或本地化包除外。若你的包属于此类，请选择相应标签} shader {光影包} other {项目}}内容时，至少需提供一张展示图片。"
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "上传图片至项目图库"
diff --git a/packages/moderation/src/locales/zh-TW/index.json b/packages/moderation/src/locales/zh-TW/index.json
index 861a1c40..41e08b30 100644
--- a/packages/moderation/src/locales/zh-TW/index.json
+++ b/packages/moderation/src/locales/zh-TW/index.json
@@ -17,15 +17,9 @@
   "nags.add-links.title": {
     "defaultMessage": "新增外部連結"
   },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "你已選擇所有 {totalAvailableTags} 個可用標籤。這會讓標籤失去其原有目的，因為標籤的用意是幫助使用者找到相關專案。請只選擇與你的專案相關的標籤。"
-  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "選擇精確的標籤"
   },
-  "nags.description-too-short.description": {
-    "defaultMessage": "你的描述有 {length} 個可讀字元。建議至少 {minChars} 個字元，以建立清晰且資訊豐富的描述。"
-  },
   "nags.description-too-short.title": {
     "defaultMessage": "擴展描述"
   },
@@ -53,9 +47,6 @@
   "nags.gallery.title": {
     "defaultMessage": "前往圖庫頁面"
   },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "你的{projectType}使用的授權條款要求必須提供原始碼。請為每個額外版本提供原始碼連結或原始碼檔案，或是考慮使用不同的授權條款。"
-  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "提供原始碼"
   },
@@ -113,24 +104,12 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "在重新提交之前，請審閱並處理審核團隊提出的所有疑慮。"
   },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "審閱審核員意見"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "你選擇了 {count} 個解析度標籤 ({tags})。資源包通常應該只會有一個解析度標籤，且須符合其主要解析度。"
-  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "選擇正確的解析度"
   },
-  "nags.select-environments.description": {
-    "defaultMessage": "選擇你的{projectType}環境。"
-  },
   "nags.select-environments.title": {
     "defaultMessage": "選擇環境"
   },
-  "nags.select-license.description": {
-    "defaultMessage": "請選擇你的{projectType}採用的授權條款。"
-  },
   "nags.select-license.title": {
     "defaultMessage": "選擇授權條款"
   },
@@ -170,27 +149,15 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "清理摘要"
   },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "你的摘要有 {length} 個字元。建議至少 {minChars} 個字元，以建立一個內容豐富且引人入勝的摘要。"
-  },
   "nags.summary-too-short.title": {
     "defaultMessage": "擴展摘要"
   },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "保持你的專案名稱簡潔，能讓它更易於記憶且更容易被找到。版本與載入器資訊會自動與你的專案一併顯示。"
-  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "清理名稱"
   },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "你選擇了 {tagCount} 個標籤。建議減少至 {maxTagCount} 個或更少，以確保你的專案出現在相關搜尋結果中。"
-  },
   "nags.too-many-tags.title": {
     "defaultMessage": "選擇精確的標籤"
   },
-  "nags.upload-gallery-image.description": {
-    "defaultMessage": "你的{type}至少需要一張圖庫圖片，以展示其內容{resourcepackMessage}。"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "上傳圖庫圖片"
   },
diff --git a/packages/ui/src/locales/de-CH/index.json b/packages/ui/src/locales/de-CH/index.json
index 601db8c7..649df2b9 100644
--- a/packages/ui/src/locales/de-CH/index.json
+++ b/packages/ui/src/locales/de-CH/index.json
@@ -33,7 +33,7 @@
     "defaultMessage": "Partnerlink widerrufen"
   },
   "affiliate.viewAnalytics": {
-    "defaultMessage": "Analytiken ansehen"
+    "defaultMessage": "Analysen anzeigen"
   },
   "badge.beta": {
     "defaultMessage": "Beta"
@@ -86,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "Folgen"
   },
+  "button.max": {
+    "defaultMessage": "Max"
+  },
   "button.more-options": {
     "defaultMessage": "Weitere Optionen"
   },
@@ -158,6 +161,84 @@
   "collection.label.private": {
     "defaultMessage": "Privat"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Adresszeile"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "Adresszeile 2 (Optional)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Menge"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Bankname"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Firmenname"
+  },
+  "form.label.city": {
+    "defaultMessage": "Stadt"
+  },
+  "form.label.country": {
+    "defaultMessage": "Land"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Geburtsdatum"
+  },
+  "form.label.email": {
+    "defaultMessage": "E-Mail"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Vorname"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Nachname"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Postleitzahl"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Bundesland/Kanton/Provinz"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Adresse eingeben"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "Wohnung, Suite, etc."
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "Menge eingeben"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "Bankname eingeben"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "Banknamen auswählen"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "Firmennamen eingeben"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Stadt eingeben"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Land auswählen"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "E-Mail-Adresse eingeben"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Vornamen eingeben"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Nachnamen eingeben"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Postleitzahl eingeben"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Bundesland/Kanton/Provinz eingeben"
+  },
   "icon-select.edit": {
     "defaultMessage": "Icon bearbeiten"
   },
@@ -197,6 +278,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "Unbekannter Spielmodus"
   },
+  "label.available": {
+    "defaultMessage": "{amount} verfügbar."
+  },
   "label.changes-saved": {
     "defaultMessage": "Änderungen gespeichert"
   },
@@ -245,6 +329,9 @@
   "label.rejected": {
     "defaultMessage": "Abgelehnt"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "Ich stimme den <terms-link>Bedingungen des Rewards-Programm</terms-link> zu"
+  },
   "label.saved": {
     "defaultMessage": "Gespeichert"
   },
@@ -392,6 +479,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal International"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -401,6 +491,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "Wohltätigkeit"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "Wohltätigkeiten"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "Geschenkkarte"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Geschenkkarten"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Virtuelles Visa"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Virtuelle Visa"
+  },
   "project-type.all": {
     "defaultMessage": "Alle"
   },
diff --git a/packages/ui/src/locales/de-DE/index.json b/packages/ui/src/locales/de-DE/index.json
index 084bd881..6c7bb0e0 100644
--- a/packages/ui/src/locales/de-DE/index.json
+++ b/packages/ui/src/locales/de-DE/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Partnerlink erstellen"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Neuen Partnercode erstellen"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Gib deinem Partnerlink einen Namen, damit du weist, von wo Leute kommen!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Titel des Partnerlinks"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "z.B. YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "Der Benutzername des Benutzers, für den der Affiliate-Code erstellt werden soll"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Benutzername"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Benutzernamen eingeben..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Erstellt von {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Erstelle Partnerlink..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Partnerlink widerrufen"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Analysen anzeigen"
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "Neu"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Partnerlinks"
+  },
   "button.analytics": {
     "defaultMessage": "Analytik"
   },
@@ -47,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "Folgen"
   },
+  "button.max": {
+    "defaultMessage": "Max"
+  },
   "button.more-options": {
     "defaultMessage": "Mehr Optionen"
   },
@@ -119,6 +161,84 @@
   "collection.label.private": {
     "defaultMessage": "Privat"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Adresszeile"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "Adresszeile 2 (Optional)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Menge"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Bankname"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Firmenname"
+  },
+  "form.label.city": {
+    "defaultMessage": "Stadt"
+  },
+  "form.label.country": {
+    "defaultMessage": "Land"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Geburtsdatum"
+  },
+  "form.label.email": {
+    "defaultMessage": "E-Mail"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Vorname"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Nachname"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Postleitzahl"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Bundesland/Kanton/Provinz"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Adresse eingeben"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "Wohnung, Suite, etc."
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "Menge eingeben"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "Bankname eingeben"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "Banknamen auswählen"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "Firmennamen eingeben"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Stadt eingeben"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Land auswählen"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "E-Mail-Adresse eingeben"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Vornamen eingeben"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Nachnamen eingeben"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Postleitzahl eingeben"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Bundesland/Kanton/Provinz eingeben"
+  },
   "icon-select.edit": {
     "defaultMessage": "Icon bearbeiten"
   },
@@ -158,6 +278,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "Unbekannter Spielmodus"
   },
+  "label.available": {
+    "defaultMessage": "{amount} verfügbar."
+  },
   "label.changes-saved": {
     "defaultMessage": "Änderungen gespeichert"
   },
@@ -206,6 +329,9 @@
   "label.rejected": {
     "defaultMessage": "Abgelehnt"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "Ich stimme den <terms-link>Bedingungen des Rewards-Programm</terms-link> zu"
+  },
   "label.saved": {
     "defaultMessage": "Gespeichert"
   },
@@ -353,6 +479,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal International"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -362,6 +491,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "Wohltätigkeit"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "Wohltätigkeiten"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "Geschenkkarte"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Geschenkkarten"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Virtuelles Visa"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Virtuelle Visa"
+  },
   "project-type.all": {
     "defaultMessage": "Alle Projekte"
   },
@@ -756,7 +906,7 @@
     "defaultMessage": "Perfekt für 1–5 Freunde mit ein paar kleinen Modifikationen."
   },
   "servers.purchase.step.plan.subtitle": {
-    "defaultMessage": "Wählen Sie die RAM-Kapazität und die technischen Daten, die Ihren Anforderungen entsprechen."
+    "defaultMessage": "Wähle die RAM-Kapazität und die technischen Daten, die deinen Anforderungen entsprechen."
   },
   "servers.purchase.step.plan.title": {
     "defaultMessage": "Plan"
diff --git a/packages/ui/src/locales/es-419/index.json b/packages/ui/src/locales/es-419/index.json
index 6ae83f76..74e39a95 100644
--- a/packages/ui/src/locales/es-419/index.json
+++ b/packages/ui/src/locales/es-419/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Crear enlace de afiliado"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Creando nuevo código de afiliado"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "¡Dale un nombre a tu enlace de afiliado para que sepas de dónde vienen las personas!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Nombre del enlace de afiliado"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "ej. YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "El nombre del usuario para el que se está creando el código de afiliado"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Nombre de usuario"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Escribe un nombre de usuario..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Creado por {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Creando enlace de afiliado..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Revocar enlace de afiliado"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Ver estadísticas"
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "Nuevo"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Enlaces de afiliado"
+  },
   "button.analytics": {
     "defaultMessage": "Estadísticas"
   },
@@ -47,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "Seguir"
   },
+  "button.max": {
+    "defaultMessage": "Máx"
+  },
   "button.more-options": {
     "defaultMessage": "Más opciones"
   },
@@ -119,17 +161,95 @@
   "collection.label.private": {
     "defaultMessage": "Privado"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Dirección"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "2da Dirección (opcional)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Cantidad"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Nombre del banco"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Razón social"
+  },
+  "form.label.city": {
+    "defaultMessage": "Ciudad"
+  },
+  "form.label.country": {
+    "defaultMessage": "País"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Fecha de nacimiento"
+  },
+  "form.label.email": {
+    "defaultMessage": "Correo electrónico"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Nombre"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Apellido"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Código postal"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Estado"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Escribe la dirección"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "Departamento, etc."
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "Escribe la cantidad"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "Escribe el nombre del banco"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "Selecciona el nombre del banco"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "Escribe la razón social"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Escribe la ciudad"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Selecciona el país"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "Escribe el correo electrónico"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Escribe el nombre"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Escribe el apellido"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Escribe el código postal"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Escribe el estado"
+  },
   "icon-select.edit": {
     "defaultMessage": "Editar ícono"
   },
   "icon-select.remove": {
-    "defaultMessage": "Remover ícono"
+    "defaultMessage": "Eliminar ícono"
   },
   "icon-select.replace": {
     "defaultMessage": "Reemplazar ícono"
   },
   "icon-select.select": {
-    "defaultMessage": "Selecionar ícono"
+    "defaultMessage": "Seleccionar ícono"
   },
   "input.search.placeholder": {
     "defaultMessage": "Buscar..."
@@ -158,6 +278,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "Modo de juego desconocido"
   },
+  "label.available": {
+    "defaultMessage": "{amount} disponible."
+  },
   "label.changes-saved": {
     "defaultMessage": "Cambios guardados"
   },
@@ -206,6 +329,9 @@
   "label.rejected": {
     "defaultMessage": "Rechazado"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "Acepto los <terms-link>Términos del Programa de Recompensas</terms-link>"
+  },
   "label.saved": {
     "defaultMessage": "Guardado"
   },
@@ -353,6 +479,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal Internacional"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -362,6 +491,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "Caridad"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "Caridades"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "Tarjeta de regalo"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Tarjetas de regalo"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Virtual Visa"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Virtual Visas"
+  },
   "project-type.all": {
     "defaultMessage": "Todo"
   },
diff --git a/packages/ui/src/locales/es-ES/index.json b/packages/ui/src/locales/es-ES/index.json
index 1563bebf..06329774 100644
--- a/packages/ui/src/locales/es-ES/index.json
+++ b/packages/ui/src/locales/es-ES/index.json
@@ -1,4 +1,31 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Crear enlace de afiliado"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Creando nuevo código de afiliado"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "¡Ponle un nombre a tu enlace de afiliado para saber de dónde provienen los usuarios!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Título del enlace de afiliado"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "p. ej. Youtube"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Nombre de usuario"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Introduce un nombre de usuario..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Creado por {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Creando enlace de afiliado..."
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -8,6 +35,9 @@
   "badge.new": {
     "defaultMessage": "Nuevo"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Enlaces de afiliado"
+  },
   "button.analytics": {
     "defaultMessage": "Analíticas"
   },
@@ -119,6 +149,54 @@
   "collection.label.private": {
     "defaultMessage": "Privado"
   },
+  "form.label.amount": {
+    "defaultMessage": "Cantidad"
+  },
+  "form.label.city": {
+    "defaultMessage": "Ciudad"
+  },
+  "form.label.country": {
+    "defaultMessage": "País"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Fecha de nacimiento"
+  },
+  "form.label.email": {
+    "defaultMessage": "Correo electrónico"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Nombre"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Apellidos"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Código postal"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Provincia"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Introduzca ciudad"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Seleccione el país"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "Introduzca el correo electrónico"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Introduzca nombre"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Introduzca apellidos"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Introduzca el código postal"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Introduzca la provincia"
+  },
   "icon-select.edit": {
     "defaultMessage": "Editar icono"
   },
@@ -206,6 +284,9 @@
   "label.rejected": {
     "defaultMessage": "Rechazado"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "Acepto los <terms-link>Términos del programa de recompensas</terms-link>."
+  },
   "label.saved": {
     "defaultMessage": "Guardado"
   },
@@ -353,6 +434,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal International"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -362,6 +446,21 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.gift-card": {
+    "defaultMessage": "Tarjeta regalo"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Tarjetas regalo"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Virtual Visa"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Virtual Visas"
+  },
   "project-type.all": {
     "defaultMessage": "Todos"
   },
diff --git a/packages/ui/src/locales/ms-Arab/index.json b/packages/ui/src/locales/ms-Arab/index.json
index b0aee956..9c95bc56 100644
--- a/packages/ui/src/locales/ms-Arab/index.json
+++ b/packages/ui/src/locales/ms-Arab/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Cipta pautan afiliasi"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Mencipta kod afiliasi baharu"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Berikan nama kepada pautan afiliasi anda supaya anda tahu dari mana orang datang!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Tajuk pautan afiliasi"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "cth. YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "Nama pengguna pengguna yang akan menggunakan kod afiliasi"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Nama pengguna"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Masukkan nama pengguna..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Dicipta oleh {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Mencipta pautan afiliasi..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Batalkan pautan afiliasi"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Lihat analitik"
+  },
   "badge.beta": {
     "defaultMessage": "بيتا"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "بهارو"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Pautan afiliasi"
+  },
   "button.analytics": {
     "defaultMessage": "اناليتيک"
   },
@@ -47,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "ايکوت"
   },
+  "button.max": {
+    "defaultMessage": "Maks"
+  },
   "button.more-options": {
     "defaultMessage": "لبيه باڽق ڤيليهن"
   },
@@ -119,6 +161,84 @@
   "collection.label.private": {
     "defaultMessage": "ڤريبادي"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Baris alamat"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "Baris alamat 2 (tidak wajib)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Amaun"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Nama bank"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Nama bisnes"
+  },
+  "form.label.city": {
+    "defaultMessage": "Bandar"
+  },
+  "form.label.country": {
+    "defaultMessage": "Negara"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Tarikh lahir"
+  },
+  "form.label.email": {
+    "defaultMessage": "E-mel"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Nama depan"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Nama akhir"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Poskod/Kod ZIP"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Negeri/wilayah"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Masukkan alamat"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "Apartmen, suite, dll."
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "Masukkan amaun"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "Masukkan nama bank"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "Pilih nama bank"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "Masukkan nama bisnes"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Masukkan bandar"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Pilih negara"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "Masukkan alamat e-mel"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Masukkan nama depan"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Masukkan nama akhir"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Masukkan poskod"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Masukkan negeri/wilayah"
+  },
   "icon-select.edit": {
     "defaultMessage": "سونتيڠ ايکون"
   },
@@ -158,6 +278,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "مود ڤرماءينن يڠ تيدق دکتاهوءي"
   },
+  "label.available": {
+    "defaultMessage": "{amount} tersedia."
+  },
   "label.changes-saved": {
     "defaultMessage": "ڤروبهن دسيمڤن"
   },
@@ -206,6 +329,9 @@
   "label.rejected": {
     "defaultMessage": "دتولق"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "Saya bersetuju dengan <terms-link>Terma Program Ganjaran</terms-link>"
+  },
   "label.saved": {
     "defaultMessage": "دسيمڤن"
   },
@@ -353,6 +479,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal Antarabangsa"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -362,6 +491,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "Amal Kebajikan"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "Amal Kebajikan"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "Kad hadiah"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Kad hadiah"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Visa Virtual"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Visa Virtual"
+  },
   "project-type.all": {
     "defaultMessage": "سموا"
   },
diff --git a/packages/ui/src/locales/ms-MY/index.json b/packages/ui/src/locales/ms-MY/index.json
index 157ab071..c051c1ce 100644
--- a/packages/ui/src/locales/ms-MY/index.json
+++ b/packages/ui/src/locales/ms-MY/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Cipta pautan afiliasi"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Mencipta kod afiliasi baharu"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Berikan nama kepada pautan afiliasi anda supaya anda tahu dari mana orang datang!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Tajuk pautan afiliasi"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "cth. YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "Nama pengguna pengguna yang akan menggunakan kod afiliasi"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Nama pengguna"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Masukkan nama pengguna..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Dicipta oleh {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Mencipta pautan afiliasi..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Batalkan pautan afiliasi"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Lihat analitik"
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "Baharu"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Pautan afiliasi"
+  },
   "button.analytics": {
     "defaultMessage": "Analitik"
   },
@@ -47,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "Ikut"
   },
+  "button.max": {
+    "defaultMessage": "Maks"
+  },
   "button.more-options": {
     "defaultMessage": "Lebih banyak pilihan"
   },
@@ -119,6 +161,84 @@
   "collection.label.private": {
     "defaultMessage": "Peribadi"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Baris alamat"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "Baris alamat 2 (tidak wajib)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Amaun"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Nama bank"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Nama bisnes"
+  },
+  "form.label.city": {
+    "defaultMessage": "Bandar"
+  },
+  "form.label.country": {
+    "defaultMessage": "Negara"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Tarikh lahir"
+  },
+  "form.label.email": {
+    "defaultMessage": "E-mel"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Nama depan"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Nama akhir"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Poskod/Kod ZIP"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Negeri/wilayah"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Masukkan alamat"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "Apartmen, suite, dll."
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "Masukkan amaun"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "Masukkan nama bank"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "Pilih nama bank"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "Masukkan nama bisnes"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Masukkan bandar"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Pilih negara"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "Masukkan alamat e-mel"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Masukkan nama depan"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Masukkan nama akhir"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Masukkan poskod"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Masukkan negeri/wilayah"
+  },
   "icon-select.edit": {
     "defaultMessage": "Sunting ikon"
   },
@@ -158,6 +278,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "Mod permainan yang tidak diketahui"
   },
+  "label.available": {
+    "defaultMessage": "{amount} tersedia."
+  },
   "label.changes-saved": {
     "defaultMessage": "Perubahan disimpan"
   },
@@ -206,6 +329,9 @@
   "label.rejected": {
     "defaultMessage": "Ditolak"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "Saya bersetuju dengan <terms-link>Terma Program Ganjaran</terms-link>"
+  },
   "label.saved": {
     "defaultMessage": "Disimpan"
   },
@@ -353,6 +479,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal Antarabangsa"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -362,6 +491,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "Amal Kebajikan"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "Amal Kebajikan"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "Kad hadiah"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Kad hadiah"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Visa Virtual"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Visa Virtual"
+  },
   "project-type.all": {
     "defaultMessage": "Semua"
   },
diff --git a/packages/ui/src/locales/pl-PL/index.json b/packages/ui/src/locales/pl-PL/index.json
index 7416827c..63d1a486 100644
--- a/packages/ui/src/locales/pl-PL/index.json
+++ b/packages/ui/src/locales/pl-PL/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Utwórz link afiliacyjny"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Tworzenie nowego linku afiliacyjnego"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Nadaj swojemu linkowi afiliacyjnemu nazwę, by wiedzieć, gdzie znajdują go ludzie!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Nazwa linku afiliacyjnego"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "np. YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "Nazwa użytkownika, któremu ma być utworzony ten kod"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Nazwa użytkownika"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Podaj nazwę użytkownika..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Stworzony przez {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Tworzenie linku afiliacyjnego..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Usuń link afiliacyjny"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Pokaż dane analityczne"
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "Nowe"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Linki afiliacyjne"
+  },
   "button.analytics": {
     "defaultMessage": "Analityka"
   },
@@ -47,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "Obserwuj"
   },
+  "button.max": {
+    "defaultMessage": "Maks."
+  },
   "button.more-options": {
     "defaultMessage": "Więcej opcji"
   },
@@ -119,6 +161,84 @@
   "collection.label.private": {
     "defaultMessage": "Prywatna"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Adres, wiersz 1"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "Adres, wiersz 2 (niewymagane)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Kwota"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Nazwa banku"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Nazwa przedsiębiorczości"
+  },
+  "form.label.city": {
+    "defaultMessage": "Miejscowość"
+  },
+  "form.label.country": {
+    "defaultMessage": "Kraj"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Data urodzenia"
+  },
+  "form.label.email": {
+    "defaultMessage": "E-mail"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Imię"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Nazwisko"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Kod pocztowy"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Województwo"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Podaj adres"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "Aparatament, mieszkanie, itp."
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "Podaj kwotę"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "Podaj nazwę banku"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "Wybierz nazwę banku"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "Podaj nazwę przedsiębiorczości"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Podaj miasto"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Wybierz kraj"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "Podaj adres e-mail"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Podaj imię"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Podaj nazwisko"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Podaj kod pocztowy"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Podaj województwo"
+  },
   "icon-select.edit": {
     "defaultMessage": "Edytuj ikonę"
   },
@@ -158,6 +278,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "Nieznany tryb gry"
   },
+  "label.available": {
+    "defaultMessage": "{amount} dostępne."
+  },
   "label.changes-saved": {
     "defaultMessage": "Zmiany zapisane"
   },
@@ -206,6 +329,9 @@
   "label.rejected": {
     "defaultMessage": "Odrzucony"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "Wyrażam zgodę na <terms-link>Warunki programu wynagrodzenia</terms-link>"
+  },
   "label.saved": {
     "defaultMessage": "Zapisano"
   },
@@ -353,6 +479,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "Międzynarodowy PayPal"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -362,6 +491,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "Organizacja charytatywna"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "Organizacje charytatywne"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "Karta podarunkowa"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Karty podarunkowe"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Wirtualna karta Visa"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Wirtualne karty Visa"
+  },
   "project-type.all": {
     "defaultMessage": "Wszystko"
   },
diff --git a/packages/ui/src/locales/pt-BR/index.json b/packages/ui/src/locales/pt-BR/index.json
index 215acb29..0e979f04 100644
--- a/packages/ui/src/locales/pt-BR/index.json
+++ b/packages/ui/src/locales/pt-BR/index.json
@@ -1,4 +1,28 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Criar link de afiliado"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Criando novo código de afiliado"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Título do link de afiliado"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "ex.: YouTube"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Nome de usuário"
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Criado por {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Criando link de afiliado..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Revogar link de afiliado"
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -8,6 +32,9 @@
   "badge.new": {
     "defaultMessage": "Novo"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Links de afiliado"
+  },
   "button.analytics": {
     "defaultMessage": "Estatísticas"
   },
diff --git a/packages/ui/src/locales/pt-PT/index.json b/packages/ui/src/locales/pt-PT/index.json
index 2d62ee99..2cf5e2b4 100644
--- a/packages/ui/src/locales/pt-PT/index.json
+++ b/packages/ui/src/locales/pt-PT/index.json
@@ -347,6 +347,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal Internacional"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -356,6 +359,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "Intituição de cariedade"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "Instituições de cariedade"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "Cartão-presente"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Cartões-presente"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Visa Virtual"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Visas Virtuais"
+  },
   "project-type.all": {
     "defaultMessage": "Todos"
   },
diff --git a/packages/ui/src/locales/ru-RU/index.json b/packages/ui/src/locales/ru-RU/index.json
index 49c5fecb..3b31be4a 100644
--- a/packages/ui/src/locales/ru-RU/index.json
+++ b/packages/ui/src/locales/ru-RU/index.json
@@ -86,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "Подписаться"
   },
+  "button.max": {
+    "defaultMessage": "Максимум"
+  },
   "button.more-options": {
     "defaultMessage": "Дополнительно"
   },
@@ -158,6 +161,84 @@
   "collection.label.private": {
     "defaultMessage": "Приватная"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Строка адреса"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "Строка адреса 2 (необязательно)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Сумма"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Наименование банка"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Наименование организации"
+  },
+  "form.label.city": {
+    "defaultMessage": "Город"
+  },
+  "form.label.country": {
+    "defaultMessage": "Страна"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Дата рождения"
+  },
+  "form.label.email": {
+    "defaultMessage": "Электронная почта"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Имя"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Фамилия"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Почтовый индекс"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Край/область"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Введите адрес"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "Квартира, офис и т. п."
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "Введите сумму"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "Введите наименование банка"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "Выберите наименование банка"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "Введите наименование организации"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Введите город"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Выберите страну"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "Введите адрес электронной почты"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Введите имя"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Введите фамилию"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Введите почтовый индекс"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Введите край/область"
+  },
   "icon-select.edit": {
     "defaultMessage": "Изменить значок"
   },
@@ -197,6 +278,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "Неизвестный режим"
   },
+  "label.available": {
+    "defaultMessage": "{amount} доступно."
+  },
   "label.changes-saved": {
     "defaultMessage": "Изменения сохранены"
   },
@@ -245,6 +329,9 @@
   "label.rejected": {
     "defaultMessage": "Отклонён"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "Я принимаю <terms-link>условия программы вознаграждений</terms-link>"
+  },
   "label.saved": {
     "defaultMessage": "Сохранено"
   },
@@ -392,6 +479,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal International"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -401,6 +491,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "Благотворительность"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "Благотворительность"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "Подарочная карта"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Подарочные карты"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Виртуальная Visa"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Виртуальные Visa"
+  },
   "project-type.all": {
     "defaultMessage": "Всё"
   },
diff --git a/packages/ui/src/locales/tr-TR/index.json b/packages/ui/src/locales/tr-TR/index.json
index 0f050820..6a07db30 100644
--- a/packages/ui/src/locales/tr-TR/index.json
+++ b/packages/ui/src/locales/tr-TR/index.json
@@ -1,4 +1,37 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Ortaklık bağlantısı oluştur"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Yeni ortaklık kodu oluşturuluyor"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Ortaklık bağlantına bir isim ver, böylece insanların nereden geldiğini bilirsin!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Ortaklık bağlantısının başlığı"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "Ortaklık kodunu oluşturmak için kullanıcının kullanıcı adı"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Kullanıcı adı"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Kullanıcı adı giriniz..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Tarafından oluşturuldu {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Ortaklık bağlantısı oluşturuluyor..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Ortaklık bağlantısını iptal et"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Analizleri görüntüle"
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -8,6 +41,9 @@
   "badge.new": {
     "defaultMessage": "Yeni"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Ortaklık bağlantıları"
+  },
   "button.analytics": {
     "defaultMessage": "Veriler"
   },
@@ -47,6 +83,9 @@
   "button.follow": {
     "defaultMessage": "Takip Et"
   },
+  "button.max": {
+    "defaultMessage": "Maksimum"
+  },
   "button.more-options": {
     "defaultMessage": "Diğer ayarlar"
   },
@@ -119,6 +158,36 @@
   "collection.label.private": {
     "defaultMessage": "Gizli"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Adres satırı"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "Adres satırı 2 (isteğe bağlı)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Miktar"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "İşletme adı"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Doğum tarihi"
+  },
+  "form.label.email": {
+    "defaultMessage": "E Posta"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "İlk adı"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Posta kodu"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Eyalet/il"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Adresi girin"
+  },
   "icon-select.edit": {
     "defaultMessage": "Simgeyi düzenle"
   },
@@ -206,6 +275,9 @@
   "label.rejected": {
     "defaultMessage": "Reddedilmiş"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "<terms-link>Ödül Programı Şartları</terms-link>'nı kabul ediyorum"
+  },
   "label.saved": {
     "defaultMessage": "Kaydedildi"
   },
diff --git a/packages/ui/src/locales/uk-UA/index.json b/packages/ui/src/locales/uk-UA/index.json
index e4dbd973..137861ae 100644
--- a/packages/ui/src/locales/uk-UA/index.json
+++ b/packages/ui/src/locales/uk-UA/index.json
@@ -5,6 +5,36 @@
   "affiliate.create.header": {
     "defaultMessage": "Створити новий код партнера"
   },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Дайте своєму партнерському посиланню назву, щоб ви знали, звідки люди приходять!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Заголовок партнерського посилання"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "напр., YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "Ім’я користувача особи, для якої створити код партнера"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Ім’я користувача"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Уведіть ім’я користувача"
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Створено від {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Створення партнерського посилання…"
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Відкликати партнерське посилання"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Переглянути аналітику"
+  },
   "badge.beta": {
     "defaultMessage": "Бета"
   },
@@ -14,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "Новинка"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Партнерські посилання"
+  },
   "button.analytics": {
     "defaultMessage": "Аналітика"
   },
diff --git a/packages/ui/src/locales/zh-CN/index.json b/packages/ui/src/locales/zh-CN/index.json
index f3e95826..c5fecac1 100644
--- a/packages/ui/src/locales/zh-CN/index.json
+++ b/packages/ui/src/locales/zh-CN/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "创建推广链接"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "创建新的推广代码"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "给你的推广链接起个名字，这样你就知道人们是从哪里来的了！"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "推广链接的标题"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "e.g. YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "用于创建推广代码的用户名"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "用户名"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "输入用户名……"
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "{user} 创建"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "创建推广链接……"
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "撤销推广链接"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "查看分析"
+  },
   "badge.beta": {
     "defaultMessage": "测试版"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "新"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "推广链接"
+  },
   "button.analytics": {
     "defaultMessage": "数据"
   },
@@ -47,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "关注"
   },
+  "button.max": {
+    "defaultMessage": "最大"
+  },
   "button.more-options": {
     "defaultMessage": "更多选项"
   },
@@ -119,6 +161,84 @@
   "collection.label.private": {
     "defaultMessage": "私人"
   },
+  "form.label.address-line": {
+    "defaultMessage": "地址第一行"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "地址第二行（选填）"
+  },
+  "form.label.amount": {
+    "defaultMessage": "金额"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "银行名称"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "公司名称"
+  },
+  "form.label.city": {
+    "defaultMessage": "市"
+  },
+  "form.label.country": {
+    "defaultMessage": "国家"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "出生日期"
+  },
+  "form.label.email": {
+    "defaultMessage": "电子邮箱"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "名字"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "姓氏"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "邮政编码"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "州/省"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "输入地址"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "公寓、套房等"
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "输入金额"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "输入银行名称"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "选择银行名称"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "输入企业名称"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "输入城市"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "选择国家"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "输入电子邮件地址"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "输入名字"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "输入姓氏"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "输入邮政编码"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "输入州/省"
+  },
   "icon-select.edit": {
     "defaultMessage": "编辑图标"
   },
@@ -158,6 +278,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "游戏模式未知"
   },
+  "label.available": {
+    "defaultMessage": "{amount} 可用。"
+  },
   "label.changes-saved": {
     "defaultMessage": "更改已保存"
   },
@@ -165,7 +288,7 @@
     "defaultMessage": "收藏"
   },
   "label.created-ago": {
-    "defaultMessage": "创建于 {ago}"
+    "defaultMessage": "{ago}创建"
   },
   "label.dashboard": {
     "defaultMessage": "数据面板"
@@ -206,6 +329,9 @@
   "label.rejected": {
     "defaultMessage": "已回绝"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "我同意<terms-link>激励计划条款</terms-link>"
+  },
   "label.saved": {
     "defaultMessage": "已保存"
   },
@@ -353,15 +479,39 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal 国际版"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "银联"
   },
   "omorphia.component.purchase_modal.payment_method_type.unknown": {
-    "defaultMessage": "未知付款方式"
+    "defaultMessage": "未知支付方式"
   },
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "慈善"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "慈善"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "礼品卡"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "礼品卡"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Visa 虚拟信用卡"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Visa 虚拟信用卡"
+  },
   "project-type.all": {
     "defaultMessage": "全部"
   },
@@ -723,10 +873,10 @@
     "defaultMessage": "你现在还不会被收费。"
   },
   "servers.purchase.step.payment.prompt": {
-    "defaultMessage": "请选择付款方式"
+    "defaultMessage": "请选择支付方式"
   },
   "servers.purchase.step.payment.title": {
-    "defaultMessage": "付款方式"
+    "defaultMessage": "支付方式"
   },
   "servers.purchase.step.plan.billed": {
     "defaultMessage": "按{interval}付款"
diff --git a/packages/ui/src/locales/zh-TW/index.json b/packages/ui/src/locales/zh-TW/index.json
index 1bb46ae0..281ab226 100644
--- a/packages/ui/src/locales/zh-TW/index.json
+++ b/packages/ui/src/locales/zh-TW/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "建立聯盟行銷連結"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "建立新的聯盟行銷代碼"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "為你的聯盟行銷連結命名，以便你知道流量的來源了！"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "標題或聯盟行銷連結"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "例如：YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "欲建立聯盟行銷代碼的使用者名稱"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "使用者名稱"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "輸入使用者名稱..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "由 {user} 建立"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "正在建立聯盟行銷連結..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "撤銷聯盟行銷連結"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "檢視數據分析"
+  },
   "badge.beta": {
     "defaultMessage": "Beta 版"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "新功能"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "聯盟行銷連結"
+  },
   "button.analytics": {
     "defaultMessage": "數據分析"
   },
@@ -468,7 +507,7 @@
     "defaultMessage": "提交於 {date}"
   },
   "project.about.details.title": {
-    "defaultMessage": "詳細資料"
+    "defaultMessage": "詳細資訊"
   },
   "project.about.details.updated": {
     "defaultMessage": "更新於 {date}"

From 9a13e977a05ec2a4e4f8bedc291e9eb643d6ec33 Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Wed, 12 Nov 2025 04:00:39 +0000
Subject: [PATCH 46/64] fix: crash on charges.vue (#4765)

---
 apps/frontend/src/pages/settings/billing/charges.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/frontend/src/pages/settings/billing/charges.vue b/apps/frontend/src/pages/settings/billing/charges.vue
index 8889bdbf..d9f8eef6 100644
--- a/apps/frontend/src/pages/settings/billing/charges.vue
+++ b/apps/frontend/src/pages/settings/billing/charges.vue
@@ -15,11 +15,11 @@
 				<div class="flex flex-col gap-1">
 					<div class="flex items-center gap-1">
 						<span class="font-bold text-primary">
-							<template v-if="charge.product.metadata.type === 'midas'"> Modrinth Plus </template>
-							<template v-else-if="charge.product.metadata.type === 'pyro'">
+							<template v-if="charge.product?.metadata?.type === 'midas'"> Modrinth Plus </template>
+							<template v-else-if="charge.product?.metadata?.type === 'pyro'">
 								Modrinth Servers
 							</template>
-							<template v-else> Unknown product </template>
+							<template v-else> Medal Server Trial </template>
 							<template v-if="charge.subscription_interval">
 								{{ charge.subscription_interval }}
 							</template>

From bbc31ef0776a7199e0f39f17e6cf82feb8dbdb51 Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Wed, 12 Nov 2025 04:00:46 +0000
Subject: [PATCH 47/64] fix: z index issues for mobile nav (#4766)

* fix: z index issues for mobile nav

Closes: #4722

* fix: below modals

---------

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 apps/frontend/src/layouts/default.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index ad84124a..60c2661c 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -1820,7 +1820,7 @@ const footerLinks = [
 		padding-bottom: var(--size-rounded-card);
 		left: 0;
 		background-color: var(--color-raised-bg);
-		z-index: 6;
+		z-index: 11; // 20 = modals, 10 = svg icons
 		transform: translateY(100%);
 		transition: transform 0.4s cubic-bezier(0.54, 0.84, 0.42, 1);
 		border-radius: var(--size-rounded-card) var(--size-rounded-card) 0 0;
@@ -1901,7 +1901,7 @@ const footerLinks = [
 		bottom: 0;
 		background-color: var(--color-raised-bg);
 		box-shadow: 0 0 20px 2px rgba(0, 0, 0, 0.3);
-		z-index: 7;
+		z-index: 11; // 20 = modals, 10 = svg icons
 		width: 100%;
 		align-items: center;
 		justify-content: space-between;

From 880ed21bcd92335d0ce75de99da273a6503aec77 Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Wed, 12 Nov 2025 04:01:25 +0000
Subject: [PATCH 48/64] fix: incorrect autocomplete for pardon_ip and ban_ip
 (#4763)

---
 apps/frontend/src/pages/servers/manage/[id]/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/frontend/src/pages/servers/manage/[id]/index.vue b/apps/frontend/src/pages/servers/manage/[id]/index.vue
index 4ea6ac7e..5945b142 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/index.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/index.vue
@@ -341,7 +341,7 @@ const commandTree: any = {
 			},
 		},
 	},
-	ban_ip: null,
+	'ban-ip': null,
 	banlist: {
 		ips: null,
 		players: null,
@@ -470,7 +470,7 @@ const commandTree: any = {
 	msg: null,
 	op: null,
 	pardon: null,
-	pardon_ip: null,
+	'pardon-ip': null,
 	particle: null,
 	playsound: null,
 	recipe: {

From 386e6e50da164693679aea77e3b8ec2f1469cdb1 Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Wed, 12 Nov 2025 04:14:11 +0000
Subject: [PATCH 49/64] refactor: move batch credit modal into default layout
 (#4767)

* refactor: move batch credit modal into default layout

* fix: spacing + spans rather than p
---
 .../components/ui/admin/BatchCreditModal.vue  | 264 +++++++++++++++++
 apps/frontend/src/layouts/default.vue         |   4 +-
 .../src/pages/admin/servers/nodes.vue         | 275 ------------------
 3 files changed, 267 insertions(+), 276 deletions(-)
 create mode 100644 apps/frontend/src/components/ui/admin/BatchCreditModal.vue
 delete mode 100644 apps/frontend/src/pages/admin/servers/nodes.vue

diff --git a/apps/frontend/src/components/ui/admin/BatchCreditModal.vue b/apps/frontend/src/components/ui/admin/BatchCreditModal.vue
new file mode 100644
index 00000000..8e6dbcbf
--- /dev/null
+++ b/apps/frontend/src/components/ui/admin/BatchCreditModal.vue
@@ -0,0 +1,264 @@
+<template>
+	<NewModal ref="modal">
+		<template #title>
+			<span class="text-lg font-extrabold text-contrast">Batch credit</span>
+		</template>
+		<div class="flex w-[500px] max-w-[90vw] flex-col gap-6">
+			<div class="flex flex-col gap-2">
+				<label class="flex flex-col gap-1">
+					<span class="text-lg font-semibold text-contrast"> Type </span>
+					<span>Select target to credit.</span>
+				</label>
+				<Combobox
+					v-model="mode"
+					:options="modeOptions"
+					placeholder="Select type"
+					class="max-w-[8rem]"
+				/>
+			</div>
+			<div class="flex flex-col gap-2">
+				<label for="days" class="flex flex-col gap-1">
+					<span class="text-lg font-semibold text-contrast"> Days to credit </span>
+				</label>
+				<input
+					id="days"
+					v-model.number="days"
+					class="w-32"
+					type="number"
+					min="1"
+					autocomplete="off"
+				/>
+			</div>
+
+			<div v-if="mode === 'nodes'" class="flex flex-col gap-3">
+				<div class="flex flex-col gap-2">
+					<label for="node-input" class="flex flex-col gap-1">
+						<span class="text-lg font-semibold text-contrast"> Node hostnames </span>
+					</label>
+					<div class="flex items-center gap-2">
+						<input
+							id="node-input"
+							v-model="nodeInput"
+							class="w-32"
+							type="text"
+							autocomplete="off"
+						/>
+						<ButtonStyled color="blue" color-fill="text">
+							<button class="shrink-0" @click="addNode">
+								<PlusIcon />
+								Add
+							</button>
+						</ButtonStyled>
+					</div>
+					<div v-if="selectedNodes.length" class="mt-1 flex flex-wrap gap-2">
+						<TagItem v-for="h in selectedNodes" :key="`node-${h}`" :action="() => removeNode(h)">
+							<XIcon />
+							{{ h }}
+						</TagItem>
+					</div>
+				</div>
+			</div>
+
+			<div v-else class="flex flex-col gap-3">
+				<div class="flex flex-col gap-2">
+					<label for="region-select" class="flex flex-col gap-1">
+						<span class="text-lg font-semibold text-contrast"> Region </span>
+						<span>This will credit all active servers in the region.</span>
+					</label>
+					<Combobox
+						v-model="selectedRegion"
+						:options="regions"
+						placeholder="Select region"
+						class="max-w-[24rem]"
+					/>
+				</div>
+			</div>
+
+			<div class="between flex items-center gap-4">
+				<label for="send-email-batch" class="flex flex-col gap-1">
+					<span class="text-lg font-semibold text-contrast"> Send email </span>
+				</label>
+				<Toggle id="send-email-batch" v-model="sendEmail" />
+			</div>
+
+			<div v-if="sendEmail" class="flex flex-col gap-2">
+				<label for="message-batch" class="flex flex-col gap-1">
+					<span class="text-lg font-semibold text-contrast"> Customize Email </span>
+					<span>
+						Unless a particularly bad or out of the ordinary event happened, keep this to the
+						default
+					</span>
+				</label>
+				<div
+					class="text-muted flex flex-col gap-2 rounded-lg border border-divider bg-button-bg p-4"
+				>
+					<span>Hi {user.name},</span>
+					<div class="textarea-wrapper">
+						<textarea
+							id="message-batch"
+							v-model="message"
+							rows="3"
+							class="w-full overflow-hidden !bg-surface-3"
+						/>
+					</div>
+					<span>
+						To make up for it, we've added {{ days }} day{{ pluralize(days) }} to your Modrinth
+						Servers subscription.
+					</span>
+					<span>
+						Your next charge was scheduled for {credit.previous_due} and will now be on
+						{credit.next_due}.
+					</span>
+				</div>
+			</div>
+
+			<div class="flex gap-2">
+				<ButtonStyled color="brand">
+					<button :disabled="applyDisabled" @click="apply">
+						<CheckIcon aria-hidden="true" />
+						Apply credits
+					</button>
+				</ButtonStyled>
+				<ButtonStyled>
+					<button @click="modal?.hide?.()">
+						<XIcon aria-hidden="true" />
+						Cancel
+					</button>
+				</ButtonStyled>
+			</div>
+		</div>
+	</NewModal>
+</template>
+
+<script setup lang="ts">
+import { CheckIcon, PlusIcon, XIcon } from '@modrinth/assets'
+import {
+	ButtonStyled,
+	Combobox,
+	injectNotificationManager,
+	NewModal,
+	TagItem,
+	Toggle,
+} from '@modrinth/ui'
+import { DEFAULT_CREDIT_EMAIL_MESSAGE } from '@modrinth/utils/utils.ts'
+import { computed, ref } from 'vue'
+
+import { useBaseFetch } from '#imports'
+import { useServersFetch } from '~/composables/servers/servers-fetch.ts'
+
+const { addNotification } = injectNotificationManager()
+
+const modal = ref<InstanceType<typeof NewModal>>()
+
+const days = ref(1)
+const sendEmail = ref(true)
+const message = ref('')
+
+const modeOptions = [
+	{ value: 'nodes', label: 'Nodes' },
+	{ value: 'region', label: 'Region' },
+]
+const mode = ref<string>('nodes')
+
+const nodeInput = ref('')
+const selectedNodes = ref<string[]>([])
+
+type RegionOpt = { value: string; label: string }
+const regions = ref<RegionOpt[]>([])
+const selectedRegion = ref<string | null>(null)
+const nodeHostnames = ref<string[]>([])
+
+function show(event?: Event) {
+	void ensureOverview()
+	message.value = DEFAULT_CREDIT_EMAIL_MESSAGE
+	modal.value?.show(event)
+}
+
+function hide() {
+	modal.value?.hide()
+}
+
+function addNode() {
+	const v = nodeInput.value.trim()
+	if (!v) return
+	if (!nodeHostnames.value.includes(v)) {
+		addNotification({
+			title: 'Unknown node',
+			text: "This hostname doesn't exist",
+			type: 'error',
+		})
+		return
+	}
+	if (!selectedNodes.value.includes(v)) selectedNodes.value.push(v)
+	nodeInput.value = ''
+}
+
+function removeNode(v: string) {
+	selectedNodes.value = selectedNodes.value.filter((x) => x !== v)
+}
+
+const applyDisabled = computed(() => {
+	if (days.value < 1) return true
+	if (mode.value === 'nodes') return selectedNodes.value.length === 0
+	return !selectedRegion.value
+})
+
+async function ensureOverview() {
+	if (regions.value.length || nodeHostnames.value.length) return
+	try {
+		const data = await useServersFetch<any>('/nodes/overview', { version: 'internal' })
+		regions.value = (data.regions || []).map((r: any) => ({
+			value: r.key,
+			label: `${r.display_name} (${r.key})`,
+		}))
+		nodeHostnames.value = data.node_hostnames || []
+		if (!selectedRegion.value && regions.value.length) selectedRegion.value = regions.value[0].value
+	} catch (err) {
+		addNotification({ title: 'Failed to load nodes overview', text: String(err), type: 'error' })
+	}
+}
+
+async function apply() {
+	try {
+		const body =
+			mode.value === 'nodes'
+				? {
+						nodes: selectedNodes.value.slice(),
+						days: Math.max(1, Math.floor(days.value)),
+						send_email: sendEmail.value,
+						message: message.value?.trim() || DEFAULT_CREDIT_EMAIL_MESSAGE,
+					}
+				: {
+						region: selectedRegion.value!,
+						days: Math.max(1, Math.floor(days.value)),
+						send_email: sendEmail.value,
+						message: message.value?.trim() || DEFAULT_CREDIT_EMAIL_MESSAGE,
+					}
+		await useBaseFetch('billing/credit', {
+			method: 'POST',
+			body: JSON.stringify(body),
+			internal: true,
+		})
+		addNotification({ title: 'Credits applied', type: 'success' })
+		modal.value?.hide()
+		selectedNodes.value = []
+		nodeInput.value = ''
+		message.value = ''
+	} catch (err: any) {
+		addNotification({
+			title: 'Error applying credits',
+			text: err?.data?.description ?? String(err),
+			type: 'error',
+		})
+	}
+}
+
+function pluralize(n: number): string {
+	return n === 1 ? '' : 's'
+}
+
+defineExpose({
+	show,
+	hide,
+})
+</script>
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index 60c2661c..d425e9e6 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -477,7 +477,7 @@
 							{
 								id: 'servers-nodes',
 								color: 'primary',
-								link: '/admin/servers/nodes',
+								action: (event) => $refs.modal_batch_credit.show(event),
 								shown: isAdmin(auth.user),
 							},
 						]"
@@ -786,6 +786,7 @@
 			<ProjectCreateModal v-if="auth.user" ref="modal_creation" />
 			<CollectionCreateModal ref="modal_collection_creation" />
 			<OrganizationCreateModal ref="modal_organization_creation" />
+			<BatchCreditModal v-if="auth.user && isAdmin(auth.user)" ref="modal_batch_credit" />
 			<slot id="main" />
 		</main>
 		<footer
@@ -937,6 +938,7 @@ import { isAdmin, isStaff, UserBadge } from '@modrinth/utils'
 import { IntlFormatted } from '@vintl/vintl/components'
 
 import TextLogo from '~/components/brand/TextLogo.vue'
+import BatchCreditModal from '~/components/ui/admin/BatchCreditModal.vue'
 import CollectionCreateModal from '~/components/ui/create/CollectionCreateModal.vue'
 import OrganizationCreateModal from '~/components/ui/create/OrganizationCreateModal.vue'
 import ProjectCreateModal from '~/components/ui/create/ProjectCreateModal.vue'
diff --git a/apps/frontend/src/pages/admin/servers/nodes.vue b/apps/frontend/src/pages/admin/servers/nodes.vue
deleted file mode 100644
index 162c3310..00000000
--- a/apps/frontend/src/pages/admin/servers/nodes.vue
+++ /dev/null
@@ -1,275 +0,0 @@
-<template>
-	<div class="page experimental-styles-within">
-		<div
-			class="mb-6 flex items-end justify-between border-0 border-b border-solid border-divider pb-4"
-		>
-			<h1 class="m-0 text-2xl">Server nodes</h1>
-			<ButtonStyled color="brand">
-				<button @click="openBatchModal"><PlusIcon /> Batch credit</button>
-			</ButtonStyled>
-		</div>
-		<div>don't worry there's not supposed to be anything here</div>
-
-		<NewModal ref="batchModal">
-			<template #title>
-				<span class="text-lg font-extrabold text-contrast">Batch credit</span>
-			</template>
-			<div class="flex w-[720px] max-w-[90vw] flex-col gap-6">
-				<div class="flex flex-col gap-2">
-					<label class="flex flex-col gap-1">
-						<span class="text-lg font-semibold text-contrast"> Type </span>
-						<span>Select target to credit.</span>
-					</label>
-					<Combobox
-						v-model="mode"
-						:options="modeOptions"
-						placeholder="Select type"
-						class="max-w-[8rem]"
-					/>
-				</div>
-				<div class="flex flex-col gap-2">
-					<label for="days" class="flex flex-col gap-1">
-						<span class="text-lg font-semibold text-contrast"> Days to credit </span>
-					</label>
-					<input
-						id="days"
-						v-model.number="days"
-						class="w-32"
-						type="number"
-						min="1"
-						autocomplete="off"
-					/>
-				</div>
-
-				<div v-if="mode === 'nodes'" class="flex flex-col gap-3">
-					<div class="flex flex-col gap-2">
-						<label for="node-input" class="flex flex-col gap-1">
-							<span class="text-lg font-semibold text-contrast"> Node hostnames </span>
-						</label>
-						<div class="flex items-center gap-2">
-							<input
-								id="node-input"
-								v-model="nodeInput"
-								class="w-32"
-								type="text"
-								autocomplete="off"
-							/>
-							<ButtonStyled color="blue" color-fill="text">
-								<button class="shrink-0" @click="addNode">
-									<PlusIcon />
-									Add
-								</button>
-							</ButtonStyled>
-						</div>
-						<div v-if="selectedNodes.length" class="mt-1 flex flex-wrap gap-2">
-							<TagItem v-for="h in selectedNodes" :key="`node-${h}`" :action="() => removeNode(h)">
-								<XIcon />
-								{{ h }}
-							</TagItem>
-						</div>
-					</div>
-				</div>
-
-				<div v-else class="flex flex-col gap-3">
-					<div class="flex flex-col gap-2">
-						<label for="region-select" class="flex flex-col gap-1">
-							<span class="text-lg font-semibold text-contrast"> Region </span>
-							<span>This will credit all active servers in the region.</span>
-						</label>
-						<Combobox
-							v-model="selectedRegion"
-							:options="regions"
-							placeholder="Select region"
-							class="max-w-[24rem]"
-						/>
-					</div>
-				</div>
-
-				<div class="between flex items-center gap-4">
-					<label for="send-email-nodes" class="flex flex-col gap-1">
-						<span class="text-lg font-semibold text-contrast"> Send email </span>
-					</label>
-					<Toggle id="send-email-nodes" v-model="sendEmail" />
-				</div>
-
-				<div v-if="sendEmail" class="flex flex-col gap-2">
-					<label for="message-region" class="flex flex-col gap-1">
-						<span class="text-lg font-semibold text-contrast"> Customize Email </span>
-						<span>
-							Unless a particularly bad or out of the ordinary event happened, keep this to the
-							default
-						</span>
-					</label>
-					<div class="text-muted rounded-lg border border-divider bg-button-bg p-4">
-						<p>Hi {user.name},</p>
-						<div class="textarea-wrapper">
-							<textarea
-								id="message-region"
-								v-model="message"
-								rows="3"
-								class="w-full overflow-hidden"
-							/>
-						</div>
-						<p>
-							To make up for it, we've added {{ days }} day{{ pluralize(days) }} to your Modrinth
-							Servers subscription.
-						</p>
-						<p>
-							Your next charge was scheduled for {credit.previous_due} and will now be on
-							{credit.next_due}.
-						</p>
-					</div>
-				</div>
-
-				<div class="flex gap-2">
-					<ButtonStyled color="brand">
-						<button :disabled="applyDisabled" @click="apply">
-							<CheckIcon aria-hidden="true" />
-							Apply credits
-						</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="batchModal?.hide?.()">
-							<XIcon aria-hidden="true" />
-							Cancel
-						</button>
-					</ButtonStyled>
-				</div>
-			</div>
-		</NewModal>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { CheckIcon, PlusIcon, XIcon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	Combobox,
-	injectNotificationManager,
-	NewModal,
-	TagItem,
-	Toggle,
-} from '@modrinth/ui'
-import { DEFAULT_CREDIT_EMAIL_MESSAGE } from '@modrinth/utils/utils.ts'
-import { computed, ref } from 'vue'
-
-import { useBaseFetch } from '#imports'
-import { useServersFetch } from '~/composables/servers/servers-fetch.ts'
-
-const { addNotification } = injectNotificationManager()
-
-const batchModal = ref<InstanceType<typeof NewModal>>()
-
-const days = ref(1)
-const sendEmail = ref(true)
-const message = ref('')
-
-const modeOptions = [
-	{ value: 'nodes', label: 'Nodes' },
-	{ value: 'region', label: 'Region' },
-]
-const mode = ref<string>('nodes')
-
-const nodeInput = ref('')
-const selectedNodes = ref<string[]>([])
-
-type RegionOpt = { value: string; label: string }
-const regions = ref<RegionOpt[]>([])
-const selectedRegion = ref<string | null>(null)
-const nodeHostnames = ref<string[]>([])
-
-function openBatchModal() {
-	void ensureOverview()
-
-	message.value = DEFAULT_CREDIT_EMAIL_MESSAGE
-	batchModal.value?.show()
-}
-
-function addNode() {
-	const v = nodeInput.value.trim()
-	if (!v) return
-	if (!nodeHostnames.value.includes(v)) {
-		addNotification({
-			title: 'Unknown node',
-			text: "This hostname doesn't exist",
-			type: 'error',
-		})
-		return
-	}
-	if (!selectedNodes.value.includes(v)) selectedNodes.value.push(v)
-	nodeInput.value = ''
-}
-
-function removeNode(v: string) {
-	selectedNodes.value = selectedNodes.value.filter((x) => x !== v)
-}
-
-const applyDisabled = computed(() => {
-	if (days.value < 1) return true
-	if (mode.value === 'nodes') return selectedNodes.value.length === 0
-	return !selectedRegion.value
-})
-
-async function ensureOverview() {
-	if (regions.value.length || nodeHostnames.value.length) return
-	try {
-		const data = await useServersFetch<any>('/nodes/overview', { version: 'internal' })
-		regions.value = (data.regions || []).map((r: any) => ({
-			value: r.key,
-			label: `${r.display_name} (${r.key})`,
-		}))
-		nodeHostnames.value = data.node_hostnames || []
-		if (!selectedRegion.value && regions.value.length) selectedRegion.value = regions.value[0].value
-	} catch (err) {
-		addNotification({ title: 'Failed to load nodes overview', text: String(err), type: 'error' })
-	}
-}
-
-async function apply() {
-	try {
-		const body =
-			mode.value === 'nodes'
-				? {
-						nodes: selectedNodes.value.slice(),
-						days: Math.max(1, Math.floor(days.value)),
-						send_email: sendEmail.value,
-						message: message.value?.trim() || DEFAULT_CREDIT_EMAIL_MESSAGE,
-					}
-				: {
-						region: selectedRegion.value!,
-						days: Math.max(1, Math.floor(days.value)),
-						send_email: sendEmail.value,
-						message: message.value?.trim() || DEFAULT_CREDIT_EMAIL_MESSAGE,
-					}
-		await useBaseFetch('billing/credit', {
-			method: 'POST',
-			body: JSON.stringify(body),
-			internal: true,
-		})
-		addNotification({ title: 'Credits applied', type: 'success' })
-		batchModal.value?.hide()
-		selectedNodes.value = []
-		nodeInput.value = ''
-		message.value = ''
-	} catch (err: any) {
-		addNotification({
-			title: 'Error applying credits',
-			text: err?.data?.description ?? String(err),
-			type: 'error',
-		})
-	}
-}
-
-function pluralize(n: number): string {
-	return n === 1 ? '' : 's'
-}
-</script>
-
-<style scoped>
-.page {
-	padding: 1rem;
-	margin-left: auto;
-	margin-right: auto;
-	max-width: 56rem;
-}
-</style>

From 29671347a08f3bb1605ddfa2dae1bd2a1b59769a Mon Sep 17 00:00:00 2001
From: Ksawier Wilczynski <57848442+KsawierWilczynski@users.noreply.github.com>
Date: Wed, 12 Nov 2025 05:43:10 +0000
Subject: [PATCH 50/64] fix: correct parameter name for create function in
 profile helper (#4744)

Co-authored-by: Panyu <48863527+PanyuDev@users.noreply.github.com>
---
 apps/app-frontend/src/helpers/profile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/app-frontend/src/helpers/profile.js b/apps/app-frontend/src/helpers/profile.js
index e3c844d2..7c3f1090 100644
--- a/apps/app-frontend/src/helpers/profile.js
+++ b/apps/app-frontend/src/helpers/profile.js
@@ -18,7 +18,7 @@ import { install_to_existing_profile } from '@/helpers/pack.js'
     - icon is a path to an image file, which will be copied into the profile directory
 */
 
-export async function create(name, gameVersion, modloader, loaderVersion, iconPath, skipInstall) {
+export async function create(name, gameVersion, modloader, loaderVersion, icon, skipInstall) {
 	//Trim string name to avoid "Unable to find directory"
 	name = name.trim()
 	return await invoke('plugin:profile-create|profile_create', {
@@ -26,7 +26,7 @@ export async function create(name, gameVersion, modloader, loaderVersion, iconPa
 		gameVersion,
 		modloader,
 		loaderVersion,
-		iconPath,
+		icon,
 		skipInstall,
 	})
 }

From 590ba3ce55950b16456fec5de6eff3ba72860c47 Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Wed, 12 Nov 2025 19:45:51 +0000
Subject: [PATCH 51/64] fix: original startup settings values not being updated
 with new state we send to server (#4761)

---
 .../src/pages/servers/manage/[id]/options/startup.vue         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue b/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue
index de335035..c9699c2f 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue
@@ -199,6 +199,10 @@ async function saveStartup() {
 				jdkVersionMap.find((v) => v.value === props.server.startup?.jdk_version)?.label || ''
 			jdkBuild.value =
 				jdkBuildMap.find((v) => v.value === props.server.startup?.jdk_build)?.label || ''
+
+			originalInvocation.value = invocation.value
+			originalJdkVersion.value = jdkVersion.value
+			originalJdkBuild.value = jdkBuild.value
 		}
 
 		addNotification({

From 70e2138248b29a29cff12f0e6f46cadcc33eac6b Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Wed, 12 Nov 2025 20:29:12 +0000
Subject: [PATCH 52/64] feat: base api-client impl (#4694)

* feat: base api-client impl

* fix: doc

* feat: start work on module stuff

* feat: migrate v2/v3 projects into module system

* fix: lint & README.md contributing

* refactor: remove utils old api client prototype

* fix: lint

* fix: api url issues

* fix: baseurl in error.vue

* fix: readme

* fix typo in readme

* Update apps/frontend/src/providers/api-client.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Calum H. <hendersoncal117@gmail.com>

* Update packages/api-client/src/features/verbose-logging.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Calum H. <hendersoncal117@gmail.com>

* Update packages/api-client/src/features/retry.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Calum H. <hendersoncal117@gmail.com>

---------

Signed-off-by: Calum H. <hendersoncal117@gmail.com>
Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 apps/frontend/package.json                    |   1 +
 apps/frontend/src/app.vue                     |  29 +-
 apps/frontend/src/error.vue                   |  12 +
 .../[type]/[id]/settings/environment.vue      |   9 +-
 .../pages/[type]/[id]/settings/general.vue    |   7 +-
 .../src/pages/servers/manage/[id].vue         |   2 +-
 apps/frontend/src/providers/api-client.ts     |  42 ++
 packages/api-client/LICENSE                   | 674 ++++++++++++++++++
 packages/api-client/README.md                 | 179 +++++
 packages/api-client/eslint.config.mjs         |   2 +
 packages/api-client/package.json              |  24 +
 .../api-client/src/core/abstract-client.ts    | 310 ++++++++
 .../api-client/src/core/abstract-feature.ts   |  91 +++
 .../api-client/src/core/abstract-module.ts    |  15 +
 packages/api-client/src/core/errors.ts        | 142 ++++
 packages/api-client/src/features/auth.ts      |  89 +++
 .../src/features/circuit-breaker.ts           | 269 +++++++
 packages/api-client/src/features/retry.ts     | 220 ++++++
 .../src/features/verbose-logging.ts           |  30 +
 packages/api-client/src/index.ts              |  21 +
 .../api-client/src/modules/archon/.gitkeep    |   0
 packages/api-client/src/modules/index.ts      | 106 +++
 .../api-client/src/modules/kyros/.gitkeep     |   0
 .../api-client/src/modules/labrinth/index.ts  |   2 +
 .../src/modules/labrinth/projects/types/v2.ts | 115 +++
 .../src/modules/labrinth/projects/types/v3.ts |  54 ++
 .../src/modules/labrinth/projects/v2.ts       | 112 +++
 .../src/modules/labrinth/projects/v3.ts       |  70 ++
 packages/api-client/src/modules/types.ts      |   2 +
 packages/api-client/src/platform/generic.ts   |  51 ++
 packages/api-client/src/platform/nuxt.ts      | 113 +++
 packages/api-client/src/platform/tauri.ts     | 102 +++
 packages/api-client/src/tests/.gitkeep        |   0
 packages/api-client/src/types/client.ts       |  68 ++
 packages/api-client/src/types/errors.ts       |  56 ++
 packages/api-client/src/types/index.ts        |  12 +
 packages/api-client/src/types/request.ts      | 131 ++++
 packages/api-client/tsconfig.json             |   3 +
 packages/tooling-config/eslint/base.mjs       |   2 +-
 packages/ui/src/providers/api.ts              |   5 -
 packages/utils/api/default_impl.ts            |  41 --
 packages/utils/api/index.ts                   |   7 -
 packages/utils/api/projects.ts                |  41 --
 packages/utils/index.ts                       |   1 -
 pnpm-lock.yaml                                |  16 +
 45 files changed, 3155 insertions(+), 123 deletions(-)
 create mode 100644 apps/frontend/src/providers/api-client.ts
 create mode 100644 packages/api-client/LICENSE
 create mode 100644 packages/api-client/README.md
 create mode 100644 packages/api-client/eslint.config.mjs
 create mode 100644 packages/api-client/package.json
 create mode 100644 packages/api-client/src/core/abstract-client.ts
 create mode 100644 packages/api-client/src/core/abstract-feature.ts
 create mode 100644 packages/api-client/src/core/abstract-module.ts
 create mode 100644 packages/api-client/src/core/errors.ts
 create mode 100644 packages/api-client/src/features/auth.ts
 create mode 100644 packages/api-client/src/features/circuit-breaker.ts
 create mode 100644 packages/api-client/src/features/retry.ts
 create mode 100644 packages/api-client/src/features/verbose-logging.ts
 create mode 100644 packages/api-client/src/index.ts
 create mode 100644 packages/api-client/src/modules/archon/.gitkeep
 create mode 100644 packages/api-client/src/modules/index.ts
 create mode 100644 packages/api-client/src/modules/kyros/.gitkeep
 create mode 100644 packages/api-client/src/modules/labrinth/index.ts
 create mode 100644 packages/api-client/src/modules/labrinth/projects/types/v2.ts
 create mode 100644 packages/api-client/src/modules/labrinth/projects/types/v3.ts
 create mode 100644 packages/api-client/src/modules/labrinth/projects/v2.ts
 create mode 100644 packages/api-client/src/modules/labrinth/projects/v3.ts
 create mode 100644 packages/api-client/src/modules/types.ts
 create mode 100644 packages/api-client/src/platform/generic.ts
 create mode 100644 packages/api-client/src/platform/nuxt.ts
 create mode 100644 packages/api-client/src/platform/tauri.ts
 create mode 100644 packages/api-client/src/tests/.gitkeep
 create mode 100644 packages/api-client/src/types/client.ts
 create mode 100644 packages/api-client/src/types/errors.ts
 create mode 100644 packages/api-client/src/types/index.ts
 create mode 100644 packages/api-client/src/types/request.ts
 create mode 100644 packages/api-client/tsconfig.json
 delete mode 100644 packages/ui/src/providers/api.ts
 delete mode 100644 packages/utils/api/default_impl.ts
 delete mode 100644 packages/utils/api/index.ts
 delete mode 100644 packages/utils/api/projects.ts

diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 3e3dca89..c650cdf3 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -43,6 +43,7 @@
 		"@modrinth/moderation": "workspace:*",
 		"@modrinth/ui": "workspace:*",
 		"@modrinth/utils": "workspace:*",
+		"@modrinth/api-client": "workspace:*",
 		"@pinia/nuxt": "^0.5.1",
 		"@types/three": "^0.172.0",
 		"@vintl/vintl": "^4.4.1",
diff --git a/apps/frontend/src/app.vue b/apps/frontend/src/app.vue
index 08c6e15e..5c58f2f2 100644
--- a/apps/frontend/src/app.vue
+++ b/apps/frontend/src/app.vue
@@ -7,30 +7,21 @@
 </template>
 <script setup lang="ts">
 import { NotificationPanel, provideNotificationManager } from '@modrinth/ui'
-import { provideApi } from '@modrinth/ui/src/providers/api.ts'
-import { RestModrinthApi } from '@modrinth/utils'
 
 import ModrinthLoadingIndicator from '~/components/ui/modrinth-loading-indicator.ts'
 
+import { createModrinthClient, provideModrinthClient } from './providers/api-client.ts'
 import { FrontendNotificationManager } from './providers/frontend-notifications.ts'
 
+const auth = await useAuth()
+const config = useRuntimeConfig()
+
 provideNotificationManager(new FrontendNotificationManager())
 
-provideApi(
-	new RestModrinthApi((url: string, options?: object) => {
-		const match = url.match(/^\/v(\d+)\/(.+)$/)
-
-		if (match) {
-			const apiVersion = Number(match[1])
-			const path = match[2]
-
-			return useBaseFetch(path, {
-				...options,
-				apiVersion,
-			}) as Promise<Response>
-		} else {
-			throw new Error('Invalid format')
-		}
-	}),
-)
+const client = createModrinthClient(auth.value, {
+	apiBaseUrl: config.public.apiBaseUrl.replace('/v2/', '/'),
+	archonBaseUrl: config.public.pyroBaseUrl.replace('/v2/', '/'),
+	rateLimitKey: config.rateLimitKey,
+})
+provideModrinthClient(client)
 </script>
diff --git a/apps/frontend/src/error.vue b/apps/frontend/src/error.vue
index 6cd52510..7f345509 100644
--- a/apps/frontend/src/error.vue
+++ b/apps/frontend/src/error.vue
@@ -59,9 +59,21 @@ import { IntlFormatted } from '@vintl/vintl/components'
 import Logo404 from '~/assets/images/404.svg'
 
 import ModrinthLoadingIndicator from './components/ui/modrinth-loading-indicator.ts'
+import { createModrinthClient, provideModrinthClient } from './providers/api-client.ts'
 import { FrontendNotificationManager } from './providers/frontend-notifications.ts'
 
+const auth = await useAuth()
+const config = useRuntimeConfig()
+
 provideNotificationManager(new FrontendNotificationManager())
+
+const client = createModrinthClient(auth.value, {
+	apiBaseUrl: config.public.apiBaseUrl.replace('/v2/', '/'),
+	archonBaseUrl: config.public.pyroBaseUrl.replace('/v2/', '/'),
+	rateLimitKey: config.rateLimitKey,
+})
+provideModrinthClient(client)
+
 const { formatMessage } = useVIntl()
 
 const props = defineProps({
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/environment.vue b/apps/frontend/src/pages/[type]/[id]/settings/environment.vue
index ddba72c3..01054a72 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/environment.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/environment.vue
@@ -9,14 +9,15 @@ import {
 	UnsavedChangesPopup,
 	useSavable,
 } from '@modrinth/ui'
-import { injectApi } from '@modrinth/ui/src/providers/api.ts'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 
+import { injectModrinthClient } from '~/providers/api-client.ts'
+
 const { formatMessage } = useVIntl()
 
 const { currentMember, projectV2, projectV3, refreshProject } = injectProjectPageContext()
 const { handleError } = injectNotificationManager()
-const api = injectApi()
+const client = injectModrinthClient()
 
 const saving = ref(false)
 
@@ -49,8 +50,8 @@ const { saved, current, reset, save } = useSavable(
 	({ environment, side_types_migration_review_status }) => {
 		saving.value = true
 		side_types_migration_review_status = 'reviewed'
-		api.projects
-			.editV3(projectV2.value.id, { environment, side_types_migration_review_status })
+		client.labrinth.projects_v3
+			.edit(projectV2.value.id, { environment, side_types_migration_review_status })
 			.then(() => refreshProject().then(reset))
 			.catch(handleError)
 			.finally(() => (saving.value = false))
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/general.vue b/apps/frontend/src/pages/[type]/[id]/settings/general.vue
index 0367d4a8..00abbe47 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/general.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/general.vue
@@ -7,14 +7,15 @@ import {
 	UnsavedChangesPopup,
 	useSavable,
 } from '@modrinth/ui'
-import { injectApi } from '@modrinth/ui/src/providers/api.ts'
 import { defineMessages, type MessageDescriptor, useVIntl } from '@vintl/vintl'
 
+import { injectModrinthClient } from '~/providers/api-client.ts'
+
 const { formatMessage } = useVIntl()
 
 const { projectV2: project, refreshProject } = injectProjectPageContext()
 const { handleError } = injectNotificationManager()
-const api = injectApi()
+const client = injectModrinthClient()
 
 const saving = ref(false)
 
@@ -34,7 +35,7 @@ const { saved, current, reset, save } = useSavable(
 
 		if (data) {
 			saving.value = true
-			api.projects
+			client.labrinth.projects_v2
 				.edit(project.value.id, { title, description: tagline, slug: url })
 				.then(() => refreshProject().then(reset))
 				.catch(handleError)
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index 5e750616..a6af4bf8 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -1044,7 +1044,7 @@ const nodeUnavailableDetails = computed(() => [
 	{
 		label: 'Node',
 		value:
-			server.moduleErrors?.general?.error.responseData?.hostname ??
+			(server.moduleErrors?.general?.error.responseData as any)?.hostname ??
 			server.general?.datacenter ??
 			'Unknown',
 		type: 'inline' as const,
diff --git a/apps/frontend/src/providers/api-client.ts b/apps/frontend/src/providers/api-client.ts
new file mode 100644
index 00000000..31bcba6c
--- /dev/null
+++ b/apps/frontend/src/providers/api-client.ts
@@ -0,0 +1,42 @@
+import type { AbstractFeature, AuthConfig, NuxtClientConfig } from '@modrinth/api-client'
+import {
+	AuthFeature,
+	CircuitBreakerFeature,
+	NuxtCircuitBreakerStorage,
+	NuxtModrinthClient,
+	VerboseLoggingFeature,
+} from '@modrinth/api-client'
+import { createContext } from '@modrinth/ui'
+
+export function createModrinthClient(
+	auth: { token: string | undefined },
+	config: { apiBaseUrl: string; archonBaseUrl: string; rateLimitKey?: string },
+): NuxtModrinthClient {
+	const optionalFeatures = [
+		import.meta.dev ? (new VerboseLoggingFeature() as AbstractFeature) : undefined,
+	].filter(Boolean) as AbstractFeature[]
+
+	const clientConfig: NuxtClientConfig = {
+		labrinthBaseUrl: config.apiBaseUrl,
+		archonBaseUrl: config.archonBaseUrl,
+		rateLimitKey: config.rateLimitKey,
+		features: [
+			new AuthFeature({
+				token: async () => auth.token,
+			} as AuthConfig),
+			new CircuitBreakerFeature({
+				storage: new NuxtCircuitBreakerStorage(),
+				maxFailures: 3,
+				resetTimeout: 30000,
+			}),
+			...optionalFeatures,
+		],
+	}
+
+	return new NuxtModrinthClient(clientConfig)
+}
+
+export const [injectModrinthClient, provideModrinthClient] = createContext<NuxtModrinthClient>(
+	'root',
+	'modrinthClient',
+)
diff --git a/packages/api-client/LICENSE b/packages/api-client/LICENSE
new file mode 100644
index 00000000..f288702d
--- /dev/null
+++ b/packages/api-client/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/packages/api-client/README.md b/packages/api-client/README.md
new file mode 100644
index 00000000..e69f78a5
--- /dev/null
+++ b/packages/api-client/README.md
@@ -0,0 +1,179 @@
+![Modrinth Monorepo Cover](/.github/assets/monorepo_cover.png)
+
+# @modrinth/api-client
+
+[![TypeScript](https://img.shields.io/badge/TypeScript-5.0+-c78aff?style=for-the-badge)](https://www.typescriptlang.org/)
+[![License: GPL-3.0](https://img.shields.io/badge/License-GPL%203.0-c78aff?style=for-the-badge)](LICENSE)
+
+A flexible, type-safe API client for Modrinth's APIs (Labrinth, Kyros & Archon). Works across Node.js, browsers, Nuxt, and Tauri with a feature system for authentication, retries, circuit breaking and other custom processing of requests and responses.
+
+## Installation
+
+```bash
+pnpm add @modrinth/api-client
+# or
+npm install @modrinth/api-client
+# or
+yarn add @modrinth/api-client
+```
+
+## Usage
+
+### Plain JavaScript/Node.js
+
+```typescript
+import { GenericModrinthClient, AuthFeature, ProjectV2 } from '@modrinth/api-client'
+
+const client = new GenericModrinthClient({
+	userAgent: 'my-app/1.0.0',
+	features: [new AuthFeature({ token: 'mrp_...' })],
+})
+
+// Explicitly make a request using client.request
+const project: any = await client.request('/project/sodium', { api: 'labrinth', version: 2 })
+
+// Example for archon (Modrinth Servers)
+const servers = await client.request('/servers?limit=10', { api: 'archon', version: 0 })
+
+// Or use the provided wrappers for better type support.
+const project: ProjectV2 = await client.projects_v2.get('sodium')
+```
+
+### Nuxt
+
+```typescript
+import { NuxtModrinthClient, AuthFeature, NuxtCircuitBreakerStorage } from '@modrinth/api-client'
+
+// Alternatively you can create a singleton of the client and provide it via DI.
+export const useModrinthClient = () => {
+	const config = useRuntimeConfig()
+
+	// example using the useAuth composable from our frontend, replace this with whatever you're using to store auth token
+	const auth = await useAuth()
+
+	return new NuxtModrinthClient({
+		userAgent: 'my-nuxt-app/1.0.0', // leave blank to use default user agent from fetch function
+		rateLimitKey: import.meta.server ? config.rateLimitKey : undefined,
+		features: [
+			new AuthFeature({
+				token: async () => auth.value.token,
+			}),
+			new CircuitBreakerFeature({
+				storage: new NuxtCircuitBreakerStorage(),
+			}),
+		],
+	})
+}
+
+const client = useModrinthClient()
+const project = await client.request('/project/sodium', { api: 'labrinth', version: 2 })
+```
+
+### Tauri
+
+```typescript
+import { TauriModrinthClient, AuthFeature } from '@modrinth/api-client'
+import { getVersion } from '@tauri-apps/api/app'
+
+const version = await getVersion()
+const client = new TauriModrinthClient({
+	userAgent: `modrinth/theseus/${version} (support@modrinth.com)`,
+	features: [new AuthFeature({ token: 'mrp_...' })],
+})
+
+const project = await client.request('/project/sodium', { api: 'labrinth', version: 2 })
+```
+
+### Overriding Base URLs
+
+By default, the client uses the production base URLs:
+
+- `labrinthBaseUrl`: `https://api.modrinth.com/` (Labrinth API)
+- `archonBaseUrl`: `https://archon.modrinth.com/` (Archon/Servers API)
+
+You can override these for staging environments or custom instances:
+
+```typescript
+const client = new GenericModrinthClient({
+	userAgent: 'my-app/1.0.0',
+	labrinthBaseUrl: 'https://staging-api.modrinth.com/',
+	archonBaseUrl: 'https://staging-archon.modrinth.com/',
+	features: [new AuthFeature({ token: 'mrp_...' })],
+})
+
+// Now requests will use the staging URLs
+await client.request('/project/sodium', { api: 'labrinth', version: 2 })
+// -> https://staging-api.modrinth.com/v2/project/sodium
+```
+
+You can also use custom URLs directly in requests:
+
+```typescript
+// One-off custom URL (useful for Kyros nodes or dynamic endpoints)
+await client.request('/some-endpoint', {
+	api: 'https://eu-lim16.nodes.modrinth.com/',
+	version: 0,
+})
+```
+
+## Features
+
+### Authentication
+
+Supports both static and dynamic tokens:
+
+```typescript
+// Static token
+new AuthFeature({ token: 'mrp_...' })
+
+// Dynamic token (e.g., from auth state)
+const auth = await useAuth()
+new AuthFeature({
+	token: async () => auth.value.token,
+})
+```
+
+### Retry
+
+Automatically retries failed requests with configurable backoff:
+
+```typescript
+new RetryFeature({
+	maxAttempts: 3,
+	backoffStrategy: 'exponential',
+	initialDelay: 1000,
+	maxDelay: 15000,
+})
+```
+
+### Circuit Breaker
+
+Prevents cascade failures by opening circuits after repeated failures:
+
+```typescript
+new CircuitBreakerFeature({
+	maxFailures: 3,
+	resetTimeout: 30000,
+	failureStatusCodes: [500, 502, 503, 504],
+})
+```
+
+## Documentation
+
+This package is **self-documenting** through TypeScript types and JSDoc comments. Use your IDE's IntelliSense to explore available methods, classes, and configuration options.
+
+For Modrinth API endpoints and routes, refer to the [Modrinth API Documentation](https://docs.modrinth.com).
+
+## Contributing
+
+- Modules are available in the `modules/<api>/...` folders.
+  - When a module has different versions available, you should do it like so: `modules/labrinth/projects/v2.ts` etc.
+  - Types for a module's requests should be made available in `modules/<api>/module/types.ts` or `.../types/v2.ts`.
+  - You should expose these types in the `modules/types.ts` file.
+- When creating a new module, add it to the `modules/index.ts`'s `MODULE_REGISTRY` for it to become available in the api client class.
+
+Dont forget to run `pnpm fix` before committing.
+
+## License
+
+Licensed under GPL-3.0 - see the [LICENSE](LICENSE) file for details.
diff --git a/packages/api-client/eslint.config.mjs b/packages/api-client/eslint.config.mjs
new file mode 100644
index 00000000..3d6da7fb
--- /dev/null
+++ b/packages/api-client/eslint.config.mjs
@@ -0,0 +1,2 @@
+import config from '@modrinth/tooling-config/eslint/nuxt.mjs'
+export default config
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
new file mode 100644
index 00000000..ecf17087
--- /dev/null
+++ b/packages/api-client/package.json
@@ -0,0 +1,24 @@
+{
+	"name": "@modrinth/api-client",
+	"version": "0.1.0",
+	"description": "An API client for Modrinth's API for use in nuxt, tauri and plain node/browser environments.",
+	"main": "./src/index.ts",
+	"scripts": {
+		"lint": "eslint . && prettier --check .",
+		"fix": "eslint . --fix && prettier --write ."
+	},
+	"dependencies": {
+		"ofetch": "^1.4.1"
+	},
+	"devDependencies": {
+		"@modrinth/tooling-config": "workspace:*"
+	},
+	"peerDependencies": {
+		"@tauri-apps/plugin-http": "^2.0.0"
+	},
+	"peerDependenciesMeta": {
+		"@tauri-apps/plugin-http": {
+			"optional": true
+		}
+	}
+}
diff --git a/packages/api-client/src/core/abstract-client.ts b/packages/api-client/src/core/abstract-client.ts
new file mode 100644
index 00000000..12e3c347
--- /dev/null
+++ b/packages/api-client/src/core/abstract-client.ts
@@ -0,0 +1,310 @@
+import type { InferredClientModules } from '../modules'
+import { buildModuleStructure } from '../modules'
+import type { ClientConfig } from '../types/client'
+import type { RequestContext, RequestOptions } from '../types/request'
+import type { AbstractFeature } from './abstract-feature'
+import type { AbstractModule } from './abstract-module'
+import { ModrinthApiError, ModrinthServerError } from './errors'
+
+/**
+ * Abstract base client for Modrinth APIs
+ */
+export abstract class AbstractModrinthClient {
+	protected config: ClientConfig
+	protected features: AbstractFeature[]
+
+	/**
+	 * Maps full module ID (e.g., 'labrinth_projects_v2') to instantiated module
+	 */
+	private _moduleInstances: Map<string, AbstractModule> = new Map()
+
+	/**
+	 * Maps API name (e.g., 'labrinth') to namespace object
+	 */
+	private _moduleNamespaces: Map<string, Record<string, AbstractModule>> = new Map()
+
+	// TODO: When adding kyros/archon add readonly fields for those too.
+	public readonly labrinth!: InferredClientModules['labrinth']
+
+	constructor(config: ClientConfig) {
+		this.config = {
+			timeout: 10000,
+			labrinthBaseUrl: 'https://api.modrinth.com',
+			archonBaseUrl: 'https://archon.modrinth.com',
+			...config,
+		}
+		this.features = config.features ?? []
+		this.initializeModules()
+	}
+
+	/**
+	 * This creates the nested API structure (e.g., client.labrinth.projects_v2)
+	 * but doesn't instantiate modules until first access
+	 *
+	 * Module IDs in the registry are validated at runtime to ensure they match
+	 * what the module declares via getModuleID().
+	 */
+	private initializeModules(): void {
+		const structure = buildModuleStructure()
+
+		for (const [api, modules] of Object.entries(structure)) {
+			const namespaceObj: Record<string, AbstractModule> = {}
+
+			// Define lazy getters for each module
+			for (const [moduleName, ModuleConstructor] of Object.entries(modules)) {
+				const fullModuleId = `${api}_${moduleName}`
+
+				Object.defineProperty(namespaceObj, moduleName, {
+					get: () => {
+						// Lazy instantiation
+						if (!this._moduleInstances.has(fullModuleId)) {
+							const instance = new ModuleConstructor(this)
+
+							// Validate the module ID matches what we expect
+							const declaredId = instance.getModuleID()
+							if (declaredId !== fullModuleId) {
+								throw new Error(
+									`Module ID mismatch: registry expects "${fullModuleId}" but module declares "${declaredId}"`,
+								)
+							}
+
+							this._moduleInstances.set(fullModuleId, instance)
+						}
+						return this._moduleInstances.get(fullModuleId)!
+					},
+					enumerable: true,
+					configurable: false,
+				})
+			}
+
+			// Assign namespace to client (e.g., this.labrinth = namespaceObj)
+			// defineProperty bypasses readonly restriction
+			Object.defineProperty(this, api, {
+				value: namespaceObj,
+				writable: false,
+				enumerable: true,
+				configurable: false,
+			})
+
+			this._moduleNamespaces.set(api, namespaceObj)
+		}
+	}
+
+	/**
+	 * Make a request to the API
+	 *
+	 * @param path - API path (e.g., '/project/sodium')
+	 * @param options - Request options
+	 * @returns Promise resolving to the response data
+	 * @throws {ModrinthApiError} When the request fails or features throw errors
+	 */
+	async request<T>(path: string, options: RequestOptions): Promise<T> {
+		let baseUrl: string
+		if (options.api === 'labrinth') {
+			baseUrl = this.config.labrinthBaseUrl!
+		} else if (options.api === 'archon') {
+			baseUrl = this.config.archonBaseUrl!
+		} else {
+			baseUrl = options.api
+		}
+
+		const url = this.buildUrl(path, baseUrl, options.version)
+
+		// Merge options with defaults
+		const mergedOptions: RequestOptions = {
+			method: 'GET',
+			timeout: this.config.timeout,
+			...options,
+			headers: {
+				...this.buildDefaultHeaders(),
+				...options.headers,
+			},
+		}
+
+		const context = this.buildContext(url, path, mergedOptions)
+
+		try {
+			const result = await this.executeFeatureChain<T>(context)
+
+			await this.config.hooks?.onResponse?.(result, context)
+
+			return result
+		} catch (error) {
+			const apiError = this.normalizeError(error, context)
+			await this.config.hooks?.onError?.(apiError, context)
+
+			throw apiError
+		}
+	}
+
+	/**
+	 * Execute the feature chain and the actual request
+	 *
+	 * Features are executed in order, with each feature calling next() to continue.
+	 * The last "feature" in the chain is the actual request execution.
+	 */
+	protected async executeFeatureChain<T>(context: RequestContext): Promise<T> {
+		// Filter to only features that should apply
+		const applicableFeatures = this.features.filter((feature) => feature.shouldApply(context))
+
+		// Build the feature chain
+		// We work backwards from the actual request, wrapping each feature around the previous
+		let index = applicableFeatures.length
+
+		const next = async (): Promise<T> => {
+			index--
+
+			if (index >= 0) {
+				// Execute the next feature in the chain
+				const feature = applicableFeatures[index]
+				return feature.execute(next, context)
+			} else {
+				// We've reached the end of the chain, execute the actual request
+				await this.config.hooks?.onRequest?.(context)
+				return this.executeRequest<T>(context.url, context.options)
+			}
+		}
+
+		return next()
+	}
+
+	/**
+	 * Build the full URL for a request
+	 */
+	protected buildUrl(path: string, baseUrl: string, version: number | 'internal'): string {
+		// Remove trailing slash from base URL
+		const base = baseUrl.replace(/\/$/, '')
+
+		// Build version path
+		let versionPath = ''
+		if (version === 'internal') {
+			versionPath = '/_internal'
+		} else if (typeof version === 'number') {
+			versionPath = `/v${version}`
+		}
+
+		const cleanPath = path.startsWith('/') ? path : `/${path}`
+
+		return `${base}${versionPath}${cleanPath}`
+	}
+
+	/**
+	 * Build the request context
+	 */
+	protected buildContext(url: string, path: string, options: RequestOptions): RequestContext {
+		return {
+			url,
+			path,
+			options,
+			attempt: 1,
+			startTime: Date.now(),
+		}
+	}
+
+	/**
+	 * Build default headers for all requests
+	 *
+	 * Subclasses can override this to add platform-specific headers
+	 * (e.g., Nuxt rate limit key)
+	 */
+	protected buildDefaultHeaders(): Record<string, string> {
+		const headers: Record<string, string> = {
+			'Content-Type': 'application/json',
+			...this.config.headers,
+		}
+
+		if (this.config.userAgent) {
+			headers['User-Agent'] = this.config.userAgent
+		}
+
+		return headers
+	}
+
+	/**
+	 * Execute the actual HTTP request
+	 *
+	 * This must be implemented by platform-specific clients.
+	 *
+	 * @param url - Full URL to request
+	 * @param options - Request options
+	 * @returns Promise resolving to the response data
+	 * @throws {Error} Platform-specific errors that will be normalized by normalizeError()
+	 */
+	protected abstract executeRequest<T>(url: string, options: RequestOptions): Promise<T>
+
+	/**
+	 * Normalize an error into a ModrinthApiError
+	 *
+	 * Platform implementations should override this to handle platform-specific errors
+	 * (e.g., FetchError from ofetch, Tauri HTTP errors)
+	 */
+	protected normalizeError(error: unknown, context?: RequestContext): ModrinthApiError {
+		if (error instanceof ModrinthApiError) {
+			return error
+		}
+
+		return ModrinthApiError.fromUnknown(error, context?.path)
+	}
+
+	/**
+	 * Helper to create a normalized error from extracted status code and response data
+	 */
+	protected createNormalizedError(
+		error: Error,
+		statusCode: number | undefined,
+		responseData: unknown,
+	): ModrinthApiError {
+		if (statusCode && responseData) {
+			return ModrinthServerError.fromResponse(statusCode, responseData)
+		}
+
+		return new ModrinthApiError(error.message, {
+			statusCode,
+			originalError: error,
+			responseData,
+		})
+	}
+
+	/**
+	 * Add a feature to this client
+	 *
+	 * Features are executed in the order they are added.
+	 *
+	 * @example
+	 * ```typescript
+	 * const client = new GenericModrinthClient()
+	 * client.addFeature(new AuthFeature({ token: 'mrp_...' }))
+	 * client.addFeature(new RetryFeature({ maxAttempts: 3 }))
+	 * ```
+	 */
+	addFeature(feature: AbstractFeature): this {
+		this.features.push(feature)
+		return this
+	}
+
+	/**
+	 * Remove a feature from this client
+	 *
+	 * @example
+	 * ```typescript
+	 * const retryFeature = new RetryFeature({ maxAttempts: 3 })
+	 * client.addFeature(retryFeature)
+	 * // Later, remove it
+	 * client.removeFeature(retryFeature)
+	 * ```
+	 */
+	removeFeature(feature: AbstractFeature): this {
+		const index = this.features.indexOf(feature)
+		if (index !== -1) {
+			this.features.splice(index, 1)
+		}
+		return this
+	}
+
+	/**
+	 * Get all features on this client
+	 */
+	getFeatures(): AbstractFeature[] {
+		return [...this.features]
+	}
+}
diff --git a/packages/api-client/src/core/abstract-feature.ts b/packages/api-client/src/core/abstract-feature.ts
new file mode 100644
index 00000000..c324d4a5
--- /dev/null
+++ b/packages/api-client/src/core/abstract-feature.ts
@@ -0,0 +1,91 @@
+import type { RequestContext } from '../types/request'
+
+/**
+ * Base configuration for features
+ */
+export interface FeatureConfig {
+	/**
+	 * Optional name for this feature (for debugging)
+	 */
+	name?: string
+
+	/**
+	 * Whether this feature is enabled
+	 * @default true
+	 */
+	enabled?: boolean
+}
+
+/**
+ * Abstract base class for request features
+ *
+ * Features are composable middleware that can intercept and modify requests.
+ * They are executed in a chain, with each feature calling next() to continue the chain.
+ */
+export abstract class AbstractFeature {
+	protected config: FeatureConfig
+
+	constructor(config?: FeatureConfig) {
+		this.config = {
+			enabled: true,
+			...config,
+		}
+	}
+
+	/**
+	 * Execute the feature logic
+	 *
+	 * @param next - Function to call the next feature in the chain (or the actual request)
+	 * @param context - Full request context
+	 * @returns Promise resolving to the response data
+	 *
+	 * @example
+	 * ```typescript
+	 * async execute<T>(next: () => Promise<T>, context: RequestContext): Promise<T> {
+	 *   // Do something before request
+	 *   console.log('Before request:', context.url)
+	 *
+	 *   try {
+	 *     const result = await next()
+	 *
+	 *     // Do something after successful request
+	 *     console.log('Request succeeded')
+	 *
+	 *     return result
+	 *   } catch (error) {
+	 *     // Handle errors
+	 *     console.error('Request failed:', error)
+	 *     throw error
+	 *   }
+	 * }
+	 * ```
+	 */
+	abstract execute<T>(next: () => Promise<T>, context: RequestContext): Promise<T>
+
+	/**
+	 * Determine if this feature should apply to the given request
+	 *
+	 * By default, features apply if they are enabled.
+	 * Override this to add custom logic (e.g., only apply to GET requests).
+	 *
+	 * @param context - Request context
+	 * @returns true if the feature should execute, false to skip
+	 */
+	shouldApply(_context: RequestContext): boolean {
+		return this.config.enabled !== false
+	}
+
+	/**
+	 * Get the name of this feature (for debugging)
+	 */
+	get name(): string {
+		return this.config.name ?? this.constructor.name
+	}
+
+	/**
+	 * Check if this feature is enabled
+	 */
+	get enabled(): boolean {
+		return this.config.enabled !== false
+	}
+}
diff --git a/packages/api-client/src/core/abstract-module.ts b/packages/api-client/src/core/abstract-module.ts
new file mode 100644
index 00000000..f0a8fa8c
--- /dev/null
+++ b/packages/api-client/src/core/abstract-module.ts
@@ -0,0 +1,15 @@
+import type { AbstractModrinthClient } from './abstract-client'
+
+export abstract class AbstractModule {
+	protected client: AbstractModrinthClient
+
+	public constructor(client: AbstractModrinthClient) {
+		this.client = client
+	}
+
+	/**
+	 * Get the module's name, used for error reporting & for module field generation.
+	 * @returns Module name
+	 */
+	public abstract getModuleID(): string
+}
diff --git a/packages/api-client/src/core/errors.ts b/packages/api-client/src/core/errors.ts
new file mode 100644
index 00000000..6b958eb4
--- /dev/null
+++ b/packages/api-client/src/core/errors.ts
@@ -0,0 +1,142 @@
+import type { ApiErrorData, ModrinthErrorResponse } from '../types/errors'
+import { isModrinthErrorResponse } from '../types/errors'
+
+/**
+ * Base error class for all Modrinth API errors
+ */
+export class ModrinthApiError extends Error {
+	/**
+	 * HTTP status code (if available)
+	 */
+	readonly statusCode?: number
+
+	/**
+	 * Original error that was caught
+	 */
+	readonly originalError?: Error
+
+	/**
+	 * Response data from the API (if available)
+	 */
+	readonly responseData?: unknown
+
+	/**
+	 * Error context (e.g., module name, operation being performed)
+	 */
+	readonly context?: string
+
+	constructor(message: string, data?: ApiErrorData) {
+		super(message)
+		this.name = 'ModrinthApiError'
+
+		this.statusCode = data?.statusCode
+		this.originalError = data?.originalError
+		this.responseData = data?.responseData
+		this.context = data?.context
+
+		// Maintains proper stack trace for where our error was thrown (only available on V8)
+		if (Error.captureStackTrace) {
+			Error.captureStackTrace(this, ModrinthApiError)
+		}
+	}
+
+	/**
+	 * Create a ModrinthApiError from an unknown error
+	 */
+	static fromUnknown(error: unknown, context?: string): ModrinthApiError {
+		if (error instanceof ModrinthApiError) {
+			return error
+		}
+
+		if (error instanceof Error) {
+			return new ModrinthApiError(error.message, {
+				originalError: error,
+				context,
+			})
+		}
+
+		return new ModrinthApiError(String(error), { context })
+	}
+}
+
+/**
+ * Error class for Modrinth server errors (kyros/archon)
+ * Extends ModrinthApiError with V1 error response parsing
+ */
+export class ModrinthServerError extends ModrinthApiError {
+	/**
+	 * V1 error information (if available)
+	 */
+	readonly v1Error?: ModrinthErrorResponse
+
+	constructor(message: string, data?: ApiErrorData & { v1Error?: ModrinthErrorResponse }) {
+		// If we have a V1 error, format the message nicely
+		let errorMessage = message
+		if (data?.v1Error) {
+			errorMessage = `[${data.v1Error.error}] ${data.v1Error.description}`
+			if (data.v1Error.context) {
+				errorMessage = `${data.v1Error.context}: ${errorMessage}`
+			}
+		}
+
+		super(errorMessage, data)
+		this.name = 'ModrinthServerError'
+		this.v1Error = data?.v1Error
+
+		if (Error.captureStackTrace) {
+			Error.captureStackTrace(this, ModrinthServerError)
+		}
+	}
+
+	/**
+	 * Create a ModrinthServerError from response data
+	 */
+	static fromResponse(
+		statusCode: number,
+		responseData: unknown,
+		context?: string,
+	): ModrinthServerError {
+		const v1Error = isModrinthErrorResponse(responseData) ? responseData : undefined
+
+		let message = `HTTP ${statusCode}`
+		if (v1Error) {
+			message = v1Error.description
+		} else if (typeof responseData === 'string') {
+			message = responseData
+		}
+
+		return new ModrinthServerError(message, {
+			statusCode,
+			responseData,
+			context,
+			v1Error,
+		})
+	}
+
+	/**
+	 * Create a ModrinthServerError from an unknown error
+	 */
+	static fromUnknown(error: unknown, context?: string): ModrinthServerError {
+		if (error instanceof ModrinthServerError) {
+			return error
+		}
+
+		if (error instanceof ModrinthApiError) {
+			return new ModrinthServerError(error.message, {
+				statusCode: error.statusCode,
+				originalError: error.originalError,
+				responseData: error.responseData,
+				context: context ?? error.context,
+			})
+		}
+
+		if (error instanceof Error) {
+			return new ModrinthServerError(error.message, {
+				originalError: error,
+				context,
+			})
+		}
+
+		return new ModrinthServerError(String(error), { context })
+	}
+}
diff --git a/packages/api-client/src/features/auth.ts b/packages/api-client/src/features/auth.ts
new file mode 100644
index 00000000..2b075cc6
--- /dev/null
+++ b/packages/api-client/src/features/auth.ts
@@ -0,0 +1,89 @@
+import { AbstractFeature, type FeatureConfig } from '../core/abstract-feature'
+import type { RequestContext } from '../types/request'
+
+/**
+ * Authentication feature configuration
+ */
+export interface AuthConfig extends FeatureConfig {
+	/**
+	 * Authentication token
+	 * - string: static token
+	 * - function: async function that returns token (useful for dynamic tokens)
+	 */
+	token: string | (() => Promise<string | undefined>)
+
+	/**
+	 * Token prefix (e.g., 'Bearer', 'Token')
+	 * @default 'Bearer'
+	 */
+	tokenPrefix?: string
+
+	/**
+	 * Custom header name for the token
+	 * @default 'Authorization'
+	 */
+	headerName?: string
+}
+
+/**
+ * Authentication feature
+ *
+ * Automatically injects authentication tokens into request headers.
+ * Supports both static tokens and dynamic token providers.
+ *
+ * @example
+ * ```typescript
+ * // Static token
+ * const auth = new AuthFeature({
+ *   token: 'mrp_...'
+ * })
+ *
+ * // Dynamic token (e.g., from auth state)
+ * const auth = new AuthFeature({
+ *   token: async () => await getAuthToken()
+ * })
+ * ```
+ */
+export class AuthFeature extends AbstractFeature {
+	protected declare config: AuthConfig
+
+	async execute<T>(next: () => Promise<T>, context: RequestContext): Promise<T> {
+		const token = await this.getToken()
+
+		if (token) {
+			const headerName = this.config.headerName ?? 'Authorization'
+			const tokenPrefix = this.config.tokenPrefix ?? 'Bearer'
+			const headerValue = tokenPrefix ? `${tokenPrefix} ${token}` : token
+
+			context.options.headers = {
+				...context.options.headers,
+				[headerName]: headerValue,
+			}
+		}
+
+		return next()
+	}
+
+	shouldApply(context: RequestContext): boolean {
+		if (context.options.skipAuth) {
+			return false
+		}
+
+		return super.shouldApply(context)
+	}
+
+	/**
+	 * Get the authentication token
+	 *
+	 * Handles both static tokens and async token providers
+	 */
+	private async getToken(): Promise<string | undefined> {
+		const { token } = this.config
+
+		if (typeof token === 'function') {
+			return await token()
+		}
+
+		return token
+	}
+}
diff --git a/packages/api-client/src/features/circuit-breaker.ts b/packages/api-client/src/features/circuit-breaker.ts
new file mode 100644
index 00000000..2f850ff0
--- /dev/null
+++ b/packages/api-client/src/features/circuit-breaker.ts
@@ -0,0 +1,269 @@
+import { AbstractFeature, type FeatureConfig } from '../core/abstract-feature'
+import { ModrinthApiError } from '../core/errors'
+import type { RequestContext } from '../types/request'
+
+/**
+ * Circuit breaker state
+ */
+export type CircuitBreakerState = {
+	/**
+	 * Number of consecutive failures
+	 */
+	failures: number
+
+	/**
+	 * Timestamp of last failure
+	 */
+	lastFailure: number
+}
+
+/**
+ * Circuit breaker storage interface
+ */
+export interface CircuitBreakerStorage {
+	/**
+	 * Get circuit breaker state for a key
+	 */
+	get(key: string): CircuitBreakerState | undefined
+
+	/**
+	 * Set circuit breaker state for a key
+	 */
+	set(key: string, state: CircuitBreakerState): void
+
+	/**
+	 * Clear circuit breaker state for a key
+	 */
+	clear?(key: string): void
+}
+
+/**
+ * Circuit breaker feature configuration
+ */
+export interface CircuitBreakerConfig extends FeatureConfig {
+	/**
+	 * Maximum number of consecutive failures before opening circuit
+	 * @default 3
+	 */
+	maxFailures?: number
+
+	/**
+	 * Time in milliseconds before circuit resets after opening
+	 * @default 30000
+	 */
+	resetTimeout?: number
+
+	/**
+	 * HTTP status codes that count as failures
+	 * @default [500, 502, 503, 504]
+	 */
+	failureStatusCodes?: number[]
+
+	/**
+	 * Storage implementation for circuit state
+	 * If not provided, uses in-memory Map
+	 */
+	storage?: CircuitBreakerStorage
+
+	/**
+	 * Function to generate circuit key from request context
+	 * By default, uses the base path (without query params)
+	 */
+	getCircuitKey?: (url: string, method: string) => string
+}
+
+/**
+ * In-memory storage for circuit breaker state
+ */
+export class InMemoryCircuitBreakerStorage implements CircuitBreakerStorage {
+	private state = new Map<string, CircuitBreakerState>()
+
+	get(key: string): CircuitBreakerState | undefined {
+		return this.state.get(key)
+	}
+
+	set(key: string, state: CircuitBreakerState): void {
+		this.state.set(key, state)
+	}
+
+	clear(key: string): void {
+		this.state.delete(key)
+	}
+}
+
+/**
+ * Circuit breaker feature
+ *
+ * Prevents requests to failing endpoints by "opening the circuit" after
+ * a threshold of consecutive failures. The circuit automatically resets
+ * after a timeout period.
+ *
+ * This implements the circuit breaker pattern to prevent cascading failures
+ * and give failing services time to recover.
+ *
+ * @example
+ * ```typescript
+ * const circuitBreaker = new CircuitBreakerFeature({
+ *   maxFailures: 3,
+ *   resetTimeout: 30000, // 30 seconds
+ *   failureStatusCodes: [500, 502, 503, 504]
+ * })
+ * ```
+ */
+export class CircuitBreakerFeature extends AbstractFeature {
+	protected declare config: Required<CircuitBreakerConfig>
+	private storage: CircuitBreakerStorage
+
+	constructor(config?: CircuitBreakerConfig) {
+		super(config)
+
+		this.config = {
+			enabled: true,
+			name: 'circuit-breaker',
+			maxFailures: 3,
+			resetTimeout: 30000,
+			failureStatusCodes: [500, 502, 503, 504],
+			...config,
+		} as Required<CircuitBreakerConfig>
+
+		// Use provided storage or default to in-memory
+		this.storage = config?.storage ?? new InMemoryCircuitBreakerStorage()
+	}
+
+	async execute<T>(next: () => Promise<T>, context: RequestContext): Promise<T> {
+		const circuitKey = this.getCircuitKey(context)
+
+		if (this.isCircuitOpen(circuitKey)) {
+			throw new ModrinthApiError('Circuit breaker open - too many recent failures', {
+				statusCode: 503,
+				context: context.path,
+			})
+		}
+
+		try {
+			const result = await next()
+
+			this.recordSuccess(circuitKey)
+
+			return result
+		} catch (error) {
+			if (this.isFailureError(error)) {
+				this.recordFailure(circuitKey)
+			}
+
+			throw error
+		}
+	}
+
+	shouldApply(context: RequestContext): boolean {
+		if (context.options.circuitBreaker === false) {
+			return false
+		}
+
+		return super.shouldApply(context)
+	}
+
+	/**
+	 * Get the circuit key for a request
+	 *
+	 * By default, uses the path and method to identify unique circuits
+	 */
+	private getCircuitKey(context: RequestContext): string {
+		if (this.config.getCircuitKey) {
+			return this.config.getCircuitKey(context.url, context.options.method ?? 'GET')
+		}
+
+		// Default: use method + path (without query params)
+		const method = context.options.method ?? 'GET'
+		const pathWithoutQuery = context.path.split('?')[0]
+
+		return `${method}_${pathWithoutQuery}`
+	}
+
+	/**
+	 * Check if the circuit is open for a given key
+	 */
+	private isCircuitOpen(key: string): boolean {
+		const state = this.storage.get(key)
+
+		if (!state) {
+			return false
+		}
+
+		const now = Date.now()
+		const timeSinceLastFailure = now - state.lastFailure
+
+		if (timeSinceLastFailure > this.config.resetTimeout) {
+			this.storage.clear?.(key)
+			return false
+		}
+
+		return state.failures >= this.config.maxFailures
+	}
+
+	/**
+	 * Record a successful request
+	 */
+	private recordSuccess(key: string): void {
+		this.storage.clear?.(key)
+	}
+
+	/**
+	 * Record a failed request
+	 */
+	private recordFailure(key: string): void {
+		const now = Date.now()
+		const state = this.storage.get(key)
+
+		if (!state) {
+			// First failure
+			this.storage.set(key, {
+				failures: 1,
+				lastFailure: now,
+			})
+		} else {
+			// Subsequent failure
+			this.storage.set(key, {
+				failures: state.failures + 1,
+				lastFailure: now,
+			})
+		}
+	}
+
+	/**
+	 * Determine if an error should count as a circuit failure
+	 */
+	private isFailureError(error: unknown): boolean {
+		if (error instanceof ModrinthApiError && error.statusCode) {
+			return this.config.failureStatusCodes.includes(error.statusCode)
+		}
+
+		return false
+	}
+
+	/**
+	 * Get current circuit state for debugging
+	 *
+	 * @example
+	 * ```typescript
+	 * const state = circuitBreaker.getCircuitState('GET_/v2/project/sodium')
+	 * console.log(`Failures: ${state?.failures}, Last failure: ${state?.lastFailure}`)
+	 * ```
+	 */
+	getCircuitState(key: string): CircuitBreakerState | undefined {
+		return this.storage.get(key)
+	}
+
+	/**
+	 * Manually reset a circuit
+	 *
+	 * @example
+	 * ```typescript
+	 * // Reset circuit after manual intervention
+	 * circuitBreaker.resetCircuit('GET_/v2/project/sodium')
+	 * ```
+	 */
+	resetCircuit(key: string): void {
+		this.storage.clear?.(key)
+	}
+}
diff --git a/packages/api-client/src/features/retry.ts b/packages/api-client/src/features/retry.ts
new file mode 100644
index 00000000..223d01d9
--- /dev/null
+++ b/packages/api-client/src/features/retry.ts
@@ -0,0 +1,220 @@
+import { AbstractFeature, type FeatureConfig } from '../core/abstract-feature'
+import { ModrinthApiError } from '../core/errors'
+import type { RequestContext } from '../types/request'
+
+/**
+ * Backoff strategy for retries
+ */
+export type BackoffStrategy = 'exponential' | 'linear' | 'constant'
+
+/**
+ * Retry feature configuration
+ */
+export interface RetryConfig extends FeatureConfig {
+	/**
+	 * Maximum number of retry attempts
+	 * @default 3
+	 */
+	maxAttempts?: number
+
+	/**
+	 * Backoff strategy to use
+	 * @default 'exponential'
+	 */
+	backoffStrategy?: BackoffStrategy
+
+	/**
+	 * Initial delay in milliseconds before first retry
+	 * @default 1000
+	 */
+	initialDelay?: number
+
+	/**
+	 * Maximum delay in milliseconds between retries
+	 * @default 15000
+	 */
+	maxDelay?: number
+
+	/**
+	 * HTTP status codes that should trigger a retry
+	 * @default [408, 429, 500, 502, 503, 504]
+	 */
+	retryableStatusCodes?: number[]
+
+	/**
+	 * Whether to retry on network errors (connection refused, timeout, etc.)
+	 * @default true
+	 */
+	retryOnNetworkError?: boolean
+
+	/**
+	 * Custom function to determine if an error should be retried
+	 */
+	shouldRetry?: (error: unknown, attempt: number) => boolean
+}
+
+/**
+ * Retry feature
+ *
+ * Automatically retries failed requests with configurable backoff strategy.
+ * Only retries errors that are likely to succeed on retry (e.g., timeout, 5xx errors).
+ *
+ * @example
+ * ```typescript
+ * const retry = new RetryFeature({
+ *   maxAttempts: 3,
+ *   backoffStrategy: 'exponential',
+ *   initialDelay: 1000,
+ *   maxDelay: 15000
+ * })
+ * ```
+ */
+export class RetryFeature extends AbstractFeature {
+	protected declare config: Required<RetryConfig>
+
+	constructor(config?: RetryConfig) {
+		super(config)
+
+		this.config = {
+			enabled: true,
+			name: 'retry',
+			maxAttempts: 3,
+			backoffStrategy: 'exponential',
+			initialDelay: 1000,
+			maxDelay: 15000,
+			retryableStatusCodes: [408, 429, 500, 502, 503, 504],
+			retryOnNetworkError: true,
+			...config,
+		} as Required<RetryConfig>
+	}
+
+	async execute<T>(next: () => Promise<T>, context: RequestContext): Promise<T> {
+		let lastError: Error | null = null
+		const maxAttempts = this.getMaxAttempts(context)
+
+		for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+			context.attempt = attempt
+
+			try {
+				const result = await next()
+				return result
+			} catch (error) {
+				lastError = error as Error
+
+				const shouldRetry = this.shouldRetryError(error, attempt, maxAttempts)
+
+				if (!shouldRetry || attempt >= maxAttempts) {
+					throw error
+				}
+
+				const delay = this.calculateDelay(attempt)
+
+				console.warn(
+					`[${this.name}] Retrying request to ${context.path} (attempt ${attempt + 1}/${maxAttempts}) after ${delay}ms`,
+				)
+
+				await this.sleep(delay)
+			}
+		}
+
+		// This shouldn't be reached, but TypeScript requires it
+		throw lastError ?? new Error('Max retry attempts reached')
+	}
+
+	shouldApply(context: RequestContext): boolean {
+		if (context.options.retry === false) {
+			return false
+		}
+
+		return super.shouldApply(context)
+	}
+
+	/**
+	 * Determine if an error should be retried
+	 */
+	private shouldRetryError(error: unknown, attempt: number, _maxAttempts: number): boolean {
+		if (this.config.shouldRetry) {
+			return this.config.shouldRetry(error, attempt)
+		}
+
+		if (this.config.retryOnNetworkError && this.isNetworkError(error)) {
+			return true
+		}
+
+		if (error instanceof ModrinthApiError && error.statusCode) {
+			return this.config.retryableStatusCodes.includes(error.statusCode)
+		}
+
+		return false
+	}
+
+	/**
+	 * Check if an error is a network error
+	 */
+	private isNetworkError(error: unknown): boolean {
+		// Common network error indicators
+		const networkErrorPatterns = [
+			/network/i,
+			/timeout/i,
+			/ECONNREFUSED/i,
+			/ENOTFOUND/i,
+			/ETIMEDOUT/i,
+			/ECONNRESET/i,
+		]
+
+		const errorMessage = error instanceof Error ? error.message : String(error)
+		return networkErrorPatterns.some((pattern) => pattern.test(errorMessage))
+	}
+
+	/**
+	 * Get max attempts for this request
+	 */
+	private getMaxAttempts(context: RequestContext): number {
+		if (typeof context.options.retry === 'number') {
+			return context.options.retry
+		}
+
+		return this.config.maxAttempts
+	}
+
+	/**
+	 * Calculate delay before next retry based on backoff strategy
+	 */
+	private calculateDelay(attempt: number): number {
+		const { backoffStrategy, initialDelay, maxDelay } = this.config
+
+		let delay: number
+
+		switch (backoffStrategy) {
+			case 'exponential':
+				// Exponential: delay = initialDelay * 2^(attempt-1)
+				delay = initialDelay * Math.pow(2, attempt - 1)
+				break
+
+			case 'linear':
+				// Linear: delay = initialDelay * attempt
+				delay = initialDelay * attempt
+				break
+
+			case 'constant':
+				// Constant: delay = initialDelay
+				delay = initialDelay
+				break
+
+			default:
+				delay = initialDelay
+		}
+
+		// Add jitter (random 0-1000ms) to prevent thundering herd
+		delay += Math.random() * 1000
+
+		return Math.min(delay, maxDelay)
+	}
+
+	/**
+	 * Sleep for a given duration
+	 */
+	private sleep(ms: number): Promise<void> {
+		return new Promise((resolve) => setTimeout(resolve, ms))
+	}
+}
diff --git a/packages/api-client/src/features/verbose-logging.ts b/packages/api-client/src/features/verbose-logging.ts
new file mode 100644
index 00000000..5ff30b1a
--- /dev/null
+++ b/packages/api-client/src/features/verbose-logging.ts
@@ -0,0 +1,30 @@
+import { AbstractFeature, type FeatureConfig } from '../core/abstract-feature'
+import type { RequestContext } from '../types/request'
+
+export type VerboseLoggingConfig = FeatureConfig
+
+export class VerboseLoggingFeature extends AbstractFeature {
+	async execute<T>(next: () => Promise<T>, context: RequestContext): Promise<T> {
+		const method = context.options.method ?? 'GET'
+		const api = context.options.api
+		const version = context.options.version
+		const prefix = `[${method}] [${api}_v${version}]`
+
+		console.debug(`${prefix} ${context.url} SENT`)
+
+		try {
+			const result = await next()
+			try {
+				const size = result ? JSON.stringify(result).length : 0
+				console.debug(`${prefix} ${context.url} RECEIVED ${size} bytes`)
+			} catch {
+				// ignore size calc fail
+				console.debug(`${prefix} ${context.url} RECEIVED`)
+			}
+			return result
+		} catch (error) {
+			console.debug(`${prefix} ${context.url} FAILED`)
+			throw error
+		}
+	}
+}
diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts
new file mode 100644
index 00000000..106c7e4f
--- /dev/null
+++ b/packages/api-client/src/index.ts
@@ -0,0 +1,21 @@
+export { AbstractModrinthClient } from './core/abstract-client'
+export { AbstractFeature, type FeatureConfig } from './core/abstract-feature'
+export { ModrinthApiError, ModrinthServerError } from './core/errors'
+export { type AuthConfig, AuthFeature } from './features/auth'
+export {
+	type CircuitBreakerConfig,
+	CircuitBreakerFeature,
+	type CircuitBreakerState,
+	type CircuitBreakerStorage,
+	InMemoryCircuitBreakerStorage,
+} from './features/circuit-breaker'
+export { type BackoffStrategy, type RetryConfig, RetryFeature } from './features/retry'
+export { type VerboseLoggingConfig, VerboseLoggingFeature } from './features/verbose-logging'
+export type { InferredClientModules } from './modules'
+export * from './modules/types'
+export { GenericModrinthClient } from './platform/generic'
+export type { NuxtClientConfig } from './platform/nuxt'
+export { NuxtCircuitBreakerStorage, NuxtModrinthClient } from './platform/nuxt'
+export type { TauriClientConfig } from './platform/tauri'
+export { TauriModrinthClient } from './platform/tauri'
+export * from './types'
diff --git a/packages/api-client/src/modules/archon/.gitkeep b/packages/api-client/src/modules/archon/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/api-client/src/modules/index.ts b/packages/api-client/src/modules/index.ts
new file mode 100644
index 00000000..ec2c81ec
--- /dev/null
+++ b/packages/api-client/src/modules/index.ts
@@ -0,0 +1,106 @@
+import type { AbstractModrinthClient } from '../core/abstract-client'
+import type { AbstractModule } from '../core/abstract-module'
+import { LabrinthProjectsV2Module } from './labrinth/projects/v2'
+import { LabrinthProjectsV3Module } from './labrinth/projects/v3'
+
+type ModuleConstructor = new (client: AbstractModrinthClient) => AbstractModule
+
+/**
+ * To add a new module:
+ * 1. Create your module class extending AbstractModule
+ * 2. Add one line here: `<api>_<module>: YourModuleClass`
+ *
+ * TypeScript will automatically infer the client's field structure from this registry.
+ *
+ * TODO: Better way? Probably not
+ */
+export const MODULE_REGISTRY = {
+	labrinth_projects_v2: LabrinthProjectsV2Module,
+	labrinth_projects_v3: LabrinthProjectsV3Module,
+} as const satisfies Record<string, ModuleConstructor>
+
+export type ModuleID = keyof typeof MODULE_REGISTRY
+
+/**
+ * Parse a module ID into [api, moduleName] tuple
+ *
+ * @param id - Module ID in format `<api>_<module>` (e.g., 'labrinth_projects_v2')
+ * @returns Tuple of [api, moduleName] (e.g., ['labrinth', 'projects_v2'])
+ * @throws Error if module ID doesn't match expected format
+ */
+export function parseModuleID(id: string): [string, string] {
+	const parts = id.split('_')
+	if (parts.length < 2) {
+		throw new Error(
+			`Invalid module ID "${id}". Expected format: <api>_<module> (e.g., "labrinth_projects_v2")`,
+		)
+	}
+	const api = parts[0]
+	const moduleName = parts.slice(1).join('_')
+	return [api, moduleName]
+}
+
+/**
+ * Build nested module structure from flat registry
+ *
+ * Transforms:
+ * ```
+ * { labrinth_projects_v2: Constructor, labrinth_users_v2: Constructor }
+ * ```
+ * Into:
+ * ```
+ * { labrinth: { projects_v2: Constructor, users_v2: Constructor } }
+ * ```
+ *
+ * @returns Nested structure organized by API namespace
+ */
+export function buildModuleStructure(): Record<string, Record<string, ModuleConstructor>> {
+	const structure: Record<string, Record<string, ModuleConstructor>> = {}
+
+	for (const [id, constructor] of Object.entries(MODULE_REGISTRY)) {
+		const [api, moduleName] = parseModuleID(id)
+
+		if (!structure[api]) {
+			structure[api] = {}
+		}
+
+		structure[api][moduleName] = constructor
+	}
+
+	return structure
+}
+
+/**
+ * Extract API name from module ID
+ * @example ParseAPI<'labrinth_projects_v2'> = 'labrinth'
+ */
+type ParseAPI<T extends string> = T extends `${infer API}_${string}` ? API : never
+
+/**
+ * Extract module name for a given API
+ * @example ParseModule<'labrinth_projects_v2', 'labrinth'> = 'projects_v2'
+ */
+type ParseModule<T extends string, API extends string> = T extends `${API}_${infer Module}`
+	? Module
+	: never
+
+/**
+ * Group registry modules by API namespace
+ *
+ * Transforms flat registry into nested structure at the type level:
+ * ```
+ * { labrinth_projects_v2: ModuleClass } → { labrinth: { projects_v2: ModuleInstance } }
+ * ```
+ */
+type GroupByAPI<Registry extends Record<string, ModuleConstructor>> = {
+	[API in ParseAPI<keyof Registry & string>]: {
+		[Module in ParseModule<keyof Registry & string, API>]: InstanceType<
+			Registry[`${API}_${Module}`]
+		>
+	}
+}
+
+/**
+ * Inferred client module structure
+ **/
+export type InferredClientModules = GroupByAPI<typeof MODULE_REGISTRY>
diff --git a/packages/api-client/src/modules/kyros/.gitkeep b/packages/api-client/src/modules/kyros/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/api-client/src/modules/labrinth/index.ts b/packages/api-client/src/modules/labrinth/index.ts
new file mode 100644
index 00000000..b5961a1c
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/index.ts
@@ -0,0 +1,2 @@
+export * from './projects/v2'
+export * from './projects/v3'
diff --git a/packages/api-client/src/modules/labrinth/projects/types/v2.ts b/packages/api-client/src/modules/labrinth/projects/types/v2.ts
new file mode 100644
index 00000000..92f0d7cd
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/projects/types/v2.ts
@@ -0,0 +1,115 @@
+export type Environment = 'required' | 'optional' | 'unsupported' | 'unknown'
+
+export type ProjectStatus =
+	| 'approved'
+	| 'archived'
+	| 'rejected'
+	| 'draft'
+	| 'unlisted'
+	| 'processing'
+	| 'withheld'
+	| 'scheduled'
+	| 'private'
+	| 'unknown'
+
+export type MonetizationStatus = 'monetized' | 'demonetized' | 'force-demonetized'
+
+export type ProjectType = 'mod' | 'modpack' | 'resourcepack' | 'shader' | 'plugin' | 'datapack'
+
+export type GalleryImageV2 = {
+	url: string
+	featured: boolean
+	title?: string
+	description?: string
+	created: string
+	ordering: number
+}
+
+export type DonationLinkV2 = {
+	id: string
+	platform: string
+	url: string
+}
+
+export type ProjectV2 = {
+	id: string
+	slug: string
+	project_type: ProjectType
+	team: string
+	title: string
+	description: string
+	body: string
+	published: string
+	updated: string
+	approved?: string
+	queued?: string
+	status: ProjectStatus
+	requested_status?: ProjectStatus
+	moderator_message?: {
+		message: string
+		body?: string
+	}
+	license: {
+		id: string
+		name: string
+		url?: string
+	}
+	client_side: Environment
+	server_side: Environment
+	downloads: number
+	followers: number
+	categories: string[]
+	additional_categories: string[]
+	game_versions: string[]
+	loaders: string[]
+	versions: string[]
+	icon_url?: string
+	issues_url?: string
+	source_url?: string
+	wiki_url?: string
+	discord_url?: string
+	donation_urls?: DonationLinkV2[]
+	gallery?: GalleryImageV2[]
+	color?: number
+	thread_id: string
+	monetization_status: MonetizationStatus
+}
+
+export type SearchResultHit = {
+	project_id: string
+	project_type: ProjectType
+	slug: string
+	author: string
+	title: string
+	description: string
+	categories: string[]
+	display_categories: string[]
+	versions: string[]
+	downloads: number
+	follows: number
+	icon_url: string
+	date_created: string
+	date_modified: string
+	latest_version?: string
+	license: string
+	client_side: Environment
+	server_side: Environment
+	gallery: string[]
+	color?: number
+}
+
+export type SearchResult = {
+	hits: SearchResultHit[]
+	offset: number
+	limit: number
+	total_hits: number
+}
+
+export type ProjectSearchParams = {
+	query?: string
+	facets?: string[][]
+	filters?: string
+	index?: 'relevance' | 'downloads' | 'follows' | 'newest' | 'updated'
+	offset?: number
+	limit?: number
+}
diff --git a/packages/api-client/src/modules/labrinth/projects/types/v3.ts b/packages/api-client/src/modules/labrinth/projects/types/v3.ts
new file mode 100644
index 00000000..3b23f86b
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/projects/types/v3.ts
@@ -0,0 +1,54 @@
+import type { MonetizationStatus, ProjectStatus } from './v2'
+
+export type GalleryItemV3 = {
+	url: string
+	raw_url: string
+	featured: boolean
+	name?: string
+	description?: string
+	created: string
+	ordering: number
+}
+
+export type LinkV3 = {
+	platform: string
+	donation: boolean
+	url: string
+}
+
+export type ProjectV3 = {
+	id: string
+	slug?: string
+	project_types: string[]
+	games: string[]
+	team_id: string
+	organization?: string
+	name: string
+	summary: string
+	description: string
+	published: string
+	updated: string
+	approved?: string
+	queued?: string
+	status: ProjectStatus
+	requested_status?: ProjectStatus
+	license: {
+		id: string
+		name: string
+		url?: string
+	}
+	downloads: number
+	followers: number
+	categories: string[]
+	additional_categories: string[]
+	loaders: string[]
+	versions: string[]
+	icon_url?: string
+	link_urls: Record<string, LinkV3>
+	gallery: GalleryItemV3[]
+	color?: number
+	thread_id: string
+	monetization_status: MonetizationStatus
+	side_types_migration_review_status: 'reviewed' | 'pending'
+	[key: string]: unknown
+}
diff --git a/packages/api-client/src/modules/labrinth/projects/v2.ts b/packages/api-client/src/modules/labrinth/projects/v2.ts
new file mode 100644
index 00000000..b14c80ff
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/projects/v2.ts
@@ -0,0 +1,112 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { ProjectSearchParams, ProjectV2, SearchResult } from './types/v2'
+
+export class LabrinthProjectsV2Module extends AbstractModule {
+	public getModuleID(): string {
+		return 'labrinth_projects_v2'
+	}
+
+	/**
+	 * Get a project by ID or slug
+	 *
+	 * @param id - Project ID or slug (e.g., 'sodium' or 'AANobbMI')
+	 * @returns Promise resolving to the project data
+	 *
+	 * @example
+	 * ```typescript
+	 * const project = await client.labrinth.projects_v2.get('sodium')
+	 * console.log(project.title) // "Sodium"
+	 * ```
+	 */
+	public async get(id: string): Promise<ProjectV2> {
+		return this.client.request<ProjectV2>(`/project/${id}`, {
+			api: 'labrinth',
+			version: 2,
+			method: 'GET',
+		})
+	}
+
+	/**
+	 * Get multiple projects by IDs
+	 *
+	 * @param ids - Array of project IDs or slugs
+	 * @returns Promise resolving to array of projects
+	 *
+	 * @example
+	 * ```typescript
+	 * const projects = await client.labrinth.projects_v2.getMultiple(['sodium', 'lithium', 'phosphor'])
+	 * ```
+	 */
+	public async getMultiple(ids: string[]): Promise<ProjectV2[]> {
+		return this.client.request<ProjectV2[]>(`/projects`, {
+			api: 'labrinth',
+			version: 2,
+			method: 'GET',
+			params: { ids: JSON.stringify(ids) },
+		})
+	}
+
+	/**
+	 * Search projects
+	 *
+	 * @param params - Search parameters (query, facets, filters, etc.)
+	 * @returns Promise resolving to search results
+	 *
+	 * @example
+	 * ```typescript
+	 * const results = await client.labrinth.projects_v2.search({
+	 *   query: 'optimization',
+	 *   facets: [['categories:optimization'], ['project_type:mod']],
+	 *   limit: 20
+	 * })
+	 * ```
+	 */
+	public async search(params: ProjectSearchParams): Promise<SearchResult> {
+		return this.client.request<SearchResult>(`/search`, {
+			api: 'labrinth',
+			version: 2,
+			method: 'GET',
+			params: params as Record<string, unknown>,
+		})
+	}
+
+	/**
+	 * Edit a project
+	 *
+	 * @param id - Project ID or slug
+	 * @param data - Project update data
+	 *
+	 * @example
+	 * ```typescript
+	 * await client.labrinth.projects_v2.edit('sodium', {
+	 *   description: 'Updated description'
+	 * })
+	 * ```
+	 */
+	public async edit(id: string, data: Partial<ProjectV2>): Promise<void> {
+		return this.client.request(`/project/${id}`, {
+			api: 'labrinth',
+			version: 2,
+			method: 'PATCH',
+			body: data,
+		})
+	}
+
+	/**
+	 * Delete a project
+	 *
+	 * @param id - Project ID or slug
+	 *
+	 * @example
+	 * ```typescript
+	 * await client.labrinth.projects_v2.delete('my-project')
+	 * ```
+	 */
+	public async delete(id: string): Promise<void> {
+		return this.client.request(`/project/${id}`, {
+			api: 'labrinth',
+			version: 2,
+			method: 'DELETE',
+		})
+	}
+}
diff --git a/packages/api-client/src/modules/labrinth/projects/v3.ts b/packages/api-client/src/modules/labrinth/projects/v3.ts
new file mode 100644
index 00000000..0dd397d0
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/projects/v3.ts
@@ -0,0 +1,70 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { ProjectV3 } from './types/v3'
+
+export class LabrinthProjectsV3Module extends AbstractModule {
+	public getModuleID(): string {
+		return 'labrinth_projects_v3'
+	}
+
+	/**
+	 * Get a project by ID or slug (v3)
+	 *
+	 * @param id - Project ID or slug (e.g., 'sodium' or 'AANobbMI')
+	 * @returns Promise resolving to the v3 project data
+	 *
+	 * @example
+	 * ```typescript
+	 * const project = await client.labrinth.projects_v3.get('sodium')
+	 * console.log(project.project_types) // v3 field
+	 * ```
+	 */
+	public async get(id: string): Promise<ProjectV3> {
+		return this.client.request<ProjectV3>(`/project/${id}`, {
+			api: 'labrinth',
+			version: 3,
+			method: 'GET',
+		})
+	}
+
+	/**
+	 * Get multiple projects by IDs (v3)
+	 *
+	 * @param ids - Array of project IDs or slugs
+	 * @returns Promise resolving to array of v3 projects
+	 *
+	 * @example
+	 * ```typescript
+	 * const projects = await client.labrinth.projects_v3.getMultiple(['sodium', 'lithium'])
+	 * ```
+	 */
+	public async getMultiple(ids: string[]): Promise<ProjectV3[]> {
+		return this.client.request<ProjectV3[]>(`/projects`, {
+			api: 'labrinth',
+			version: 3,
+			method: 'GET',
+			params: { ids: JSON.stringify(ids) },
+		})
+	}
+
+	/**
+	 * Edit a project (v3)
+	 *
+	 * @param id - Project ID or slug
+	 * @param data - Project update data (v3 fields)
+	 *
+	 * @example
+	 * ```typescript
+	 * await client.labrinth.projects_v3.edit('sodium', {
+	 *   environment: 'client_and_server'
+	 * })
+	 * ```
+	 */
+	public async edit(id: string, data: Partial<ProjectV3>): Promise<void> {
+		return this.client.request(`/project/${id}`, {
+			api: 'labrinth',
+			version: 3,
+			method: 'PATCH',
+			body: data,
+		})
+	}
+}
diff --git a/packages/api-client/src/modules/types.ts b/packages/api-client/src/modules/types.ts
new file mode 100644
index 00000000..6540671e
--- /dev/null
+++ b/packages/api-client/src/modules/types.ts
@@ -0,0 +1,2 @@
+export * from './labrinth/projects/types/v2'
+export * from './labrinth/projects/types/v3'
diff --git a/packages/api-client/src/platform/generic.ts b/packages/api-client/src/platform/generic.ts
new file mode 100644
index 00000000..6d4c3280
--- /dev/null
+++ b/packages/api-client/src/platform/generic.ts
@@ -0,0 +1,51 @@
+import { $fetch, FetchError } from 'ofetch'
+
+import { AbstractModrinthClient } from '../core/abstract-client'
+import type { ModrinthApiError } from '../core/errors'
+import type { RequestOptions } from '../types/request'
+
+/**
+ * Generic platform client using ofetch
+ *
+ * This client works in any JavaScript environment (Node.js, browser, workers).
+ *
+ * @example
+ * ```typescript
+ * const client = new GenericModrinthClient({
+ *   userAgent: 'my-app/1.0.0',
+ *   features: [
+ *     new AuthFeature({ token: 'mrp_...' }),
+ *     new RetryFeature({ maxAttempts: 3 })
+ *   ]
+ * })
+ *
+ * const project = await client.request('/project/sodium', { api: 'labrinth', version: 2 })
+ * ```
+ */
+export class GenericModrinthClient extends AbstractModrinthClient {
+	protected async executeRequest<T>(url: string, options: RequestOptions): Promise<T> {
+		try {
+			const response = await $fetch<T>(url, {
+				method: options.method ?? 'GET',
+				headers: options.headers,
+				body: options.body as BodyInit,
+				params: options.params as Record<string, string>,
+				timeout: options.timeout,
+				signal: options.signal,
+			})
+
+			return response
+		} catch (error) {
+			// ofetch throws FetchError for HTTP errors
+			throw this.normalizeError(error)
+		}
+	}
+
+	protected normalizeError(error: unknown): ModrinthApiError {
+		if (error instanceof FetchError) {
+			return this.createNormalizedError(error, error.response?.status, error.data)
+		}
+
+		return super.normalizeError(error)
+	}
+}
diff --git a/packages/api-client/src/platform/nuxt.ts b/packages/api-client/src/platform/nuxt.ts
new file mode 100644
index 00000000..b4daecc5
--- /dev/null
+++ b/packages/api-client/src/platform/nuxt.ts
@@ -0,0 +1,113 @@
+import { FetchError } from 'ofetch'
+
+import { AbstractModrinthClient } from '../core/abstract-client'
+import type { ModrinthApiError } from '../core/errors'
+import type { CircuitBreakerState, CircuitBreakerStorage } from '../features/circuit-breaker'
+import type { ClientConfig } from '../types/client'
+import type { RequestOptions } from '../types/request'
+
+/**
+ * Circuit breaker storage using Nuxt's useState
+ *
+ * This provides cross-request persistence in SSR while also working in client-side.
+ * State is shared between requests in the same Nuxt context.
+ */
+export class NuxtCircuitBreakerStorage implements CircuitBreakerStorage {
+	private getState(): Map<string, CircuitBreakerState> {
+		// @ts-expect-error - useState is provided by Nuxt runtime
+		const state = useState<Map<string, CircuitBreakerState>>(
+			'circuit-breaker-state',
+			() => new Map(),
+		)
+		return state.value
+	}
+
+	get(key: string): CircuitBreakerState | undefined {
+		return this.getState().get(key)
+	}
+
+	set(key: string, state: CircuitBreakerState): void {
+		this.getState().set(key, state)
+	}
+
+	clear(key: string): void {
+		this.getState().delete(key)
+	}
+}
+
+/**
+ * Nuxt-specific configuration
+ */
+export interface NuxtClientConfig extends ClientConfig {
+	// TODO: do we want to provide this for tauri+base as well? its not used on app
+	/**
+	 * Rate limit key for server-side requests
+	 * This is injected as x-ratelimit-key header on server-side
+	 */
+	rateLimitKey?: string
+}
+
+/**
+ * Nuxt platform client using Nuxt's $fetch
+ *
+ * This client is optimized for Nuxt applications and handles SSR/CSR automatically.
+ *
+ * @example
+ * ```typescript
+ * // In a Nuxt composable
+ * const config = useRuntimeConfig()
+ * const auth = await useAuth()
+ *
+ * const client = new NuxtModrinthClient({
+ *   userAgent: 'my-nuxt-app/1.0.0',
+ *   rateLimitKey: import.meta.server ? config.rateLimitKey : undefined,
+ *   features: [
+ *     new AuthFeature({ token: () => auth.value.token })
+ *   ]
+ * })
+ *
+ * const project = await client.request('/project/sodium', { api: 'labrinth', version: 2 })
+ * ```
+ */
+export class NuxtModrinthClient extends AbstractModrinthClient {
+	protected declare config: NuxtClientConfig
+
+	protected async executeRequest<T>(url: string, options: RequestOptions): Promise<T> {
+		try {
+			// @ts-expect-error - $fetch is provided by Nuxt runtime
+			const response = await $fetch<T>(url, {
+				method: options.method ?? 'GET',
+				headers: options.headers,
+				body: options.body,
+				params: options.params,
+				timeout: options.timeout,
+				signal: options.signal,
+			})
+
+			return response
+		} catch (error) {
+			throw this.normalizeError(error)
+		}
+	}
+
+	protected normalizeError(error: unknown): ModrinthApiError {
+		if (error instanceof FetchError) {
+			return this.createNormalizedError(error, error.response?.status, error.data)
+		}
+
+		return super.normalizeError(error)
+	}
+
+	protected buildDefaultHeaders(): Record<string, string> {
+		const headers: Record<string, string> = {
+			...super.buildDefaultHeaders(),
+		}
+
+		// @ts-expect-error - import.meta is provided by Nuxt
+		if (import.meta.server && this.config.rateLimitKey) {
+			headers['x-ratelimit-key'] = this.config.rateLimitKey
+		}
+
+		return headers
+	}
+}
diff --git a/packages/api-client/src/platform/tauri.ts b/packages/api-client/src/platform/tauri.ts
new file mode 100644
index 00000000..7eef8691
--- /dev/null
+++ b/packages/api-client/src/platform/tauri.ts
@@ -0,0 +1,102 @@
+import { AbstractModrinthClient } from '../core/abstract-client'
+import type { ModrinthApiError } from '../core/errors'
+import type { ClientConfig } from '../types/client'
+import type { RequestOptions } from '../types/request'
+
+/**
+ * Tauri-specific configuration
+ * TODO: extend into interface if needed.
+ */
+export type TauriClientConfig = ClientConfig
+
+/**
+ * Extended error type with HTTP response metadata
+ */
+interface HttpError extends Error {
+	statusCode?: number
+	responseData?: unknown
+}
+
+/**
+ * Tauri platform client using Tauri v2 HTTP plugin
+
+ * @example
+ * ```typescript
+ * import { getVersion } from '@tauri-apps/api/app'
+ *
+ * const version = await getVersion()
+ * const client = new TauriModrinthClient({
+ *   userAgent: `modrinth/theseus/${version} (support@modrinth.com)`,
+ *   features: [
+ *     new AuthFeature({ token: 'mrp_...' })
+ *   ]
+ * })
+ *
+ * const project = await client.request('/project/sodium', { api: 'labrinth', version: 2 })
+ * ```
+ */
+export class TauriModrinthClient extends AbstractModrinthClient {
+	protected declare config: TauriClientConfig
+
+	protected async executeRequest<T>(url: string, options: RequestOptions): Promise<T> {
+		try {
+			// Dynamically import Tauri HTTP plugin
+			// This allows the package to be used in non-Tauri environments
+			const { fetch: tauriFetch } = await import('@tauri-apps/plugin-http')
+
+			let body: BodyInit | null | undefined = undefined
+			if (options.body) {
+				if (typeof options.body === 'object' && !(options.body instanceof FormData)) {
+					body = JSON.stringify(options.body)
+				} else {
+					body = options.body as BodyInit
+				}
+			}
+
+			let fullUrl = url
+			if (options.params) {
+				const queryParams = new URLSearchParams(options.params as Record<string, string>).toString()
+				fullUrl = `${url}?${queryParams}`
+			}
+
+			const response = await tauriFetch(fullUrl, {
+				method: options.method ?? 'GET',
+				headers: options.headers,
+				body,
+			})
+
+			if (!response.ok) {
+				let responseData: unknown
+				try {
+					responseData = await response.json()
+				} catch {
+					responseData = undefined
+				}
+
+				const error = new Error(`HTTP ${response.status}: ${response.statusText}`) as HttpError
+
+				error.statusCode = response.status
+				error.responseData = responseData
+
+				throw error
+			}
+
+			const data = await response.json()
+			return data as T
+		} catch (error) {
+			throw this.normalizeError(error)
+		}
+	}
+
+	protected normalizeError(error: unknown): ModrinthApiError {
+		if (error instanceof Error) {
+			const httpError = error as HttpError
+			const statusCode = httpError.statusCode
+			const responseData = httpError.responseData
+
+			return this.createNormalizedError(error, statusCode, responseData)
+		}
+
+		return super.normalizeError(error)
+	}
+}
diff --git a/packages/api-client/src/tests/.gitkeep b/packages/api-client/src/tests/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/api-client/src/types/client.ts b/packages/api-client/src/types/client.ts
new file mode 100644
index 00000000..8080c311
--- /dev/null
+++ b/packages/api-client/src/types/client.ts
@@ -0,0 +1,68 @@
+import type { AbstractFeature } from '../core/abstract-feature'
+import type { RequestContext } from './request'
+
+/**
+ * Request lifecycle hooks
+ */
+export type RequestHooks = {
+	/**
+	 * Called before request is sent (after all features have processed)
+	 */
+	onRequest?: (context: RequestContext) => void | Promise<void>
+
+	/**
+	 * Called after successful response (before features process response)
+	 */
+	onResponse?: <T>(data: T, context: RequestContext) => void | Promise<void>
+
+	/**
+	 * Called when request fails (after all features have processed error)
+	 */
+	onError?: (error: Error, context: RequestContext) => void | Promise<void>
+}
+
+/**
+ * Client configuration
+ */
+export interface ClientConfig {
+	/**
+	 * User agent string for requests
+	 * Should identify your application (e.g., 'my-app/1.0.0')
+	 * If not provided, the platform's default user agent will be used
+	 */
+	userAgent?: string
+
+	/**
+	 * Base URL for Labrinth API (main Modrinth API)
+	 * @default 'https://api.modrinth.com'
+	 */
+	labrinthBaseUrl?: string
+
+	/**
+	 * Base URL for Archon API (Modrinth Servers API)
+	 * @default 'https://archon.modrinth.com'
+	 */
+	archonBaseUrl?: string
+
+	/**
+	 * Default request timeout in milliseconds
+	 * @default 10000
+	 */
+	timeout?: number
+
+	/**
+	 * Additional default headers to include in all requests
+	 */
+	headers?: Record<string, string>
+
+	/**
+	 * Features to enable for this client
+	 * Features are applied in the order they appear in this array
+	 */
+	features?: AbstractFeature[]
+
+	/**
+	 * Request lifecycle hooks
+	 */
+	hooks?: RequestHooks
+}
diff --git a/packages/api-client/src/types/errors.ts b/packages/api-client/src/types/errors.ts
new file mode 100644
index 00000000..6e33b6d9
--- /dev/null
+++ b/packages/api-client/src/types/errors.ts
@@ -0,0 +1,56 @@
+/**
+ * Data for API errors
+ */
+export type ApiErrorData = {
+	/**
+	 * HTTP status code (if available)
+	 */
+	statusCode?: number
+
+	/**
+	 * Original error that was caught
+	 */
+	originalError?: Error
+
+	/**
+	 * Response data from the API (if available)
+	 */
+	responseData?: unknown
+
+	/**
+	 * Error context (e.g., module name, operation being performed)
+	 */
+	context?: string
+}
+
+/**
+ * Modrinth V1 error response format
+ * Used by kyros + archon APIs
+ */
+export type ModrinthErrorResponse = {
+	/**
+	 * Error code/identifier
+	 */
+	error: string
+
+	/**
+	 * Human-readable error description
+	 */
+	description: string
+
+	/**
+	 * Optional context about where the error occurred
+	 */
+	context?: string
+}
+
+/**
+ * Type guard to check if an object is a ModrinthErrorResponse
+ */
+export function isModrinthErrorResponse(obj: unknown): obj is ModrinthErrorResponse {
+	if (typeof obj !== 'object' || obj === null) {
+		return false
+	}
+	const record = obj as Record<string, unknown>
+	return typeof record.error === 'string' && typeof record.description === 'string'
+}
diff --git a/packages/api-client/src/types/index.ts b/packages/api-client/src/types/index.ts
new file mode 100644
index 00000000..bec8c57c
--- /dev/null
+++ b/packages/api-client/src/types/index.ts
@@ -0,0 +1,12 @@
+export type { FeatureConfig } from '../core/abstract-feature'
+export type { AuthConfig } from '../features/auth'
+export type {
+	CircuitBreakerConfig,
+	CircuitBreakerState,
+	CircuitBreakerStorage,
+} from '../features/circuit-breaker'
+export type { BackoffStrategy, RetryConfig } from '../features/retry'
+export type { ClientConfig, RequestHooks } from './client'
+export type { ApiErrorData, ModrinthErrorResponse } from './errors'
+export { isModrinthErrorResponse } from './errors'
+export type { HttpMethod, RequestContext, RequestOptions, ResponseData } from './request'
diff --git a/packages/api-client/src/types/request.ts b/packages/api-client/src/types/request.ts
new file mode 100644
index 00000000..a9383cfb
--- /dev/null
+++ b/packages/api-client/src/types/request.ts
@@ -0,0 +1,131 @@
+/**
+ * HTTP method types
+ */
+export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE'
+
+/**
+ * Options for making a request
+ */
+export type RequestOptions = {
+	/**
+	 * API to use for this request
+	 * - 'labrinth': Main Modrinth API (resolves to labrinthBaseUrl)
+	 * - 'archon': Modrinth Servers API (resolves to archonBaseUrl)
+	 * - string: Custom base URL (e.g., 'https://custom-api.com')
+	 */
+	api: 'labrinth' | 'archon' | string
+
+	/**
+	 * API version to use
+	 * - number: version number (e.g., 2 for v2, 3 for v3)
+	 * - 'internal': use internal API
+	 */
+	version: number | 'internal'
+
+	/**
+	 * HTTP method to use
+	 * @default 'GET'
+	 */
+	method?: HttpMethod
+
+	/**
+	 * Request headers
+	 */
+	headers?: Record<string, string>
+
+	/**
+	 * Request body (will be JSON stringified if object)
+	 */
+	body?: unknown
+
+	/**
+	 * URL query parameters
+	 */
+	params?: Record<string, unknown>
+
+	/**
+	 * Request timeout in milliseconds
+	 */
+	timeout?: number
+
+	/**
+	 * Abort signal for cancelling requests
+	 */
+	signal?: AbortSignal
+
+	/**
+	 * Retry configuration for this specific request
+	 * - false: no retries
+	 * - true: use default retry config
+	 * - number: max retry attempts
+	 */
+	retry?: boolean | number
+
+	/**
+	 * Circuit breaker configuration for this specific request
+	 * - false: disable circuit breaker
+	 * - true: use default circuit breaker config
+	 */
+	circuitBreaker?: boolean
+
+	/**
+	 * Whether to skip authentication for this request
+	 * @default false
+	 */
+	skipAuth?: boolean
+}
+
+/**
+ * Full context passed to features during request execution
+ */
+export type RequestContext = {
+	/**
+	 * Full URL being requested (with base URL and versioning applied)
+	 */
+	url: string
+
+	/**
+	 * Original path (before base URL and versioning)
+	 */
+	path: string
+
+	/**
+	 * Request options
+	 */
+	options: RequestOptions
+
+	/**
+	 * Current attempt number (1-indexed)
+	 */
+	attempt: number
+
+	/**
+	 * Timestamp when request started
+	 */
+	startTime: number
+
+	/**
+	 * Additional metadata that features can attach
+	 */
+	metadata?: Record<string, unknown>
+}
+
+/**
+ * Generic response wrapper
+ */
+export type ResponseData<T = unknown> = {
+	/**
+	 * Response data
+	 */
+	data: T
+
+	/**
+	 * HTTP status code
+	 */
+	status: number
+
+	/**
+	 * Response headers
+	 */
+	headers: Record<string, string>
+}
diff --git a/packages/api-client/tsconfig.json b/packages/api-client/tsconfig.json
new file mode 100644
index 00000000..e8bc1a8a
--- /dev/null
+++ b/packages/api-client/tsconfig.json
@@ -0,0 +1,3 @@
+{
+	"extends": "@modrinth/tooling-config/typescript/base.json"
+}
diff --git a/packages/tooling-config/eslint/base.mjs b/packages/tooling-config/eslint/base.mjs
index 587ff5a1..a9d3def7 100644
--- a/packages/tooling-config/eslint/base.mjs
+++ b/packages/tooling-config/eslint/base.mjs
@@ -1,10 +1,10 @@
 import eslint from '@eslint/js'
 import prettierEslint from 'eslint-plugin-prettier/recommended'
 import tseslint from 'typescript-eslint'
+import common from './common.mjs'
 
 export default tseslint.config(
 	eslint.configs.recommended,
-	tseslint.configs.recommendedTypeChecked,
 	prettierEslint,
 	...common,
 	{
diff --git a/packages/ui/src/providers/api.ts b/packages/ui/src/providers/api.ts
deleted file mode 100644
index b808b2a0..00000000
--- a/packages/ui/src/providers/api.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type { ModrinthApi } from '@modrinth/utils'
-
-import { createContext } from '.'
-
-export const [injectApi, provideApi] = createContext<ModrinthApi>('root', 'apiContext')
diff --git a/packages/utils/api/default_impl.ts b/packages/utils/api/default_impl.ts
deleted file mode 100644
index 79981d2e..00000000
--- a/packages/utils/api/default_impl.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { Project, ProjectV3Partial } from '../types'
-import type { ModrinthApi } from './index'
-import type { ModrinthApiProjects, ProjectEditBody, ProjectV3EditBodyPartial } from './projects'
-
-export class RestModrinthApi implements ModrinthApi {
-	projects: ModrinthApiProjects
-
-	constructor(requestApi: (url: string, options?: object) => Promise<Response>) {
-		this.projects = new RestModrinthApiProjects(requestApi)
-	}
-}
-
-class RestModrinthApiProjects implements ModrinthApiProjects {
-	constructor(private request: (url: string, options?: object) => Promise<Response>) {}
-
-	async get(id: string): Promise<Project> {
-		const res = await this.request(`/v2/project/${id}`)
-		return res.json()
-	}
-
-	async getV3(id: string): Promise<ProjectV3Partial> {
-		const res = await this.request(`/v3/project/${id}`)
-		return res.json()
-	}
-
-	async edit(id: string, data: ProjectEditBody): Promise<void> {
-		await this.request(`/v2/project/${id}`, {
-			method: 'PATCH',
-			headers: { 'Content-Type': 'application/json' },
-			body: JSON.stringify(data),
-		})
-	}
-
-	async editV3(id: string, data: ProjectV3EditBodyPartial): Promise<void> {
-		await this.request(`/v3/project/${id}`, {
-			method: 'PATCH',
-			headers: { 'Content-Type': 'application/json' },
-			body: JSON.stringify(data),
-		})
-	}
-}
diff --git a/packages/utils/api/index.ts b/packages/utils/api/index.ts
deleted file mode 100644
index 8dd1355c..00000000
--- a/packages/utils/api/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { ModrinthApiProjects } from './projects'
-
-export interface ModrinthApi {
-	projects: ModrinthApiProjects
-}
-
-export { RestModrinthApi } from './default_impl'
diff --git a/packages/utils/api/projects.ts b/packages/utils/api/projects.ts
deleted file mode 100644
index 71f26580..00000000
--- a/packages/utils/api/projects.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type {
-	DonationLink,
-	DonationPlatform,
-	Environment,
-	EnvironmentMigrationReviewStatus,
-	EnvironmentV3,
-	Project,
-	ProjectStatus,
-	ProjectV3Partial,
-	RequestableStatus,
-} from '../types'
-
-export type ProjectEditBody = {
-	slug?: string
-	title?: string
-	description?: string
-	categories?: string[]
-	client_side?: Environment
-	server_side?: Environment
-	status?: ProjectStatus
-	requested_status?: RequestableStatus
-	additional_categories?: string[]
-	issues_url?: string
-	source_url?: string
-	wiki_url?: string
-	discord_url?: string
-	donation_urls?: DonationLink<DonationPlatform>[]
-	license_id?: string
-	license_url?: string
-}
-export type ProjectV3EditBodyPartial = {
-	environment?: EnvironmentV3
-	side_types_migration_review_status: EnvironmentMigrationReviewStatus
-}
-
-export interface ModrinthApiProjects {
-	get(id: string): Promise<Project>
-	getV3(id: string): Promise<ProjectV3Partial>
-	edit(id: string, data: ProjectEditBody): Promise<void>
-	editV3(id: string, data: ProjectV3EditBodyPartial): Promise<void>
-}
diff --git a/packages/utils/index.ts b/packages/utils/index.ts
index 8ddeeb39..26df429f 100644
--- a/packages/utils/index.ts
+++ b/packages/utils/index.ts
@@ -1,4 +1,3 @@
-export * from './api'
 export * from './billing'
 export * from './changelog'
 export * from './highlightjs'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7be2c8cf..1e114697 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -218,6 +218,9 @@ importers:
       '@ltd/j-toml':
         specifier: ^1.38.0
         version: 1.38.0
+      '@modrinth/api-client':
+        specifier: workspace:*
+        version: link:../../packages/api-client
       '@modrinth/assets':
         specifier: workspace:*
         version: link:../../packages/assets
@@ -387,6 +390,19 @@ importers:
 
   apps/labrinth: {}
 
+  packages/api-client:
+    dependencies:
+      '@tauri-apps/plugin-http':
+        specifier: ^2.0.0
+        version: 2.5.0
+      ofetch:
+        specifier: ^1.4.1
+        version: 1.4.1
+    devDependencies:
+      '@modrinth/tooling-config':
+        specifier: workspace:*
+        version: link:../tooling-config
+
   packages/app-lib: {}
 
   packages/assets:

From c27f787c9136200b4e546e55315f4a68936e2b12 Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Thu, 13 Nov 2025 18:16:41 +0000
Subject: [PATCH 53/64] Task to retroactively update Mural statuses (#4769)

* Task to retroactively update Mural statuses

* cargo sqlx prepare

* wip: add tests

* Prepare

* Fix up test

* start on muralpay mock

* Move mocking to muralpay crate
---
 Cargo.lock                                    |   1 +
 ...f4eeff66ab4165a9f4980032e114db4dc1286.json |  26 +
 ...5bbb47110c0f9c6bc9b7c4ef8864a03898900.json |  15 +
 ...d04d41102c426615e8623256efe5053b1c76c.json |  16 +
 ...d2402f52fea71e27b08e7926fcc2a9e62c0f3.json |  20 +
 ...afedb074492b4ec7f2457c14113f5fd13aa02.json |  18 +
 ...e5c93783c7641b019fdb698a1ec0be1393606.json |  17 +
 ...2da7dd5e9f2334a6eb4768847078db70fd6aa.json |  30 +
 apps/labrinth/CLAUDE.md                       |   3 +
 apps/labrinth/Cargo.toml                      |   2 +-
 apps/labrinth/src/background_task.rs          |  31 +
 apps/labrinth/src/main.rs                     |   3 +
 apps/labrinth/src/models/v3/payouts.rs        |  11 +-
 apps/labrinth/src/queue/payouts/mod.rs        |   9 +-
 apps/labrinth/src/queue/payouts/mural.rs      | 564 +++++++++++++++++-
 apps/labrinth/src/routes/v3/payouts.rs        |   4 +-
 packages/muralpay/Cargo.toml                  |   2 +
 packages/muralpay/src/account.rs              |  12 +
 packages/muralpay/src/counterparty.rs         |   8 +
 packages/muralpay/src/lib.rs                  |  29 +
 packages/muralpay/src/mock.rs                 |  65 ++
 packages/muralpay/src/organization.rs         |   4 +
 packages/muralpay/src/payout.rs               |  18 +-
 packages/muralpay/src/payout_method.rs        |   8 +
 24 files changed, 906 insertions(+), 10 deletions(-)
 create mode 100644 apps/labrinth/.sqlx/query-1adbd24d815107e13bc1440c7a8f4eeff66ab4165a9f4980032e114db4dc1286.json
 create mode 100644 apps/labrinth/.sqlx/query-3add5da682909ea515a65d27b385bbb47110c0f9c6bc9b7c4ef8864a03898900.json
 create mode 100644 apps/labrinth/.sqlx/query-9a2ef6caddcebc17666be7d7d77d04d41102c426615e8623256efe5053b1c76c.json
 create mode 100644 apps/labrinth/.sqlx/query-b92b5bb7d179c4fcdbc45600ccfd2402f52fea71e27b08e7926fcc2a9e62c0f3.json
 create mode 100644 apps/labrinth/.sqlx/query-cd5ccd618fb3cc41646a6de86f9afedb074492b4ec7f2457c14113f5fd13aa02.json
 create mode 100644 apps/labrinth/.sqlx/query-cec4240c7c848988b3dfd13e3f8e5c93783c7641b019fdb698a1ec0be1393606.json
 create mode 100644 apps/labrinth/.sqlx/query-debd4b2909fdb3318bcee18fa462da7dd5e9f2334a6eb4768847078db70fd6aa.json
 create mode 100644 apps/labrinth/CLAUDE.md
 create mode 100644 packages/muralpay/src/mock.rs

diff --git a/Cargo.lock b/Cargo.lock
index 65d75c50..4fb3b0b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5141,6 +5141,7 @@ dependencies = [
 name = "muralpay"
 version = "0.1.0"
 dependencies = [
+ "arc-swap",
  "bytes",
  "chrono",
  "clap",
diff --git a/apps/labrinth/.sqlx/query-1adbd24d815107e13bc1440c7a8f4eeff66ab4165a9f4980032e114db4dc1286.json b/apps/labrinth/.sqlx/query-1adbd24d815107e13bc1440c7a8f4eeff66ab4165a9f4980032e114db4dc1286.json
new file mode 100644
index 00000000..921f7f92
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-1adbd24d815107e13bc1440c7a8f4eeff66ab4165a9f4980032e114db4dc1286.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT\n                    id,\n                    status AS \"status: PayoutStatus\"\n                FROM payouts\n                ORDER BY id\n                ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "status: PayoutStatus",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "1adbd24d815107e13bc1440c7a8f4eeff66ab4165a9f4980032e114db4dc1286"
+}
diff --git a/apps/labrinth/.sqlx/query-3add5da682909ea515a65d27b385bbb47110c0f9c6bc9b7c4ef8864a03898900.json b/apps/labrinth/.sqlx/query-3add5da682909ea515a65d27b385bbb47110c0f9c6bc9b7c4ef8864a03898900.json
new file mode 100644
index 00000000..ef1a3432
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-3add5da682909ea515a65d27b385bbb47110c0f9c6bc9b7c4ef8864a03898900.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        UPDATE payouts\n        SET status = u.status\n        FROM UNNEST($1::bigint[], $2::varchar[]) AS u(id, status)\n        WHERE payouts.id = u.id\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8Array",
+        "VarcharArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "3add5da682909ea515a65d27b385bbb47110c0f9c6bc9b7c4ef8864a03898900"
+}
diff --git a/apps/labrinth/.sqlx/query-9a2ef6caddcebc17666be7d7d77d04d41102c426615e8623256efe5053b1c76c.json b/apps/labrinth/.sqlx/query-9a2ef6caddcebc17666be7d7d77d04d41102c426615e8623256efe5053b1c76c.json
new file mode 100644
index 00000000..becee9fa
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-9a2ef6caddcebc17666be7d7d77d04d41102c426615e8623256efe5053b1c76c.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE payouts\n            SET status = u.status\n            FROM UNNEST($1::text[], $2::text[]) AS u(platform_id, status)\n            WHERE\n                payouts.method = $3\n                AND payouts.platform_id = u.platform_id\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "TextArray",
+        "TextArray",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "9a2ef6caddcebc17666be7d7d77d04d41102c426615e8623256efe5053b1c76c"
+}
diff --git a/apps/labrinth/.sqlx/query-b92b5bb7d179c4fcdbc45600ccfd2402f52fea71e27b08e7926fcc2a9e62c0f3.json b/apps/labrinth/.sqlx/query-b92b5bb7d179c4fcdbc45600ccfd2402f52fea71e27b08e7926fcc2a9e62c0f3.json
new file mode 100644
index 00000000..89bd8147
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-b92b5bb7d179c4fcdbc45600ccfd2402f52fea71e27b08e7926fcc2a9e62c0f3.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT status AS \"status: PayoutStatus\" FROM payouts WHERE id = 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "status: PayoutStatus",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "b92b5bb7d179c4fcdbc45600ccfd2402f52fea71e27b08e7926fcc2a9e62c0f3"
+}
diff --git a/apps/labrinth/.sqlx/query-cd5ccd618fb3cc41646a6de86f9afedb074492b4ec7f2457c14113f5fd13aa02.json b/apps/labrinth/.sqlx/query-cd5ccd618fb3cc41646a6de86f9afedb074492b4ec7f2457c14113f5fd13aa02.json
new file mode 100644
index 00000000..469c3016
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-cd5ccd618fb3cc41646a6de86f9afedb074492b4ec7f2457c14113f5fd13aa02.json
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                INSERT INTO payouts (id, method, platform_id, status, user_id, amount, created)\n                VALUES ($1, $2, $3, $4, $5, 10.0, NOW())\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text",
+        "Text",
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "cd5ccd618fb3cc41646a6de86f9afedb074492b4ec7f2457c14113f5fd13aa02"
+}
diff --git a/apps/labrinth/.sqlx/query-cec4240c7c848988b3dfd13e3f8e5c93783c7641b019fdb698a1ec0be1393606.json b/apps/labrinth/.sqlx/query-cec4240c7c848988b3dfd13e3f8e5c93783c7641b019fdb698a1ec0be1393606.json
new file mode 100644
index 00000000..52e020eb
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-cec4240c7c848988b3dfd13e3f8e5c93783c7641b019fdb698a1ec0be1393606.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                    INSERT INTO payouts (id, method, platform_id, status, user_id, amount, created)\n                    VALUES ($1, $2, NULL, $3, $4, 10.00, NOW())\n                    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text",
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "cec4240c7c848988b3dfd13e3f8e5c93783c7641b019fdb698a1ec0be1393606"
+}
diff --git a/apps/labrinth/.sqlx/query-debd4b2909fdb3318bcee18fa462da7dd5e9f2334a6eb4768847078db70fd6aa.json b/apps/labrinth/.sqlx/query-debd4b2909fdb3318bcee18fa462da7dd5e9f2334a6eb4768847078db70fd6aa.json
new file mode 100644
index 00000000..398b72c4
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-debd4b2909fdb3318bcee18fa462da7dd5e9f2334a6eb4768847078db70fd6aa.json
@@ -0,0 +1,30 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT id, platform_id FROM payouts\n        WHERE\n            method = $1\n            AND status = ANY($2::text[])\n        LIMIT $3\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "platform_id",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      true
+    ]
+  },
+  "hash": "debd4b2909fdb3318bcee18fa462da7dd5e9f2334a6eb4768847078db70fd6aa"
+}
diff --git a/apps/labrinth/CLAUDE.md b/apps/labrinth/CLAUDE.md
new file mode 100644
index 00000000..0342153c
--- /dev/null
+++ b/apps/labrinth/CLAUDE.md
@@ -0,0 +1,3 @@
+If an AI agent is reading this file, and does not have any previous context from a higher-level `CLAUDE.md`, inform the developer that they are launching Claude Code from the wrong directory. Their PWD is `$PROJECT_ROOT/apps/labrinth`, however Claude Code must be launched from `$PROJECT_ROOT` to get the full context!
+
+If the above is true, refuse to answer any prompts unless the developer has launched Claude Code from the project root.
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index bed033df..227a8b23 100644
--- a/apps/labrinth/Cargo.toml
+++ b/apps/labrinth/Cargo.toml
@@ -72,7 +72,7 @@ lettre = { workspace = true }
 meilisearch-sdk = { workspace = true, features = ["reqwest"] }
 modrinth-maxmind = { workspace = true }
 modrinth-util = { workspace = true }
-muralpay = { workspace = true, features = ["utoipa"] }
+muralpay = { workspace = true, features = ["utoipa", "mock"] }
 murmur2 = { workspace = true }
 paste = { workspace = true }
 path-util = { workspace = true }
diff --git a/apps/labrinth/src/background_task.rs b/apps/labrinth/src/background_task.rs
index b79671ea..3e1a8a33 100644
--- a/apps/labrinth/src/background_task.rs
+++ b/apps/labrinth/src/background_task.rs
@@ -9,6 +9,7 @@ use crate::search::indexing::index_projects;
 use crate::util::anrok;
 use crate::{database, search};
 use clap::ValueEnum;
+use muralpay::MuralPay;
 use sqlx::Postgres;
 use tracing::{error, info, warn};
 
@@ -19,6 +20,7 @@ pub enum BackgroundTask {
     ReleaseScheduled,
     UpdateVersions,
     Payouts,
+    SyncPayoutStatuses,
     IndexBilling,
     IndexSubscriptions,
     Migrations,
@@ -36,6 +38,7 @@ impl BackgroundTask {
         stripe_client: stripe::Client,
         anrok_client: anrok::Client,
         email_queue: EmailQueue,
+        mural_client: MuralPay,
     ) {
         use BackgroundTask::*;
         match self {
@@ -44,6 +47,9 @@ impl BackgroundTask {
             ReleaseScheduled => release_scheduled(pool).await,
             UpdateVersions => update_versions(pool, redis_pool).await,
             Payouts => payouts(pool, clickhouse, redis_pool).await,
+            SyncPayoutStatuses => {
+                sync_payout_statuses(pool, mural_client).await
+            }
             IndexBilling => {
                 index_billing(
                     stripe_client,
@@ -190,6 +196,31 @@ pub async fn payouts(
     info!("Done running payouts");
 }
 
+pub async fn sync_payout_statuses(pool: sqlx::Pool<Postgres>, mural: MuralPay) {
+    const LIMIT: u32 = 1000;
+
+    info!("Started syncing payout statuses");
+
+    let result = crate::queue::payouts::mural::sync_pending_payouts_from_mural(
+        &pool, &mural, LIMIT,
+    )
+    .await;
+    if let Err(e) = result {
+        warn!("Failed to sync pending payouts from Mural: {e:?}");
+    }
+
+    let result =
+        crate::queue::payouts::mural::sync_failed_mural_payouts_to_labrinth(
+            &pool, &mural, LIMIT,
+        )
+        .await;
+    if let Err(e) = result {
+        warn!("Failed to sync failed Mural payouts to Labrinth: {e:?}");
+    }
+
+    info!("Done syncing payout statuses");
+}
+
 mod version_updater {
     use std::sync::LazyLock;
 
diff --git a/apps/labrinth/src/main.rs b/apps/labrinth/src/main.rs
index a02e8bd2..f3cab342 100644
--- a/apps/labrinth/src/main.rs
+++ b/apps/labrinth/src/main.rs
@@ -155,6 +155,8 @@ async fn main() -> std::io::Result<()> {
 
     let gotenberg_client = GotenbergClient::from_env(redis_pool.clone())
         .expect("Failed to create Gotenberg client");
+    let muralpay = labrinth::queue::payouts::create_muralpay_client()
+        .expect("Failed to create MuralPay client");
 
     if let Some(task) = args.run_background_task {
         info!("Running task {task:?} and exiting");
@@ -166,6 +168,7 @@ async fn main() -> std::io::Result<()> {
             stripe_client,
             anrok_client.clone(),
             email_queue,
+            muralpay,
         )
         .await;
         return Ok(());
diff --git a/apps/labrinth/src/models/v3/payouts.rs b/apps/labrinth/src/models/v3/payouts.rs
index 46af53f6..d56edb18 100644
--- a/apps/labrinth/src/models/v3/payouts.rs
+++ b/apps/labrinth/src/models/v3/payouts.rs
@@ -175,9 +175,18 @@ impl PayoutMethodType {
 }
 
 #[derive(
-    Serialize, Deserialize, Copy, Clone, Eq, PartialEq, Debug, utoipa::ToSchema,
+    Serialize,
+    Deserialize,
+    Copy,
+    Clone,
+    Eq,
+    PartialEq,
+    Debug,
+    utoipa::ToSchema,
+    sqlx::Type,
 )]
 #[serde(rename_all = "kebab-case")]
+#[sqlx(rename_all = "kebab-case")]
 pub enum PayoutStatus {
     Success,
     InTransit,
diff --git a/apps/labrinth/src/queue/payouts/mod.rs b/apps/labrinth/src/queue/payouts/mod.rs
index 44d96f2b..5fd3fb75 100644
--- a/apps/labrinth/src/queue/payouts/mod.rs
+++ b/apps/labrinth/src/queue/payouts/mod.rs
@@ -71,16 +71,19 @@ impl Default for PayoutsQueue {
     }
 }
 
-fn create_muralpay() -> Result<MuralPayConfig> {
+pub fn create_muralpay_client() -> Result<MuralPay> {
     let api_url = env_var("MURALPAY_API_URL")?;
     let api_key = env_var("MURALPAY_API_KEY")?;
     let transfer_api_key = env_var("MURALPAY_TRANSFER_API_KEY")?;
+    Ok(MuralPay::new(api_url, api_key, Some(transfer_api_key)))
+}
+
+pub fn create_muralpay() -> Result<MuralPayConfig> {
+    let client = create_muralpay_client()?;
     let source_account_id = env_var("MURALPAY_SOURCE_ACCOUNT_ID")?
         .parse::<muralpay::AccountId>()
         .wrap_err("failed to parse source account ID")?;
 
-    let client = MuralPay::new(api_url, api_key, Some(transfer_api_key));
-
     Ok(MuralPayConfig {
         client,
         source_account_id,
diff --git a/apps/labrinth/src/queue/payouts/mural.rs b/apps/labrinth/src/queue/payouts/mural.rs
index 2bb719ca..a5f44d7c 100644
--- a/apps/labrinth/src/queue/payouts/mural.rs
+++ b/apps/labrinth/src/queue/payouts/mural.rs
@@ -1,12 +1,16 @@
 use ariadne::ids::UserId;
 use chrono::Utc;
 use eyre::{Result, eyre};
-use muralpay::{MuralError, TokenFeeRequest};
+use futures::{StreamExt, TryFutureExt, stream::FuturesUnordered};
+use muralpay::{MuralError, MuralPay, TokenFeeRequest};
 use rust_decimal::{Decimal, prelude::ToPrimitive};
 use serde::{Deserialize, Serialize};
+use sqlx::PgPool;
+use tracing::warn;
 
 use crate::{
     database::models::DBPayoutId,
+    models::payouts::{PayoutMethodType, PayoutStatus},
     queue::payouts::{AccountBalance, PayoutFees, PayoutsQueue},
     routes::ApiError,
     util::{
@@ -73,7 +77,7 @@ impl PayoutsQueue {
             .wrap_internal_err("Mural Pay client not available")?;
 
         let payout_details = match payout_details {
-            MuralPayoutRequest::Fiat {
+            crate::queue::payouts::mural::MuralPayoutRequest::Fiat {
                 bank_name,
                 bank_account_owner,
                 fiat_and_rail_details,
@@ -83,7 +87,9 @@ impl PayoutsQueue {
                 developer_fee: None,
                 fiat_and_rail_details,
             },
-            MuralPayoutRequest::Blockchain { wallet_address } => {
+            crate::queue::payouts::mural::MuralPayoutRequest::Blockchain {
+                wallet_address,
+            } => {
                 muralpay::CreatePayoutDetails::Blockchain {
                     wallet_details: muralpay::WalletDetails {
                         // only Polygon chain is currently supported
@@ -251,3 +257,555 @@ impl PayoutsQueue {
         }))
     }
 }
+
+/// Finds Labrinth payouts which are not complete, fetches their corresponding
+/// Mural state, and updates the payout status.
+pub async fn sync_pending_payouts_from_mural(
+    db: &PgPool,
+    mural: &MuralPay,
+    limit: u32,
+) -> eyre::Result<()> {
+    #[derive(Debug)]
+    struct UpdatePayoutOp {
+        payout_id: i64,
+        status: PayoutStatus,
+    }
+
+    let mut txn = db
+        .begin()
+        .await
+        .wrap_internal_err("failed to begin transaction")?;
+
+    let rows = sqlx::query!(
+        "
+        SELECT id, platform_id FROM payouts
+        WHERE
+            method = $1
+            AND status = ANY($2::text[])
+        LIMIT $3
+        ",
+        &PayoutMethodType::MuralPay.to_string(),
+        &[
+            PayoutStatus::InTransit,
+            PayoutStatus::Unknown,
+            PayoutStatus::Cancelling
+        ]
+        .iter()
+        .map(|s| s.to_string())
+        .collect::<Vec<String>>(),
+        i64::from(limit),
+    )
+    .fetch_all(&mut *txn)
+    .await
+    .wrap_internal_err("failed to fetch incomplete Mural payouts")?;
+
+    let futs = rows.into_iter().map(|row| async move {
+        let platform_id = row.platform_id.wrap_err("no platform ID")?;
+        let payout_request_id = platform_id.parse::<muralpay::PayoutRequestId>()
+            .wrap_err_with(|| eyre!("platform ID '{platform_id:?}' is not a valid payout request ID"))?;
+        let payout_request = mural.get_payout_request(payout_request_id).await
+            .wrap_err_with(|| eyre!("failed to fetch payout request {payout_request_id}"))?;
+
+        let new_payout_status = match payout_request.status {
+            muralpay::PayoutStatus::Canceled => Some(PayoutStatus::Cancelled),
+            muralpay::PayoutStatus::Executed => Some(PayoutStatus::Success),
+            muralpay::PayoutStatus::Failed => Some(PayoutStatus::Failed),
+            _ => None,
+        };
+
+        if let Some(status) = new_payout_status {
+            eyre::Ok(Some(UpdatePayoutOp {
+                payout_id: row.id,
+                status
+            }))
+        } else {
+            eyre::Ok(None)
+        }
+    }.map_err(move |err| eyre!(err).wrap_err(eyre!("failed to update payout with ID '{}'", row.id))));
+    let mut futs = futs.collect::<FuturesUnordered<_>>();
+
+    let mut payout_ids = Vec::<i64>::new();
+    let mut payout_statuses = Vec::<String>::new();
+
+    while let Some(result) = futs.next().await {
+        let op = match result {
+            Ok(Some(op)) => op,
+            Ok(None) => continue,
+            Err(err) => {
+                warn!("Failed to update payout: {err:#?}");
+                continue;
+            }
+        };
+
+        payout_ids.push(op.payout_id);
+        payout_statuses.push(op.status.to_string());
+    }
+
+    sqlx::query!(
+        "
+        UPDATE payouts
+        SET status = u.status
+        FROM UNNEST($1::bigint[], $2::varchar[]) AS u(id, status)
+        WHERE payouts.id = u.id
+        ",
+        &payout_ids,
+        &payout_statuses,
+    )
+    .execute(&mut *txn)
+    .await
+    .wrap_internal_err("failed to update payout statuses")?;
+
+    txn.commit()
+        .await
+        .wrap_internal_err("failed to commit transaction")?;
+
+    Ok(())
+}
+
+/// Queries Mural for canceled or failed payouts, and updates the corresponding
+/// Labrinth payouts' statuses.
+pub async fn sync_failed_mural_payouts_to_labrinth(
+    db: &PgPool,
+    mural: &MuralPay,
+    limit: u32,
+) -> eyre::Result<()> {
+    let mut next_id = None;
+    loop {
+        let search_resp = mural
+            .search_payout_requests(
+                Some(muralpay::PayoutStatusFilter::PayoutStatus {
+                    statuses: vec![
+                        muralpay::PayoutStatus::Canceled,
+                        muralpay::PayoutStatus::Failed,
+                    ],
+                }),
+                Some(muralpay::SearchParams {
+                    limit: Some(u64::from(limit)),
+                    next_id,
+                }),
+            )
+            .await
+            .wrap_internal_err(
+                "failed to fetch failed payout requests from Mural",
+            )?;
+        next_id = search_resp.next_id;
+        if search_resp.results.is_empty() {
+            break;
+        }
+
+        let mut payout_platform_id = Vec::<String>::new();
+        let mut payout_new_status = Vec::<String>::new();
+
+        for payout_req in search_resp.results {
+            let new_payout_status = match payout_req.status {
+                muralpay::PayoutStatus::Canceled => PayoutStatus::Cancelled,
+                muralpay::PayoutStatus::Failed => PayoutStatus::Failed,
+                _ => {
+                    warn!(
+                        "Found payout {} with status {:?}, which should have been filtered out by our Mural request - Mural bug",
+                        payout_req.id, payout_req.status
+                    );
+                    continue;
+                }
+            };
+
+            payout_platform_id.push(payout_req.id.to_string());
+            payout_new_status.push(new_payout_status.to_string());
+        }
+
+        sqlx::query!(
+            "
+            UPDATE payouts
+            SET status = u.status
+            FROM UNNEST($1::text[], $2::text[]) AS u(platform_id, status)
+            WHERE
+                payouts.method = $3
+                AND payouts.platform_id = u.platform_id
+            ",
+            &payout_platform_id,
+            &payout_new_status,
+            PayoutMethodType::MuralPay.as_str(),
+        )
+        .execute(db)
+        .await
+        .wrap_internal_err("failed to update payout statuses")?;
+
+        if next_id.is_none() {
+            break;
+        }
+    }
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::test::{
+        api_v3::ApiV3,
+        environment::{TestEnvironment, with_test_environment},
+    };
+    use muralpay::MuralPay;
+    use muralpay::mock::MuralPayMock;
+
+    fn create_mock_payout_request(
+        id: &str,
+        status: muralpay::PayoutStatus,
+    ) -> muralpay::PayoutRequest {
+        use muralpay::*;
+
+        PayoutRequest {
+            id: PayoutRequestId(id.parse().unwrap()),
+            created_at: chrono::Utc::now(),
+            updated_at: chrono::Utc::now(),
+            source_account_id: AccountId(uuid::Uuid::new_v4()),
+            transaction_hash: None,
+            memo: None,
+            status,
+            payouts: vec![],
+        }
+    }
+
+    fn create_mock_muralpay() -> MuralPay {
+        MuralPay::from_mock(MuralPayMock {
+            get_payout_request: Box::new(|_id| {
+                Err(muralpay::MuralError::Api(muralpay::ApiError {
+                    error_instance_id: uuid::Uuid::new_v4(),
+                    name: "Not found".to_string(),
+                    message: "Payout request not found".to_string(),
+                    details: vec![],
+                    params: std::collections::HashMap::new(),
+                }))
+            }),
+            search_payout_requests: Box::new(|_filter, _params| {
+                Ok(muralpay::SearchResponse {
+                    total: 0,
+                    next_id: None,
+                    results: vec![],
+                })
+            }),
+            ..Default::default()
+        })
+    }
+
+    async fn setup_test_db_with_payouts(
+        db: &sqlx::PgPool,
+        payouts: Vec<(i64, String, PayoutStatus)>,
+    ) -> Result<(), eyre::Error> {
+        for (id, platform_id, status) in payouts {
+            sqlx::query!(
+                "
+                INSERT INTO payouts (id, method, platform_id, status, user_id, amount, created)
+                VALUES ($1, $2, $3, $4, $5, 10.0, NOW())
+                ",
+                id,
+                PayoutMethodType::MuralPay.as_str(),
+                platform_id,
+                status.as_str(),
+                1i64, // user_id
+            )
+            .execute(db)
+            .await?;
+        }
+        Ok(())
+    }
+
+    #[actix_rt::test]
+    async fn test_sync_pending_payouts_from_mural_success() {
+        with_test_environment(None, |env: TestEnvironment<ApiV3>| async move {
+            let db = &env.db.pool;
+
+            // Setup test data
+            let uuid1 = uuid::Uuid::new_v4().to_string();
+            let uuid2 = uuid::Uuid::new_v4().to_string();
+            let uuid3 = uuid::Uuid::new_v4().to_string();
+            let uuid4 = uuid::Uuid::new_v4().to_string();
+
+            setup_test_db_with_payouts(
+                db,
+                vec![
+                    (1, uuid1.clone(), PayoutStatus::InTransit),
+                    (2, uuid2.clone(), PayoutStatus::Unknown),
+                    (3, uuid3.clone(), PayoutStatus::Cancelling),
+                    (4, uuid4.clone(), PayoutStatus::InTransit), // This one won't change
+                ],
+            )
+            .await
+            .unwrap();
+
+            // Verify setup
+            let updated_payouts = sqlx::query!(
+                r#"
+                SELECT
+                    id,
+                    status AS "status: PayoutStatus"
+                FROM payouts
+                ORDER BY id
+                "#
+            )
+            .fetch_all(db)
+            .await
+            .unwrap();
+            assert_eq!(updated_payouts.len(), 4);
+            assert_eq!(updated_payouts[0].status, PayoutStatus::InTransit);
+            assert_eq!(updated_payouts[1].status, PayoutStatus::Unknown);
+            assert_eq!(updated_payouts[2].status, PayoutStatus::Cancelling);
+            assert_eq!(updated_payouts[3].status, PayoutStatus::InTransit);
+
+            // Setup mock client with proper responses
+            let mut mock = MuralPayMock::default();
+
+            // Create mock payout requests
+            let payout1 = create_mock_payout_request(
+                &uuid1,
+                muralpay::PayoutStatus::Executed,
+            );
+            let payout2 = create_mock_payout_request(
+                &uuid2,
+                muralpay::PayoutStatus::Canceled,
+            );
+            let payout3 = create_mock_payout_request(
+                &uuid3,
+                muralpay::PayoutStatus::Failed,
+            );
+            let payout4 = create_mock_payout_request(
+                &uuid4,
+                muralpay::PayoutStatus::Pending,
+            );
+
+            // Mock get_payout_request
+            let payout_requests = std::collections::HashMap::from([
+                (uuid1.clone(), payout1.clone()),
+                (uuid2.clone(), payout2.clone()),
+                (uuid3.clone(), payout3.clone()),
+                (uuid4.clone(), payout4.clone()),
+            ]);
+
+            mock.get_payout_request = Box::new(move |id| {
+                let id_str = id.to_string();
+                match payout_requests.get(&id_str) {
+                    Some(request) => Ok(request.clone()),
+                    None => {
+                        Err(muralpay::MuralError::Api(muralpay::ApiError {
+                            error_instance_id: uuid::Uuid::new_v4(),
+                            name: "Not found".to_string(),
+                            message: "Payout request not found".to_string(),
+                            details: vec![],
+                            params: std::collections::HashMap::new(),
+                        }))
+                    }
+                }
+            });
+
+            // Mock search_payout_requests
+            mock.search_payout_requests = Box::new(move |_filter, _params| {
+                Ok(muralpay::SearchResponse {
+                    total: 4,
+                    results: vec![
+                        payout1.clone(),
+                        payout2.clone(),
+                        payout3.clone(),
+                        payout4.clone(),
+                    ],
+                    next_id: None,
+                })
+            });
+
+            let mock_client = MuralPay::from_mock(mock);
+
+            // Run the function
+            let result =
+                sync_pending_payouts_from_mural(db, &mock_client, 10).await;
+            assert!(result.is_ok());
+
+            // Verify results
+            let updated_payouts = sqlx::query!(
+                r#"
+                SELECT
+                    id,
+                    status AS "status: PayoutStatus"
+                FROM payouts
+                ORDER BY id
+                "#
+            )
+            .fetch_all(db)
+            .await
+            .unwrap();
+            assert_eq!(updated_payouts.len(), 4);
+            assert_eq!(updated_payouts[0].status, PayoutStatus::Success);
+            assert_eq!(updated_payouts[1].status, PayoutStatus::Cancelled);
+            assert_eq!(updated_payouts[2].status, PayoutStatus::Failed);
+            assert_eq!(updated_payouts[3].status, PayoutStatus::InTransit);
+        })
+        .await;
+    }
+
+    #[actix_rt::test]
+    async fn test_sync_pending_payouts_from_mural_handles_missing_platform_id()
+    {
+        with_test_environment(None, |env: TestEnvironment<ApiV3>| async move {
+            let db = &env.db.pool;
+
+            // Setup test data with null platform_id
+            sqlx::query!(
+                    "
+                    INSERT INTO payouts (id, method, platform_id, status, user_id, amount, created)
+                    VALUES ($1, $2, NULL, $3, $4, 10.00, NOW())
+                    ",
+                    1,
+                    PayoutMethodType::MuralPay.as_str(),
+                    PayoutStatus::InTransit.as_str(),
+                    1i64, // user_id
+                )
+                .execute(db)
+                .await
+                .unwrap();
+
+            let mock_client = create_mock_muralpay();
+
+            // Run the function - should not fail even with null platform_id
+            sync_pending_payouts_from_mural(
+                db,
+                &mock_client,
+                10,
+            )
+            .await.unwrap();
+        }).await;
+    }
+
+    #[actix_rt::test]
+    async fn test_sync_failed_mural_payouts_to_labrinth_success() {
+        with_test_environment(None, |env: TestEnvironment<ApiV3>| async move {
+            let db = &env.db.pool;
+
+            // Setup test data
+            let uuid1 = uuid::Uuid::new_v4().to_string();
+            let uuid2 = uuid::Uuid::new_v4().to_string();
+            let uuid3 = uuid::Uuid::new_v4().to_string();
+
+            setup_test_db_with_payouts(
+                db,
+                vec![
+                    (1, uuid1.clone(), PayoutStatus::InTransit), // Will be updated to cancelled
+                    (2, uuid2.clone(), PayoutStatus::Success), // Will be updated to failed
+                    (3, uuid3.clone(), PayoutStatus::Success), // Will remain unchanged
+                ],
+            )
+            .await
+            .unwrap();
+
+            // Setup mock client
+            let mut mock = MuralPayMock::default();
+
+            // Create mock payout requests
+            let payout1 = create_mock_payout_request(
+                &uuid1,
+                muralpay::PayoutStatus::Canceled,
+            );
+            let payout2 = create_mock_payout_request(
+                &uuid2,
+                muralpay::PayoutStatus::Failed,
+            );
+            let payout3 = create_mock_payout_request(
+                &uuid::Uuid::new_v4().to_string(),
+                muralpay::PayoutStatus::Failed,
+            ); // No matching DB record
+
+            // Mock search_payout_requests
+            mock.search_payout_requests = Box::new(move |_filter, _params| {
+                Ok(muralpay::SearchResponse {
+                    total: 3,
+                    results: vec![
+                        payout1.clone(),
+                        payout2.clone(),
+                        payout3.clone(),
+                    ],
+                    next_id: None,
+                })
+            });
+
+            let mock_client = MuralPay::from_mock(mock);
+
+            // Run the function
+            let result =
+                sync_failed_mural_payouts_to_labrinth(db, &mock_client, 10)
+                    .await;
+            assert!(result.is_ok());
+
+            // Verify results
+            let updated_payouts = sqlx::query!(
+                r#"
+                SELECT
+                    id,
+                    status AS "status: PayoutStatus"
+                FROM payouts
+                ORDER BY id
+                "#
+            )
+            .fetch_all(db)
+            .await
+            .unwrap();
+
+            assert_eq!(updated_payouts.len(), 3);
+            assert_eq!(updated_payouts[0].status, PayoutStatus::Cancelled); // search_req_1 -> canceled
+            assert_eq!(updated_payouts[1].status, PayoutStatus::Failed); // search_req_2 -> failed
+            assert_eq!(updated_payouts[2].status, PayoutStatus::Success); // search_req_3 unchanged
+        })
+        .await;
+    }
+
+    #[actix_rt::test]
+    async fn test_sync_failed_mural_payouts_to_labrinth_handles_wrong_status() {
+        with_test_environment(None, |env: TestEnvironment<ApiV3>| async move {
+            let db = &env.db.pool;
+
+            // Setup test data
+            let uuid1 = uuid::Uuid::new_v4().to_string();
+
+            setup_test_db_with_payouts(
+                db,
+                vec![(1, uuid1.clone(), PayoutStatus::InTransit)],
+            )
+            .await
+            .unwrap();
+
+            // Setup mock client with a payout that has unexpected status
+            let mut mock = MuralPayMock::default();
+
+            let payout1 = create_mock_payout_request(
+                &uuid1,
+                muralpay::PayoutStatus::Pending,
+            ); // Should be filtered out
+
+            // Mock search_payout_requests
+            mock.search_payout_requests = Box::new(move |_filter, _params| {
+                Ok(muralpay::SearchResponse {
+                    total: 1,
+                    results: vec![payout1.clone()],
+                    next_id: None,
+                })
+            });
+
+            let mock_client = MuralPay::from_mock(mock);
+
+            // Run the function - should handle this gracefully
+            sync_failed_mural_payouts_to_labrinth(
+                db,
+                &mock_client,
+                10,
+            )
+            .await
+            .unwrap();
+
+            // Verify status remains unchanged
+            let payout =
+                sqlx::query!(r#"SELECT status AS "status: PayoutStatus" FROM payouts WHERE id = 1"#)
+                    .fetch_one(db)
+                    .await
+                    .unwrap();
+
+            assert_eq!(payout.status, PayoutStatus::InTransit); // Unchanged
+        })
+        .await;
+    }
+}
diff --git a/apps/labrinth/src/routes/v3/payouts.rs b/apps/labrinth/src/routes/v3/payouts.rs
index 3a33f771..7cf4319e 100644
--- a/apps/labrinth/src/routes/v3/payouts.rs
+++ b/apps/labrinth/src/routes/v3/payouts.rs
@@ -822,7 +822,9 @@ async fn mural_pay_payout(
         id: payout_id,
         user_id: user.id,
         created: Utc::now(),
-        status: PayoutStatus::Success,
+        // after the payout has been successfully executed,
+        // we wait for Mural's confirmation that the funds have been delivered
+        status: PayoutStatus::InTransit,
         amount: amount_minus_fee,
         fee: Some(total_fee),
         method: Some(PayoutMethodType::MuralPay),
diff --git a/packages/muralpay/Cargo.toml b/packages/muralpay/Cargo.toml
index 91d61c25..35466bd0 100644
--- a/packages/muralpay/Cargo.toml
+++ b/packages/muralpay/Cargo.toml
@@ -9,6 +9,7 @@ keywords = []
 categories = ["api-bindings"]
 
 [dependencies]
+arc-swap = { workspace = true, optional = true }
 bytes = { workspace = true }
 chrono = { workspace = true, features = ["serde"] }
 derive_more = { workspace = true, features = [
@@ -37,6 +38,7 @@ tokio = { workspace = true, features = ["full"] }
 tracing-subscriber = { workspace = true }
 
 [features]
+mock = ["dep:arc-swap"]
 utoipa = ["dep:utoipa"]
 
 [lints]
diff --git a/packages/muralpay/src/account.rs b/packages/muralpay/src/account.rs
index 4ec40fca..f0a91153 100644
--- a/packages/muralpay/src/account.rs
+++ b/packages/muralpay/src/account.rs
@@ -14,6 +14,8 @@ use crate::{
 
 impl MuralPay {
     pub async fn get_all_accounts(&self) -> Result<Vec<Account>, MuralError> {
+        mock!(self, get_all_accounts());
+
         self.http_get(|base| format!("{base}/api/accounts"))
             .send_mural()
             .await
@@ -23,6 +25,8 @@ impl MuralPay {
         &self,
         id: AccountId,
     ) -> Result<Account, MuralError> {
+        mock!(self, get_account(id));
+
         self.http_get(|base| format!("{base}/api/accounts/{id}"))
             .send_mural()
             .await
@@ -33,6 +37,14 @@ impl MuralPay {
         name: impl AsRef<str>,
         description: Option<impl AsRef<str>>,
     ) -> Result<Account, MuralError> {
+        mock!(
+            self,
+            create_account(
+                name.as_ref(),
+                description.as_ref().map(|x| x.as_ref()),
+            )
+        );
+
         #[derive(Debug, Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Body<'a> {
diff --git a/packages/muralpay/src/counterparty.rs b/packages/muralpay/src/counterparty.rs
index 84c20e47..a53bd72b 100644
--- a/packages/muralpay/src/counterparty.rs
+++ b/packages/muralpay/src/counterparty.rs
@@ -14,6 +14,8 @@ impl MuralPay {
         &self,
         params: Option<SearchParams<CounterpartyId>>,
     ) -> Result<SearchResponse<CounterpartyId, Counterparty>, MuralError> {
+        mock!(self, search_counterparties(params));
+
         self.http_post(|base| format!("{base}/api/counterparties/search"))
             .query(&params.map(|p| p.to_query()).unwrap_or_default())
             .send_mural()
@@ -24,6 +26,8 @@ impl MuralPay {
         &self,
         id: CounterpartyId,
     ) -> Result<Counterparty, MuralError> {
+        mock!(self, get_counterparty(id));
+
         self.http_get(|base| {
             format!("{base}/api/counterparties/counterparty/{id}")
         })
@@ -35,6 +39,8 @@ impl MuralPay {
         &self,
         counterparty: &CreateCounterparty,
     ) -> Result<Counterparty, MuralError> {
+        mock!(self, create_counterparty(counterparty));
+
         #[derive(Debug, Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Body<'a> {
@@ -54,6 +60,8 @@ impl MuralPay {
         id: CounterpartyId,
         counterparty: &UpdateCounterparty,
     ) -> Result<Counterparty, MuralError> {
+        mock!(self, update_counterparty(id, counterparty));
+
         #[derive(Debug, Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Body<'a> {
diff --git a/packages/muralpay/src/lib.rs b/packages/muralpay/src/lib.rs
index 8f8fd398..4d38f924 100644
--- a/packages/muralpay/src/lib.rs
+++ b/packages/muralpay/src/lib.rs
@@ -1,5 +1,14 @@
 #![doc = include_str!("../README.md")]
 
+macro_rules! mock {
+    ($self:expr, $fn:ident ( $($args:expr),* $(,)? )) => {
+        #[cfg(feature = "mock")]
+        if let Some(mock) = &*($self).mock.load() {
+            return (mock.$fn)($($args),*);
+        }
+    };
+}
+
 mod account;
 mod counterparty;
 mod error;
@@ -9,6 +18,9 @@ mod payout_method;
 mod serde_iso3166;
 mod util;
 
+#[cfg(feature = "mock")]
+pub mod mock;
+
 pub use {
     account::*, counterparty::*, error::*, organization::*, payout::*,
     payout_method::*,
@@ -32,6 +44,8 @@ pub struct MuralPay {
     pub api_url: String,
     pub api_key: SecretString,
     pub transfer_api_key: Option<SecretString>,
+    #[cfg(feature = "mock")]
+    mock: arc_swap::ArcSwapOption<mock::MuralPayMock>,
 }
 
 impl MuralPay {
@@ -45,6 +59,21 @@ impl MuralPay {
             api_url: api_url.into(),
             api_key: api_key.into(),
             transfer_api_key: transfer_api_key.map(Into::into),
+            #[cfg(feature = "mock")]
+            mock: arc_swap::ArcSwapOption::empty(),
+        }
+    }
+
+    /// Creates a client which mocks responses.
+    #[cfg(feature = "mock")]
+    #[must_use]
+    pub fn from_mock(mock: mock::MuralPayMock) -> Self {
+        Self {
+            http: reqwest::Client::new(),
+            api_url: "".into(),
+            api_key: SecretString::from(String::new()),
+            transfer_api_key: None,
+            mock: arc_swap::ArcSwapOption::from_pointee(mock),
         }
     }
 }
diff --git a/packages/muralpay/src/mock.rs b/packages/muralpay/src/mock.rs
new file mode 100644
index 00000000..e3761cfd
--- /dev/null
+++ b/packages/muralpay/src/mock.rs
@@ -0,0 +1,65 @@
+//! See [`MuralPayMock`].
+
+use std::fmt::{self, Debug};
+
+use crate::{
+    Account, AccountId, BankDetailsResponse, Counterparty, CounterpartyId,
+    CreateCounterparty, CreatePayout, FiatAndRailCode, FiatFeeRequest,
+    FiatPayoutFee, MuralError, Organization, OrganizationId, PayoutMethod,
+    PayoutMethodDetails, PayoutMethodId, PayoutRequest, PayoutRequestId,
+    PayoutStatusFilter, SearchParams, SearchRequest, SearchResponse,
+    TokenFeeRequest, TokenPayoutFee, TransferError, UpdateCounterparty,
+};
+
+macro_rules! impl_mock {
+    (
+        $(fn $fn:ident ( $( $ty:ty ),* ) -> $ret:ty);* $(;)?
+    ) => {
+        /// Mock data returned by [`crate::MuralPay`].
+        pub struct MuralPayMock {
+            $(
+            pub $fn: Box<dyn Fn($($ty),*) -> $ret + Send + Sync>,
+            )*
+        }
+
+        impl Default for MuralPayMock {
+            fn default() -> Self {
+                Self {
+                    $(
+                    $fn: Box::new(|$(_: $ty),*| panic!("missing mock for `{}`", stringify!($fn))),
+                    )*
+                }
+            }
+        }
+    };
+}
+
+impl_mock! {
+    fn get_all_accounts() -> Result<Vec<Account>, MuralError>;
+    fn get_account(AccountId) -> Result<Account, MuralError>;
+    fn create_account(&str, Option<&str>) -> Result<Account, MuralError>;
+    fn search_payout_requests(Option<PayoutStatusFilter>, Option<SearchParams<PayoutRequestId>>) -> Result<SearchResponse<PayoutRequestId, PayoutRequest>, MuralError>;
+    fn get_payout_request(PayoutRequestId) -> Result<PayoutRequest, MuralError>;
+    fn get_fees_for_token_amount(&[TokenFeeRequest]) -> Result<Vec<TokenPayoutFee>, MuralError>;
+    fn get_fees_for_fiat_amount(&[FiatFeeRequest]) -> Result<Vec<FiatPayoutFee>, MuralError>;
+    fn create_payout_request(AccountId, Option<&str>, &[CreatePayout]) -> Result<PayoutRequest, MuralError>;
+    fn execute_payout_request(PayoutRequestId) -> Result<PayoutRequest, TransferError>;
+    fn cancel_payout_request(PayoutRequestId) -> Result<PayoutRequest, TransferError>;
+    fn get_bank_details(&[FiatAndRailCode]) -> Result<BankDetailsResponse, MuralError>;
+    fn search_payout_methods(CounterpartyId, Option<SearchParams<PayoutMethodId>>) -> Result<SearchResponse<PayoutMethodId, PayoutMethod>, MuralError>;
+    fn get_payout_method(CounterpartyId, PayoutMethodId) -> Result<PayoutMethod, MuralError>;
+    fn create_payout_method(CounterpartyId, &str, &PayoutMethodDetails) -> Result<PayoutMethod, MuralError>;
+    fn delete_payout_method(CounterpartyId, PayoutMethodId) -> Result<(), MuralError>;
+    fn search_organizations(SearchRequest) -> Result<SearchResponse<OrganizationId, Organization>, MuralError>;
+    fn get_organization(OrganizationId) -> Result<Organization, MuralError>;
+    fn search_counterparties(Option<SearchParams<CounterpartyId>>) -> Result<SearchResponse<CounterpartyId, Counterparty>, MuralError>;
+    fn get_counterparty(CounterpartyId) -> Result<Counterparty, MuralError>;
+    fn create_counterparty(&CreateCounterparty) -> Result<Counterparty, MuralError>;
+    fn update_counterparty(CounterpartyId, &UpdateCounterparty) -> Result<Counterparty, MuralError>;
+}
+
+impl Debug for MuralPayMock {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("MuralPayMock").finish_non_exhaustive()
+    }
+}
diff --git a/packages/muralpay/src/organization.rs b/packages/muralpay/src/organization.rs
index 811aca7b..b8e1c009 100644
--- a/packages/muralpay/src/organization.rs
+++ b/packages/muralpay/src/organization.rs
@@ -15,6 +15,8 @@ impl MuralPay {
         &self,
         req: SearchRequest,
     ) -> Result<SearchResponse<OrganizationId, Organization>, MuralError> {
+        mock!(self, search_organizations(req.clone()));
+
         #[derive(Debug, Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Body {
@@ -64,6 +66,8 @@ impl MuralPay {
         &self,
         id: OrganizationId,
     ) -> Result<Organization, MuralError> {
+        mock!(self, get_organization(id));
+
         self.http_post(|base| format!("{base}/api/organizations/{id}"))
             .send_mural()
             .await
diff --git a/packages/muralpay/src/payout.rs b/packages/muralpay/src/payout.rs
index 876a1870..f6423f2e 100644
--- a/packages/muralpay/src/payout.rs
+++ b/packages/muralpay/src/payout.rs
@@ -29,6 +29,8 @@ impl MuralPay {
         params: Option<SearchParams<PayoutRequestId>>,
     ) -> Result<SearchResponse<PayoutRequestId, PayoutRequest>, MuralError>
     {
+        mock!(self, search_payout_requests(filter, params));
+
         #[derive(Debug, Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Body {
@@ -50,6 +52,8 @@ impl MuralPay {
         &self,
         id: PayoutRequestId,
     ) -> Result<PayoutRequest, MuralError> {
+        mock!(self, get_payout_request(id));
+
         self.http_get(|base| format!("{base}/api/payouts/payout/{id}"))
             .send_mural()
             .await
@@ -59,6 +63,8 @@ impl MuralPay {
         &self,
         token_fee_requests: &[TokenFeeRequest],
     ) -> Result<Vec<TokenPayoutFee>, MuralError> {
+        mock!(self, get_fees_for_token_amount(token_fee_requests));
+
         #[derive(Debug, Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Body<'a> {
@@ -77,6 +83,8 @@ impl MuralPay {
         &self,
         fiat_fee_requests: &[FiatFeeRequest],
     ) -> Result<Vec<FiatPayoutFee>, MuralError> {
+        mock!(self, get_fees_for_fiat_amount(fiat_fee_requests));
+
         #[derive(Debug, Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Body<'a> {
@@ -97,6 +105,8 @@ impl MuralPay {
         memo: Option<impl AsRef<str>>,
         payouts: &[CreatePayout],
     ) -> Result<PayoutRequest, MuralError> {
+        mock!(self, create_payout_request(source_account_id, memo.as_ref().map(|x| x.as_ref()), payouts));
+
         #[derive(Debug, Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Body<'a> {
@@ -121,6 +131,8 @@ impl MuralPay {
         &self,
         id: PayoutRequestId,
     ) -> Result<PayoutRequest, TransferError> {
+        mock!(self, execute_payout_request(id));
+
         self.http_post(|base| format!("{base}/api/payouts/payout/{id}/execute"))
             .transfer_auth(self)?
             .send_mural()
@@ -132,6 +144,8 @@ impl MuralPay {
         &self,
         id: PayoutRequestId,
     ) -> Result<PayoutRequest, TransferError> {
+        mock!(self, cancel_payout_request(id));
+
         self.http_post(|base| format!("{base}/api/payouts/payout/{id}/cancel"))
             .transfer_auth(self)?
             .send_mural()
@@ -143,6 +157,8 @@ impl MuralPay {
         &self,
         fiat_currency_and_rail: &[FiatAndRailCode],
     ) -> Result<BankDetailsResponse, MuralError> {
+        mock!(self, get_bank_details(fiat_currency_and_rail));
+
         let query = fiat_currency_and_rail
             .iter()
             .map(|code| ("fiatCurrencyAndRail", code.to_string()))
@@ -207,7 +223,7 @@ impl FromStr for PayoutId {
 #[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[serde(tag = "type", rename_all = "camelCase")]
 pub enum PayoutStatusFilter {
-    PayoutStatus { statuses: Vec<String> },
+    PayoutStatus { statuses: Vec<PayoutStatus> },
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
diff --git a/packages/muralpay/src/payout_method.rs b/packages/muralpay/src/payout_method.rs
index 1a451b4c..cf556274 100644
--- a/packages/muralpay/src/payout_method.rs
+++ b/packages/muralpay/src/payout_method.rs
@@ -19,6 +19,8 @@ impl MuralPay {
         counterparty_id: CounterpartyId,
         params: Option<SearchParams<PayoutMethodId>>,
     ) -> Result<SearchResponse<PayoutMethodId, PayoutMethod>, MuralError> {
+        mock!(self, search_payout_methods(counterparty_id, params));
+
         self.http_post(|base| {
             format!(
                 "{base}/api/counterparties/{counterparty_id}/payout-methods/search"
@@ -34,6 +36,8 @@ impl MuralPay {
         counterparty_id: CounterpartyId,
         payout_method_id: PayoutMethodId,
     ) -> Result<PayoutMethod, MuralError> {
+        mock!(self, get_payout_method(counterparty_id, payout_method_id));
+
         self.http_get(|base| format!("{base}/api/counterparties/{counterparty_id}/payout-methods/{payout_method_id}"))
             .send_mural()
             .await
@@ -45,6 +49,8 @@ impl MuralPay {
         alias: impl AsRef<str>,
         payout_method: &PayoutMethodDetails,
     ) -> Result<PayoutMethod, MuralError> {
+        mock!(self, create_payout_method(counterparty_id, alias.as_ref(), payout_method));
+
         #[derive(Debug, Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Body<'a> {
@@ -72,6 +78,8 @@ impl MuralPay {
         counterparty_id: CounterpartyId,
         payout_method_id: PayoutMethodId,
     ) -> Result<(), MuralError> {
+        mock!(self, delete_payout_method(counterparty_id, payout_method_id));
+
         self.http_delete(|base| format!("{base}/api/counterparties/{counterparty_id}/payout-methods/{payout_method_id}"))
             .send_mural()
             .await

From 94c0003c19c0ba8479b3673d343e6a5f26a1f58c Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Thu, 13 Nov 2025 15:21:43 -0800
Subject: [PATCH 54/64] Fix a number of light mode issues and get rid of
 scrollbar jumping on menus (#4760)

* Fix DEV-466, Fixes #4692 as well as a bunch of other poor contrast and inconsistency issues in light mode. Adds shadows to buttons and makes scrollbar gutter stable.

* lintttt & only do scrollbar gutter on website

* try to fix following hydration issue

* try another clientonly approach

* fix home page link animation

* lint

* remove dropdown style from checkbox & improve shadow consistency

* liiiint
---
 apps/app-frontend/src/App.vue                 |   2 +-
 .../src/components/ui/AccountsCard.vue        |   4 +-
 .../src/components/ui/ContextMenu.vue         |   4 +-
 .../components/ui/InstanceCreationModal.vue   |  10 +-
 .../components/ui/QuickInstanceSwitcher.vue   |   2 +-
 .../src/components/ui/RunningAppBar.vue       |   6 +-
 .../src/components/ui/world/InstanceItem.vue  |   2 +-
 .../src/components/ui/world/WorldItem.vue     |   2 +-
 apps/app-frontend/src/pages/Skins.vue         |   2 +-
 .../src/assets/styles/components.scss         |   4 +
 apps/frontend/src/assets/styles/global.scss   |   3 +-
 apps/frontend/src/components/ui/Checkbox.vue  | 151 --------
 apps/frontend/src/components/ui/NavStack.vue  |   4 +-
 .../ui/OrganizationProjectTransferModal.vue   |   2 +-
 .../src/components/ui/charts/Chart.client.vue |   4 +-
 .../src/components/ui/charts/ChartDisplay.vue |   4 +-
 .../ui/charts/CompactChart.client.vue         |   6 +-
 .../src/components/ui/search/SearchFilter.vue |  77 ----
 .../ui/servers/ContentVersionEditModal.vue    |  11 +-
 .../ui/servers/TeleportOverflowMenu.vue       |  11 +-
 .../ui/thread/ConversationThread.vue          |   9 +-
 apps/frontend/src/layouts/default.vue         |  13 +-
 apps/frontend/src/pages/[type]/[id].vue       | 160 ++++----
 .../src/pages/[type]/[id]/settings/tags.vue   |   7 +-
 .../frontend/src/pages/dashboard/projects.vue |  14 +-
 .../src/pages/dashboard/revenue/index.vue     |   6 +-
 .../organization/[id]/settings/projects.vue   | 352 +++++++++---------
 apps/frontend/src/pages/report.vue            |   2 +-
 .../src/pages/search/[searchProjectType].vue  |  12 +-
 packages/assets/styles/classes.scss           |   4 +-
 packages/assets/styles/highlightjs.scss       |   2 +-
 packages/assets/styles/variables.scss         |   8 +-
 .../ui/src/components/base/ButtonStyled.vue   |  19 +-
 packages/ui/src/components/base/Checkbox.vue  | 130 ++-----
 .../ui/src/components/base/MarkdownEditor.vue |   2 +-
 .../ui/src/components/base/OverflowMenu.vue   |   2 +-
 packages/ui/src/components/chart/Chart.vue    |   4 +-
 .../ui/src/components/chart/CompactChart.vue  |   6 +-
 packages/ui/src/components/modal/NewModal.vue |  12 -
 .../project/ProjectPageVersions.vue           |   2 +-
 40 files changed, 384 insertions(+), 693 deletions(-)
 delete mode 100644 apps/frontend/src/components/ui/Checkbox.vue
 delete mode 100644 apps/frontend/src/components/ui/search/SearchFilter.vue

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 79243c3c..6eda2bc5 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -765,7 +765,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			>
 				<LibraryIcon />
 			</NavButton>
-			<div class="h-px w-6 mx-auto my-2 bg-button-bg"></div>
+			<div class="h-px w-6 mx-auto my-2 bg-surface-5"></div>
 			<suspense>
 				<QuickInstanceSwitcher />
 			</suspense>
diff --git a/apps/app-frontend/src/components/ui/AccountsCard.vue b/apps/app-frontend/src/components/ui/AccountsCard.vue
index 54f0c510..493ce451 100644
--- a/apps/app-frontend/src/components/ui/AccountsCard.vue
+++ b/apps/app-frontend/src/components/ui/AccountsCard.vue
@@ -284,7 +284,7 @@ onUnmounted(() => {
 	z-index: 11;
 	gap: 0.5rem;
 	padding: 1rem;
-	border: 1px solid var(--color-button-bg);
+	border: 1px solid var(--color-divider);
 	width: max-content;
 	user-select: none;
 	-ms-user-select: none;
@@ -380,7 +380,7 @@ onUnmounted(() => {
 	text-align: left;
 
 	&.expanded {
-		border: 1px solid var(--color-button-bg);
+		border: 1px solid var(--color-divider);
 		padding: 1rem;
 	}
 }
diff --git a/apps/app-frontend/src/components/ui/ContextMenu.vue b/apps/app-frontend/src/components/ui/ContextMenu.vue
index c858eaa3..e778190f 100644
--- a/apps/app-frontend/src/components/ui/ContextMenu.vue
+++ b/apps/app-frontend/src/components/ui/ContextMenu.vue
@@ -119,7 +119,7 @@ onBeforeUnmount(() => {
 	background-color: var(--color-raised-bg);
 	border-radius: var(--radius-md);
 	box-shadow: var(--shadow-floating);
-	border: 1px solid var(--color-button-bg);
+	border: 1px solid var(--color-divider);
 	margin: 0;
 	position: fixed;
 	z-index: 1000000;
@@ -163,7 +163,7 @@ onBeforeUnmount(() => {
 	}
 
 	.divider {
-		border: 1px solid var(--color-button-bg);
+		border: 1px solid var(--color-divider);
 		margin: var(--gap-sm);
 		pointer-events: none;
 	}
diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
index 29fb8687..83dee767 100644
--- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
@@ -34,7 +34,7 @@
 			</div>
 			<div class="input-row">
 				<p class="input-label">Game version</p>
-				<div class="versions">
+				<div class="flex gap-4 items-center">
 					<multiselect
 						v-model="game_version"
 						class="selector"
@@ -45,7 +45,7 @@
 						open-direction="top"
 						:show-labels="false"
 					/>
-					<Checkbox v-model="showSnapshots" class="filter-checkbox" label="Show all versions" />
+					<Checkbox v-model="showSnapshots" class="shrink-0" label="Show all versions" />
 				</div>
 			</div>
 			<div v-if="loader !== 'vanilla'" class="input-row">
@@ -546,12 +546,6 @@ const next = async () => {
 	font-style: italic;
 }
 
-.versions {
-	display: flex;
-	flex-direction: row;
-	gap: 1rem;
-}
-
 :deep(button.checkbox) {
 	border: none;
 }
diff --git a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
index 64e5bd26..7186203c 100644
--- a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
+++ b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
@@ -69,7 +69,7 @@ onUnmounted(() => {
 			<SpinnerIcon class="animate-spin w-4 h-4" />
 		</div>
 	</NavButton>
-	<div v-if="recentInstances.length > 0" class="h-px w-6 mx-auto my-2 bg-button-bg"></div>
+	<div v-if="recentInstances.length > 0" class="h-px w-6 mx-auto my-2 bg-divider"></div>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/apps/app-frontend/src/components/ui/RunningAppBar.vue b/apps/app-frontend/src/components/ui/RunningAppBar.vue
index 38194119..53f05036 100644
--- a/apps/app-frontend/src/components/ui/RunningAppBar.vue
+++ b/apps/app-frontend/src/components/ui/RunningAppBar.vue
@@ -293,7 +293,7 @@ onBeforeUnmount(() => {
 	align-items: center;
 	gap: 0.5rem;
 	border-radius: var(--radius-md);
-	border: 1px solid var(--color-button-bg);
+	border: 1px solid var(--color-divider);
 	padding: var(--gap-sm) var(--gap-lg);
 }
 
@@ -356,7 +356,7 @@ onBeforeUnmount(() => {
 	gap: 1rem;
 	overflow: auto;
 	transition: all 0.2s ease-in-out;
-	border: 1px solid var(--color-button-bg);
+	border: 1px solid var(--color-divider);
 
 	&.hidden {
 		transform: translateY(-100%);
@@ -454,7 +454,7 @@ onBeforeUnmount(() => {
 	flex-direction: column;
 	overflow: auto;
 	transition: all 0.2s ease-in-out;
-	border: 1px solid var(--color-button-bg);
+	border: 1px solid var(--color-divider);
 	padding: var(--gap-md);
 
 	&.hidden {
diff --git a/apps/app-frontend/src/components/ui/world/InstanceItem.vue b/apps/app-frontend/src/components/ui/world/InstanceItem.vue
index f03f11cd..61fa1f9d 100644
--- a/apps/app-frontend/src/components/ui/world/InstanceItem.vue
+++ b/apps/app-frontend/src/components/ui/world/InstanceItem.vue
@@ -130,7 +130,7 @@ onUnmounted(() => {
 			/>
 		</template>
 		<div
-			class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised rounded-xl smart-clickable:highlight-on-hover"
+			class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised card-shadow rounded-xl smart-clickable:highlight-on-hover"
 		>
 			<Avatar
 				:src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
diff --git a/apps/app-frontend/src/components/ui/world/WorldItem.vue b/apps/app-frontend/src/components/ui/world/WorldItem.vue
index 8726bd5d..ec3a8688 100644
--- a/apps/app-frontend/src/components/ui/world/WorldItem.vue
+++ b/apps/app-frontend/src/components/ui/world/WorldItem.vue
@@ -181,7 +181,7 @@ const messages = defineMessages({
 			/>
 		</template>
 		<div
-			class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised smart-clickable:highlight-on-hover rounded-xl"
+			class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised card-shadow smart-clickable:highlight-on-hover rounded-xl"
 			:class="{
 				'world-item-highlighted': highlighted,
 			}"
diff --git a/apps/app-frontend/src/pages/Skins.vue b/apps/app-frontend/src/pages/Skins.vue
index d2bca13f..49461d2b 100644
--- a/apps/app-frontend/src/pages/Skins.vue
+++ b/apps/app-frontend/src/pages/Skins.vue
@@ -427,7 +427,7 @@ await Promise.all([loadCapes(), loadSkins(), loadCurrentUser()])
 
 	<div v-else class="flex items-center justify-center min-h-[50vh] pt-[25%]">
 		<div
-			class="bg-bg-raised rounded-lg p-7 flex flex-col gap-5 shadow-md relative max-w-xl w-full mx-auto"
+			class="bg-bg-raised card-shadow rounded-lg p-7 flex flex-col gap-5 shadow-md relative max-w-xl w-full mx-auto"
 		>
 			<img
 				:src="ExcitedRinthbot"
diff --git a/apps/frontend/src/assets/styles/components.scss b/apps/frontend/src/assets/styles/components.scss
index 956f922e..357e33a3 100644
--- a/apps/frontend/src/assets/styles/components.scss
+++ b/apps/frontend/src/assets/styles/components.scss
@@ -1290,3 +1290,7 @@ svg.inline-svg {
 		}
 	}
 }
+
+.card-shadow {
+	box-shadow: var(--shadow-card);
+}
diff --git a/apps/frontend/src/assets/styles/global.scss b/apps/frontend/src/assets/styles/global.scss
index aa130a0c..51c554d8 100644
--- a/apps/frontend/src/assets/styles/global.scss
+++ b/apps/frontend/src/assets/styles/global.scss
@@ -37,6 +37,7 @@ html {
 	--icon-32: 2rem;
 
 	interpolate-size: allow-keywords;
+	scrollbar-gutter: stable;
 }
 
 .light-mode {
@@ -89,7 +90,7 @@ html {
 	--color-hr: var(--color-text);
 
 	--color-table-border: #dfe2e5;
-	--color-table-alternate-row: #f2f4f7;
+	--color-table-alternate-row: #f0f1f2;
 
 	--landing-maze-bg: url('https://cdn.modrinth.com/landing-new/landing-light.webp');
 	--landing-maze-gradient-bg: url('https://cdn.modrinth.com/landing-new/landing-lower-light.webp');
diff --git a/apps/frontend/src/components/ui/Checkbox.vue b/apps/frontend/src/components/ui/Checkbox.vue
deleted file mode 100644
index a4e027d7..00000000
--- a/apps/frontend/src/components/ui/Checkbox.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-	<div
-		class="checkbox-outer button-within"
-		:class="{ disabled, checked: modelValue }"
-		role="presentation"
-		@click="toggle"
-	>
-		<button
-			class="checkbox"
-			role="checkbox"
-			:disabled="disabled"
-			:class="{ checked: modelValue, collapsing: collapsingToggleStyle }"
-			:aria-label="description ?? label"
-			:aria-checked="modelValue"
-		>
-			<CheckIcon v-if="modelValue && !collapsingToggleStyle" aria-hidden="true" />
-			<DropdownIcon v-else-if="collapsingToggleStyle" aria-hidden="true" />
-		</button>
-		<!-- aria-hidden is set so screenreaders only use the <button>'s aria-label -->
-		<p v-if="label" aria-hidden="true">
-			{{ label }}
-		</p>
-		<slot v-else />
-	</div>
-</template>
-
-<script>
-import { CheckIcon, DropdownIcon } from '@modrinth/assets'
-
-export default {
-	components: {
-		CheckIcon,
-		DropdownIcon,
-	},
-	props: {
-		label: {
-			type: String,
-			required: false,
-			default: '',
-		},
-		disabled: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		description: {
-			type: String,
-			required: false,
-			default: null,
-		},
-		modelValue: Boolean,
-		clickEvent: {
-			type: Function,
-			required: false,
-			default: () => {},
-		},
-		collapsingToggleStyle: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-	},
-	emits: ['update:modelValue'],
-	methods: {
-		toggle() {
-			if (!this.disabled) {
-				this.$emit('update:modelValue', !this.modelValue)
-			}
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.checkbox-outer {
-	display: flex;
-	align-items: center;
-	cursor: pointer;
-
-	p {
-		user-select: none;
-		padding: 0.2rem 0;
-		margin: 0;
-	}
-
-	&.disabled {
-		cursor: not-allowed;
-	}
-
-	&.checked {
-		outline: 2px solid transparent;
-		outline-offset: 4px;
-		border-radius: 0.25rem;
-	}
-}
-
-.checkbox {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	cursor: pointer;
-
-	min-width: 1rem;
-	min-height: 1rem;
-
-	padding: 0;
-	margin: 0 0.5rem 0 0;
-
-	color: var(--color-button-text);
-	background-color: var(--color-button-bg);
-	border-radius: var(--size-rounded-control);
-	box-shadow:
-		var(--shadow-inset-sm),
-		0 0 0 0 transparent;
-
-	&.checked {
-		background-color: var(--color-brand);
-	}
-
-	svg {
-		color: var(--color-accent-contrast, var(--color-brand-inverted));
-		stroke-width: 0.2rem;
-		height: 0.8rem;
-		width: 0.8rem;
-		flex-shrink: 0;
-	}
-
-	&.collapsing {
-		background-color: transparent !important;
-		box-shadow: none;
-
-		svg {
-			color: inherit;
-			height: 1rem;
-			width: 1rem;
-			transition: transform 0.25s ease-in-out;
-		}
-
-		&.checked {
-			svg {
-				transform: rotate(180deg);
-			}
-		}
-	}
-
-	&:disabled {
-		box-shadow: none;
-		cursor: not-allowed;
-	}
-}
-</style>
diff --git a/apps/frontend/src/components/ui/NavStack.vue b/apps/frontend/src/components/ui/NavStack.vue
index 43d1188e..24f183dc 100644
--- a/apps/frontend/src/components/ui/NavStack.vue
+++ b/apps/frontend/src/components/ui/NavStack.vue
@@ -1,6 +1,8 @@
 <template>
 	<nav :aria-label="ariaLabel" class="w-full">
-		<ul class="m-0 flex list-none flex-col items-start gap-1.5 rounded-2xl bg-bg-raised p-4">
+		<ul
+			class="card-shadow m-0 flex list-none flex-col items-start gap-1.5 rounded-2xl bg-bg-raised p-4"
+		>
 			<slot v-if="hasSlotContent" />
 
 			<template v-else>
diff --git a/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue b/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue
index e04ea82e..dadf0577 100644
--- a/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue
+++ b/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue
@@ -152,7 +152,7 @@ const onSubmitHandler = () => {
 	border-radius: var(--radius-md);
 	overflow: hidden;
 	margin-top: var(--gap-md);
-	border: 1px solid var(--color-button-bg);
+	border: 1px solid var(--color-divider);
 	background-color: var(--color-raised-bg);
 
 	.table-row {
diff --git a/apps/frontend/src/components/ui/charts/Chart.client.vue b/apps/frontend/src/components/ui/charts/Chart.client.vue
index fccd41a1..2c1104c8 100644
--- a/apps/frontend/src/components/ui/charts/Chart.client.vue
+++ b/apps/frontend/src/components/ui/charts/Chart.client.vue
@@ -356,7 +356,7 @@ svg {
 :deep(.apexcharts-yaxistooltip) {
 	background: var(--color-raised-bg) !important;
 	border-radius: var(--radius-sm) !important;
-	border: 1px solid var(--color-button-bg) !important;
+	border: 1px solid var(--color-divider) !important;
 	box-shadow: var(--shadow-floating) !important;
 	font-size: var(--font-size-nm) !important;
 }
@@ -371,7 +371,7 @@ svg {
 :deep(.apexcharts-xaxistooltip) {
 	background: var(--color-raised-bg) !important;
 	border-radius: var(--radius-sm) !important;
-	border: 1px solid var(--color-button-bg) !important;
+	border: 1px solid var(--color-divider) !important;
 	font-size: var(--font-size-nm) !important;
 	color: var(--color-base) !important;
 
diff --git a/apps/frontend/src/components/ui/charts/ChartDisplay.vue b/apps/frontend/src/components/ui/charts/ChartDisplay.vue
index e3795566..b725a096 100644
--- a/apps/frontend/src/components/ui/charts/ChartDisplay.vue
+++ b/apps/frontend/src/components/ui/charts/ChartDisplay.vue
@@ -891,7 +891,7 @@ const defaultRanges: RangeObject[] = [
 	flex-direction: column;
 	background-color: var(--color-bg);
 	border-radius: var(--radius-sm);
-	border: 1px solid var(--color-button-bg);
+	border: 1px solid var(--color-divider);
 	gap: var(--gap-md);
 	padding: var(--gap-md);
 	margin-top: var(--gap-md);
@@ -920,7 +920,7 @@ const defaultRanges: RangeObject[] = [
 		width: 100%;
 		height: 1rem;
 		background-color: var(--color-raised-bg);
-		border: 1px solid var(--color-button-bg);
+		border: 1px solid var(--color-divider);
 		border-radius: var(--radius-sm);
 		overflow: hidden;
 
diff --git a/apps/frontend/src/components/ui/charts/CompactChart.client.vue b/apps/frontend/src/components/ui/charts/CompactChart.client.vue
index 22d3eb7c..6a86ec2e 100644
--- a/apps/frontend/src/components/ui/charts/CompactChart.client.vue
+++ b/apps/frontend/src/components/ui/charts/CompactChart.client.vue
@@ -159,10 +159,10 @@ defineExpose({
 	flex-direction: column;
 
 	gap: var(--gap-xs);
-	border: 1px solid var(--color-button-bg);
+	border: 1px solid var(--color-divider);
 	border-radius: var(--radius-md);
 	background-color: var(--color-raised-bg);
-	box-shadow: var(--shadow-floating);
+	box-shadow: var(--shadow-card);
 
 	color: var(--color-base);
 	font-size: var(--font-size-nm);
@@ -192,7 +192,7 @@ svg {
 :deep(.apexcharts-yaxistooltip) {
 	background: var(--color-raised-bg) !important;
 	border-radius: var(--radius-sm) !important;
-	border: 1px solid var(--color-button-bg) !important;
+	border: 1px solid var(--color-divider) !important;
 	box-shadow: var(--shadow-floating) !important;
 	font-size: var(--font-size-nm) !important;
 }
diff --git a/apps/frontend/src/components/ui/search/SearchFilter.vue b/apps/frontend/src/components/ui/search/SearchFilter.vue
deleted file mode 100644
index 4f9e6c5e..00000000
--- a/apps/frontend/src/components/ui/search/SearchFilter.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-	<Checkbox
-		class="filter"
-		:model-value="activeFilters.includes(facetName)"
-		:description="displayName"
-		@update:model-value="toggle()"
-	>
-		<div class="filter-text">
-			<div v-if="icon" aria-hidden="true" class="icon" v-html="icon" />
-			<div v-else class="icon">
-				<slot />
-			</div>
-			<span aria-hidden="true"> {{ displayName }}</span>
-		</div>
-	</Checkbox>
-</template>
-
-<script>
-import Checkbox from '~/components/ui/Checkbox.vue'
-
-export default {
-	components: {
-		Checkbox,
-	},
-	props: {
-		facetName: {
-			type: String,
-			default: '',
-		},
-		displayName: {
-			type: String,
-			default: '',
-		},
-		icon: {
-			type: String,
-			default: '',
-		},
-		activeFilters: {
-			type: Array,
-			default() {
-				return []
-			},
-		},
-	},
-	emits: ['toggle'],
-	methods: {
-		toggle() {
-			this.$emit('toggle', this.facetName)
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.filter {
-	margin-bottom: 0.5rem;
-
-	:deep(.filter-text) {
-		display: flex;
-		align-items: center;
-
-		.icon {
-			height: 1rem;
-
-			svg {
-				margin-right: 0.25rem;
-				width: 1rem;
-				height: 1rem;
-			}
-		}
-	}
-
-	span {
-		user-select: none;
-	}
-}
-</style>
diff --git a/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue b/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
index 1e48ae36..c016c602 100644
--- a/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
+++ b/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
@@ -245,13 +245,20 @@ import {
 	LockOpenIcon,
 	XIcon,
 } from '@modrinth/assets'
-import { Admonition, Avatar, ButtonStyled, Combobox, CopyCode, NewModal } from '@modrinth/ui'
+import {
+	Admonition,
+	Avatar,
+	ButtonStyled,
+	Checkbox,
+	Combobox,
+	CopyCode,
+	NewModal,
+} from '@modrinth/ui'
 import TagItem from '@modrinth/ui/src/components/base/TagItem.vue'
 import { formatCategory, formatVersionsForDisplay, type Mod, type Version } from '@modrinth/utils'
 import { computed, ref } from 'vue'
 
 import Accordion from '~/components/ui/Accordion.vue'
-import Checkbox from '~/components/ui/Checkbox.vue'
 import ContentVersionFilter, {
 	type ListedGameVersion,
 	type ListedPlatform,
diff --git a/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue b/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue
index 0004115c..d50ce2e4 100644
--- a/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue
+++ b/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue
@@ -36,7 +36,7 @@
 						v-for="(option, index) in filteredOptions"
 						:key="isDivider(option) ? `divider-${index}` : option.id"
 					>
-						<div v-if="isDivider(option)" class="h-px w-full bg-button-bg"></div>
+						<div v-if="isDivider(option)" class="h-px w-full bg-surface-5"></div>
 						<ButtonStyled v-else type="transparent" role="menuitem" :color="option.color">
 							<button
 								v-if="typeof option.action === 'function'"
@@ -288,19 +288,10 @@ const handleMouseOver = (index: number) => {
 
 // Scrolling is disabled for keyboard navigation
 const disableBodyScroll = () => {
-	// Make opening not shift page when there's a vertical scrollbar
-	const scrollBarWidth = window.innerWidth - document.documentElement.clientWidth
-	if (scrollBarWidth > 0) {
-		document.body.style.paddingRight = `${scrollBarWidth}px`
-	} else {
-		document.body.style.paddingRight = ''
-	}
-
 	document.body.style.overflow = 'hidden'
 }
 
 const enableBodyScroll = () => {
-	document.body.style.paddingRight = ''
 	document.body.style.overflow = ''
 }
 
diff --git a/apps/frontend/src/components/ui/thread/ConversationThread.vue b/apps/frontend/src/components/ui/thread/ConversationThread.vue
index 7efeb349..8fb39045 100644
--- a/apps/frontend/src/components/ui/thread/ConversationThread.vue
+++ b/apps/frontend/src/components/ui/thread/ConversationThread.vue
@@ -261,9 +261,14 @@ import {
 	SendIcon,
 	XIcon,
 } from '@modrinth/assets'
-import { CopyCode, injectNotificationManager, MarkdownEditor, OverflowMenu } from '@modrinth/ui'
+import {
+	Checkbox,
+	CopyCode,
+	injectNotificationManager,
+	MarkdownEditor,
+	OverflowMenu,
+} from '@modrinth/ui'
 
-import Checkbox from '~/components/ui/Checkbox.vue'
 import Modal from '~/components/ui/Modal.vue'
 import ThreadMessage from '~/components/ui/thread/ThreadMessage.vue'
 import { useImageUpload } from '~/composables/image-upload.ts'
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index d425e9e6..8889573e 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -220,8 +220,15 @@
 			class="experimental-styles-within desktop-only relative z-[5] mx-auto grid max-w-[1280px] grid-cols-[1fr_auto] items-center gap-2 px-6 py-4 lg:grid-cols-[auto_1fr_auto]"
 		>
 			<div>
-				<NuxtLink to="/" :aria-label="formatMessage(messages.modrinthHomePage)">
-					<TextLogo aria-hidden="true" class="h-7 w-auto text-contrast" />
+				<NuxtLink
+					to="/"
+					:aria-label="formatMessage(messages.modrinthHomePage)"
+					class="group hover:brightness-[--hover-brightness] focus-visible:brightness-[--hover-brightness]"
+				>
+					<TextLogo
+						aria-hidden="true"
+						class="h-7 w-auto text-contrast transition-transform group-active:scale-[0.98]"
+					/>
 				</NuxtLink>
 			</div>
 			<div
@@ -369,7 +376,7 @@
 								formatMessage(navMenuMessages.discoverContent)
 							}}</span>
 							<span class="contents md:hidden">{{ formatMessage(navMenuMessages.discover) }}</span>
-							<DropdownIcon aria-hidden="true" class="h-5 w-5 text-secondary" />
+							<DropdownIcon aria-hidden="true" class="h-5 w-5" />
 
 							<template #mods>
 								<BoxIcon aria-hidden="true" />
diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index be6eeb0a..50937a68 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -547,14 +547,8 @@
 								</div>
 							</template>
 						</Tooltip>
-						<ClientOnly>
-							<ButtonStyled
-								size="large"
-								circular
-								:color="following ? 'red' : 'standard'"
-								color-fill="none"
-								hover-color-fill="background"
-							>
+						<ButtonStyled size="large" circular>
+							<ClientOnly>
 								<button
 									v-if="auth.user"
 									v-tooltip="
@@ -579,94 +573,74 @@
 								>
 									<HeartIcon aria-hidden="true" />
 								</nuxt-link>
-							</ButtonStyled>
-							<ButtonStyled size="large" circular>
-								<PopoutMenu
-									v-if="auth.user"
-									:tooltip="
-										collections.some((x) => x.projects.includes(project.id))
-											? formatMessage(commonMessages.savedLabel)
-											: formatMessage(commonMessages.saveButton)
-									"
-									from="top-right"
-									:aria-label="formatMessage(commonMessages.saveButton)"
-									:dropdown-id="`${baseId}-save`"
-								>
-									<BookmarkIcon
-										aria-hidden="true"
-										:fill="
-											collections.some((x) => x.projects.includes(project.id))
-												? 'currentColor'
-												: 'none'
-										"
-									/>
-									<template #menu>
-										<input
-											v-model="displayCollectionsSearch"
-											type="text"
-											:placeholder="formatMessage(commonMessages.searchPlaceholder)"
-											class="search-input menu-search"
-										/>
-										<div v-if="collections.length > 0" class="collections-list text-primary">
-											<Checkbox
-												v-for="option in collections
-													.slice()
-													.sort((a, b) => a.name.localeCompare(b.name))"
-												:key="option.id"
-												:model-value="option.projects.includes(project.id)"
-												class="popout-checkbox"
-												@update:model-value="() => onUserCollectProject(option, project.id)"
-											>
-												{{ option.name }}
-											</Checkbox>
-										</div>
-
-										<div v-else class="menu-text">
-											<p class="popout-text">{{ formatMessage(messages.noCollectionsFound) }}</p>
-										</div>
-										<button
-											class="btn collection-button"
-											@click="(event) => $refs.modal_collection.show(event)"
-										>
-											<PlusIcon aria-hidden="true" />
-											{{ formatMessage(messages.createNewCollection) }}
-										</button>
-									</template>
-								</PopoutMenu>
-								<nuxt-link v-else v-tooltip="'Save'" to="/auth/sign-in" aria-label="Save">
-									<BookmarkIcon aria-hidden="true" />
-								</nuxt-link>
-							</ButtonStyled>
-							<template #fallback>
-								<ButtonStyled size="large" circular>
-									<button
-										v-if="auth.user"
-										:v-tooltip="formatMessage(commonMessages.followButton)"
-										:aria-label="formatMessage(commonMessages.followButton)"
-										@click="userFollowProject(project)"
-									>
-										<HeartIcon aria-hidden="true" />
-									</button>
+								<template #fallback>
 									<nuxt-link
-										v-else
 										v-tooltip="formatMessage(commonMessages.followButton)"
 										to="/auth/sign-in"
 										:aria-label="formatMessage(commonMessages.followButton)"
 									>
 										<HeartIcon aria-hidden="true" />
 									</nuxt-link>
-								</ButtonStyled>
-								<ButtonStyled size="large" circular>
-									<nuxt-link
-										v-tooltip="formatMessage(commonMessages.saveButton)"
-										to="/auth/sign-in"
-										:aria-label="formatMessage(commonMessages.saveButton)"
+								</template>
+							</ClientOnly>
+						</ButtonStyled>
+						<ButtonStyled size="large" circular>
+							<PopoutMenu
+								v-if="auth.user"
+								:tooltip="
+									collections.some((x) => x.projects.includes(project.id))
+										? formatMessage(commonMessages.savedLabel)
+										: formatMessage(commonMessages.saveButton)
+								"
+								from="top-right"
+								:aria-label="formatMessage(commonMessages.saveButton)"
+								:dropdown-id="`${baseId}-save`"
+							>
+								<BookmarkIcon
+									aria-hidden="true"
+									:fill="
+										collections.some((x) => x.projects.includes(project.id))
+											? 'currentColor'
+											: 'none'
+									"
+								/>
+								<template #menu>
+									<input
+										v-model="displayCollectionsSearch"
+										type="text"
+										:placeholder="formatMessage(commonMessages.searchPlaceholder)"
+										class="search-input menu-search"
+									/>
+									<div v-if="collections.length > 0" class="collections-list text-primary">
+										<Checkbox
+											v-for="option in collections
+												.slice()
+												.sort((a, b) => a.name.localeCompare(b.name))"
+											:key="option.id"
+											:model-value="option.projects.includes(project.id)"
+											class="popout-checkbox"
+											@update:model-value="() => onUserCollectProject(option, project.id)"
+										>
+											{{ option.name }}
+										</Checkbox>
+									</div>
+
+									<div v-else class="menu-text">
+										<p class="popout-text">{{ formatMessage(messages.noCollectionsFound) }}</p>
+									</div>
+									<button
+										class="btn collection-button"
+										@click="(event) => $refs.modal_collection.show(event)"
 									>
-										<BookmarkIcon aria-hidden="true" />
-									</nuxt-link>
-								</ButtonStyled>
-							</template>
-						</ClientOnly>
+										<PlusIcon aria-hidden="true" />
+										{{ formatMessage(messages.createNewCollection) }}
+									</button>
+								</template>
+							</PopoutMenu>
+							<nuxt-link v-else v-tooltip="'Save'" to="/auth/sign-in" aria-label="Save">
+								<BookmarkIcon aria-hidden="true" />
+							</nuxt-link>
+						</ButtonStyled>
 						<ButtonStyled v-if="auth.user && currentMember" size="large" circular>
 							<nuxt-link
 								v-tooltip="formatMessage(commonMessages.settingsLabel)"
@@ -1672,10 +1646,12 @@ const projectTypeDisplay = computed(() =>
 	),
 )
 
-const following = computed(
-	() =>
-		user.value && user.value.follows && user.value.follows.find((x) => x.id === project.value.id),
-)
+const following = computed(() => {
+	if (!user.value?.follows) {
+		return false
+	}
+	return !!user.value.follows.find((x) => x.id === project.value.id)
+})
 
 const title = computed(() => `${project.value.title} - Minecraft ${projectTypeDisplay.value}`)
 const description = computed(
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/tags.vue b/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
index f46fe6d8..a172098e 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
@@ -36,7 +36,7 @@
 			</p>
 			<template v-else>
 				<template v-for="header in Object.keys(categoryLists)" :key="`categories-${header}`">
-					<div class="label">
+					<div class="label mb-3">
 						<h4>
 							<span class="label__title">{{ formatCategoryHeader(header) }}</span>
 						</h4>
@@ -134,6 +134,7 @@
 
 <script setup lang="ts">
 import { SaveIcon, StarIcon, TriangleAlertIcon } from '@modrinth/assets'
+import { Checkbox } from '@modrinth/ui'
 import {
 	formatCategory,
 	formatCategoryHeader,
@@ -143,8 +144,6 @@ import {
 } from '@modrinth/utils'
 import { computed, ref } from 'vue'
 
-import Checkbox from '~/components/ui/Checkbox.vue'
-
 interface Category {
 	name: string
 	header: string
@@ -337,7 +336,7 @@ const saveChanges = () => {
 	margin-bottom: var(--spacing-card-md);
 
 	:deep(.category-selector) {
-		margin-bottom: 0.5rem;
+		margin-bottom: 0.75rem;
 
 		.category-selector__label {
 			display: flex;
diff --git a/apps/frontend/src/pages/dashboard/projects.vue b/apps/frontend/src/pages/dashboard/projects.vue
index 7e12c644..f2259ee0 100644
--- a/apps/frontend/src/pages/dashboard/projects.vue
+++ b/apps/frontend/src/pages/dashboard/projects.vue
@@ -1,7 +1,7 @@
 <template>
 	<div>
-		<Modal ref="editLinksModal" header="Edit links">
-			<div class="universal-modal links-modal">
+		<NewModal ref="editLinksModal" header="Edit links">
+			<div class="universal-modal links-modal !p-0">
 				<p>
 					Any links you specify below will be overwritten on each of the selected projects. Any you
 					leave blank will be ignored. You can clear a link from all selected projects using the
@@ -139,10 +139,8 @@
 				<Checkbox
 					v-if="selectedProjects.length > 3"
 					v-model="editLinks.showAffected"
-					:label="editLinks.showAffected ? 'Less' : 'More'"
-					description="Show all loaders"
-					:border="false"
-					:collapsing-toggle-style="true"
+					label="Show all projects"
+					description="Show all projects"
 				/>
 				<div class="push-right input-group">
 					<button class="iconified-button" @click="$refs.editLinksModal.hide()">
@@ -155,7 +153,7 @@
 					</button>
 				</div>
 			</div>
-		</Modal>
+		</NewModal>
 		<ModalCreation ref="modal_creation" />
 		<section class="universal-card">
 			<div class="header__row">
@@ -335,13 +333,13 @@ import {
 	commonMessages,
 	CopyCode,
 	injectNotificationManager,
+	NewModal,
 	ProjectStatusBadge,
 } from '@modrinth/ui'
 import { formatProjectType } from '@modrinth/utils'
 import { Multiselect } from 'vue-multiselect'
 
 import ModalCreation from '~/components/ui/create/ProjectCreateModal.vue'
-import Modal from '~/components/ui/Modal.vue'
 import { getProjectTypeForUrl } from '~/helpers/projects.js'
 
 useHead({ title: 'Projects - Modrinth' })
diff --git a/apps/frontend/src/pages/dashboard/revenue/index.vue b/apps/frontend/src/pages/dashboard/revenue/index.vue
index 433e94ed..44dc1339 100644
--- a/apps/frontend/src/pages/dashboard/revenue/index.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/index.vue
@@ -40,7 +40,7 @@
 
 			<div class="flex flex-col">
 				<div
-					class="flex flex-row justify-between border-0 !border-b-[2px] border-solid border-button-bg p-1.5 md:p-2"
+					class="flex flex-row justify-between border-0 !border-b-[2px] border-solid border-divider p-1.5 md:p-2"
 				>
 					<span class="my-auto flex flex-row items-center gap-2 text-sm leading-none md:text-base"
 						><span
@@ -58,7 +58,7 @@
 				<div
 					v-for="(date, i) in dateSegments"
 					:key="date.date"
-					class="flex flex-row justify-between border-0 !border-b-[2px] border-solid border-button-bg p-1.5 md:p-2"
+					class="flex flex-row justify-between border-0 !border-b-[2px] border-solid border-divider p-1.5 md:p-2"
 				>
 					<span class="my-auto flex flex-row items-center gap-2 text-sm leading-none md:text-base">
 						<span
@@ -123,7 +123,7 @@
 			}}</span>
 			<div class="grid grid-cols-1 gap-x-4 gap-y-2 md:grid-cols-2 lg:grid-cols-3">
 				<button
-					class="relative flex flex-col overflow-hidden rounded-2xl bg-gradient-to-r from-green to-green-700 p-4 text-inverted shadow-md transition-all duration-200 hover:brightness-105 disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:brightness-100 md:p-5"
+					class="relative flex flex-col overflow-hidden rounded-2xl bg-gradient-to-r from-green to-green-700 p-4 text-inverted shadow-md transition-all duration-200 hover:brightness-105 active:scale-[0.98] disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:brightness-100 md:p-5"
 					:disabled="hasTinMismatch"
 					@click="openWithdrawModal"
 				>
diff --git a/apps/frontend/src/pages/organization/[id]/settings/projects.vue b/apps/frontend/src/pages/organization/[id]/settings/projects.vue
index 874f09f8..2c3c84ae 100644
--- a/apps/frontend/src/pages/organization/[id]/settings/projects.vue
+++ b/apps/frontend/src/pages/organization/[id]/settings/projects.vue
@@ -1,7 +1,7 @@
 <template>
-	<div class="normal-page__content">
-		<Modal ref="editLinksModal" header="Edit links">
-			<div class="universal-modal links-modal">
+	<div>
+		<NewModal ref="editLinksModal" header="Edit links">
+			<div class="universal-modal links-modal !p-0">
 				<p>
 					Any links you specify below will be overwritten on each of the selected projects. Any you
 					leave blank will be ignored. You can clear a link from all selected projects using the
@@ -25,16 +25,15 @@
 							"
 							maxlength="2048"
 						/>
-						<Button
+						<button
 							v-tooltip="'Clear link'"
 							aria-label="Clear link"
 							class="square-button label-button"
 							:data-active="editLinks.issues.clear"
-							icon-only
 							@click="editLinks.issues.clear = !editLinks.issues.clear"
 						>
 							<TrashIcon />
-						</Button>
+						</button>
 					</div>
 					<label
 						for="source-code-input"
@@ -53,15 +52,15 @@
 								editLinks.source.clear ? 'Existing link will be cleared' : 'Enter a valid URL'
 							"
 						/>
-						<Button
+						<button
 							v-tooltip="'Clear link'"
 							aria-label="Clear link"
+							class="square-button label-button"
 							:data-active="editLinks.source.clear"
-							icon-only
 							@click="editLinks.source.clear = !editLinks.source.clear"
 						>
 							<TrashIcon />
-						</Button>
+						</button>
 					</div>
 					<label
 						for="wiki-page-input"
@@ -80,15 +79,15 @@
 								editLinks.wiki.clear ? 'Existing link will be cleared' : 'Enter a valid URL'
 							"
 						/>
-						<Button
+						<button
 							v-tooltip="'Clear link'"
 							aria-label="Clear link"
+							class="square-button label-button"
 							:data-active="editLinks.wiki.clear"
-							icon-only
 							@click="editLinks.wiki.clear = !editLinks.wiki.clear"
 						>
 							<TrashIcon />
-						</Button>
+						</button>
 					</div>
 					<label for="discord-invite-input" title="An invitation link to your Discord server.">
 						<span class="label__title">Discord invite</span>
@@ -106,15 +105,15 @@
 									: 'Enter a valid Discord invite URL'
 							"
 						/>
-						<Button
+						<button
 							v-tooltip="'Clear link'"
 							aria-label="Clear link"
+							class="square-button label-button"
 							:data-active="editLinks.discord.clear"
-							icon-only
 							@click="editLinks.discord.clear = !editLinks.discord.clear"
 						>
 							<TrashIcon />
-						</Button>
+						</button>
 					</div>
 				</section>
 				<p>
@@ -140,35 +139,35 @@
 				<Checkbox
 					v-if="selectedProjects.length > 3"
 					v-model="editLinks.showAffected"
-					:label="editLinks.showAffected ? 'Less' : 'More'"
-					description="Show all loaders"
-					:border="false"
-					:collapsing-toggle-style="true"
+					label="Show all projects"
+					description="Show all projects"
 				/>
 				<div class="push-right input-group">
-					<Button @click="$refs.editLinksModal.hide()">
+					<button class="iconified-button" @click="$refs.editLinksModal.hide()">
 						<XIcon />
 						Cancel
-					</Button>
-					<Button color="primary" @click="onBulkEditLinks">
+					</button>
+					<button class="iconified-button brand-button" @click="onBulkEditLinks">
 						<SaveIcon />
 						Save changes
-					</Button>
+					</button>
 				</div>
 			</div>
-		</Modal>
+		</NewModal>
 		<ModalCreation ref="modal_creation" :organization-id="organization.id" />
-		<div class="universal-card">
-			<h2>Projects</h2>
-			<div class="input-group">
-				<Button color="primary" @click="$refs.modal_creation.show()">
-					<PlusIcon />
-					{{ formatMessage(commonMessages.createAProjectButton) }}
-				</Button>
-				<OrganizationProjectTransferModal
-					:projects="usersOwnedProjects || []"
-					@submit="onProjectTransferSubmit"
-				/>
+		<section class="universal-card">
+			<div class="header__row">
+				<h2 class="header__title text-2xl">Projects</h2>
+				<div class="input-group">
+					<button class="iconified-button brand-button" @click="$refs.modal_creation.show()">
+						<PlusIcon />
+						{{ formatMessage(commonMessages.createAProjectButton) }}
+					</button>
+					<OrganizationProjectTransferModal
+						:projects="usersOwnedProjects || []"
+						@submit="onProjectTransferSubmit"
+					/>
+				</div>
 			</div>
 			<p v-if="sortedProjects.length < 1">
 				You don't have any projects yet. Click the green button above to begin.
@@ -176,10 +175,14 @@
 			<template v-else>
 				<p>You can edit multiple projects at once by selecting them below.</p>
 				<div class="input-group">
-					<Button :disabled="selectedProjects.length === 0" @click="$refs.editLinksModal.show()">
+					<button
+						class="iconified-button"
+						:disabled="selectedProjects.length === 0"
+						@click="$refs.editLinksModal.show()"
+					>
 						<EditIcon />
 						Edit links
-					</Button>
+					</button>
 					<div class="push-right">
 						<div class="labeled-control-row">
 							Sort by
@@ -195,21 +198,20 @@
 									sortedProjects = updateSort(sortedProjects, sortBy, descending)
 								"
 							/>
-							<Button
+							<button
 								v-tooltip="descending ? 'Descending' : 'Ascending'"
 								class="square-button"
-								icon-only
 								@click="updateDescending()"
 							>
 								<SortDescIcon v-if="descending" />
 								<SortAscIcon v-else />
-							</Button>
+							</button>
 						</div>
 					</div>
 				</div>
-				<div class="table">
-					<div class="table-head table-row">
-						<div class="check-cell table-cell">
+				<div class="grid-table">
+					<div class="grid-table__row grid-table__header">
+						<div>
 							<Checkbox
 								:model-value="selectedProjects === sortedProjects"
 								@update:model-value="
@@ -219,15 +221,19 @@
 								"
 							/>
 						</div>
-						<div class="table-cell">Icon</div>
-						<div class="table-cell">Name</div>
-						<div class="table-cell">ID</div>
-						<div class="table-cell">Type</div>
-						<div class="table-cell">Status</div>
-						<div class="table-cell" />
+						<div>Icon</div>
+						<div>Name</div>
+						<div>ID</div>
+						<div>Type</div>
+						<div>Status</div>
+						<div />
 					</div>
-					<div v-for="project in sortedProjects" :key="`project-${project.id}`" class="table-row">
-						<div class="check-cell table-cell">
+					<div
+						v-for="project in sortedProjects"
+						:key="`project-${project.id}`"
+						class="grid-table__row"
+					>
+						<div>
 							<Checkbox
 								:disabled="(project.permissions & EDIT_DETAILS) === EDIT_DETAILS"
 								:model-value="selectedProjects.includes(project)"
@@ -238,8 +244,13 @@
 								"
 							/>
 						</div>
-						<div class="table-cell">
-							<nuxt-link tabindex="-1" :to="`/project/${project.slug ? project.slug : project.id}`">
+						<div>
+							<nuxt-link
+								tabindex="-1"
+								:to="`/${getProjectTypeForUrl(project.project_types[0] ?? 'project', project.loaders)}/${
+									project.slug ? project.slug : project.id
+								}`"
+							>
 								<Avatar
 									:src="project.icon_url"
 									aria-hidden="true"
@@ -249,7 +260,7 @@
 							</nuxt-link>
 						</div>
 
-						<div class="table-cell">
+						<div>
 							<span class="project-title">
 								<IssuesIcon
 									v-if="project.moderator_message"
@@ -258,48 +269,52 @@
 
 								<nuxt-link
 									class="hover-link wrap-as-needed"
-									:to="`/project/${project.slug ? project.slug : project.id}`"
+									:to="`/${getProjectTypeForUrl(project.project_types[0] ?? 'project', project.loaders)}/${
+										project.slug ? project.slug : project.id
+									}`"
 								>
 									{{ project.name }}
 								</nuxt-link>
 							</span>
 						</div>
 
-						<div class="table-cell">
+						<div>
 							<CopyCode :text="project.id" />
 						</div>
 
-						<div class="table-cell">
-							<BoxIcon />
-							<span>{{
+						<div>
+							{{
 								formatProjectType(
-									$getProjectTypeForDisplay(project.project_types[0] ?? 'project', project.loaders),
+									getProjectTypeForUrl(project.project_types[0] ?? 'project', project.loaders),
 								)
-							}}</span>
+							}}
 						</div>
 
-						<div class="table-cell">
-							<Badge v-if="project.status" :type="project.status" class="status" />
+						<div>
+							<ProjectStatusBadge v-if="project.status" :status="project.status" />
 						</div>
 
-						<div class="table-cell">
-							<nuxt-link
-								class="btn icon-only"
-								:to="`/project/${project.slug ? project.slug : project.id}/settings`"
-							>
-								<SettingsIcon />
-							</nuxt-link>
+						<div class="flex !flex-row items-center !justify-end gap-2">
+							<ButtonStyled circular>
+								<nuxt-link
+									v-tooltip="formatMessage(commonMessages.settingsLabel)"
+									:to="`/${getProjectTypeForUrl(project.project_types[0] ?? 'project', project.loaders)}/${
+										project.slug ? project.slug : project.id
+									}/settings`"
+								>
+									<SettingsIcon />
+								</nuxt-link>
+							</ButtonStyled>
 						</div>
 					</div>
 				</div>
 			</template>
-		</div>
+		</section>
 	</div>
 </template>
 
 <script setup>
 import {
-	BoxIcon,
 	EditIcon,
 	IssuesIcon,
 	PlusIcon,
@@ -312,19 +327,20 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
-	Badge,
-	Button,
+	ButtonStyled,
 	Checkbox,
 	commonMessages,
 	CopyCode,
 	injectNotificationManager,
-	Modal,
+	NewModal,
+	ProjectStatusBadge,
 } from '@modrinth/ui'
 import { formatProjectType } from '@modrinth/utils'
 import { Multiselect } from 'vue-multiselect'
 
 import ModalCreation from '~/components/ui/create/ProjectCreateModal.vue'
 import OrganizationProjectTransferModal from '~/components/ui/OrganizationProjectTransferModal.vue'
+import { getProjectTypeForUrl } from '~/helpers/projects.js'
 import { injectOrganizationContext } from '~/providers/organization-context.ts'
 
 const { addNotification } = injectNotificationManager()
@@ -423,10 +439,12 @@ const updateSort = (inputProjects, sort, descending) => {
 			break
 		case 'Type':
 			sortedArray = inputProjects.slice().sort((a, b) => {
-				if (a.project_type < b.project_type) {
+				const aType = a.project_types?.[0] ?? 'project'
+				const bType = b.project_types?.[0] ?? 'project'
+				if (aType < bType) {
 					return -1
 				}
-				if (a.project_type > b.project_type) {
+				if (aType > bType) {
 					return 1
 				}
 				return 0
@@ -456,109 +474,107 @@ watch(
 	},
 )
 
-const emptyLinksData = {
+const editLinks = reactive({
 	showAffected: false,
-	source: {
-		val: '',
-		clear: false,
-	},
-	discord: {
-		val: '',
-		clear: false,
-	},
-	wiki: {
-		val: '',
-		clear: false,
-	},
-	issues: {
-		val: '',
-		clear: false,
-	},
-}
-
-const editLinks = ref(emptyLinksData)
+	source: { val: '', clear: false },
+	discord: { val: '', clear: false },
+	wiki: { val: '', clear: false },
+	issues: { val: '', clear: false },
+})
 
 const updateDescending = () => {
 	descending.value = !descending.value
 	sortedProjects.value = updateSort(sortedProjects.value, sortBy.value, descending.value)
 }
 
-const onBulkEditLinks = useClientTry(async () => {
-	const linkData = editLinks.value
+const onBulkEditLinks = async () => {
+	try {
+		const baseData = {
+			issues_url: editLinks.value.issues.clear ? null : editLinks.value.issues.val.trim(),
+			source_url: editLinks.value.source.clear ? null : editLinks.value.source.val.trim(),
+			wiki_url: editLinks.value.wiki.clear ? null : editLinks.value.wiki.val.trim(),
+			discord_url: editLinks.value.discord.clear ? null : editLinks.value.discord.val.trim(),
+		}
+		const filteredData = Object.fromEntries(Object.entries(baseData).filter(([, v]) => v !== ''))
 
-	const baseData = {}
+		await useBaseFetch(`projects?ids=${JSON.stringify(selectedProjects.value.map((x) => x.id))}`, {
+			method: 'PATCH',
+			body: JSON.stringify(filteredData),
+		})
 
-	if (linkData.issues.clear) {
-		baseData.issues_url = null
-	} else if (linkData.issues.val.trim().length > 0) {
-		baseData.issues_url = linkData.issues.val.trim()
+		editLinksModal.value?.hide()
+		addNotification({
+			title: 'Success',
+			text: "Bulk edited selected project's links.",
+			type: 'success',
+		})
+		selectedProjects.value = []
+
+		editLinks.value.issues.val = ''
+		editLinks.value.source.val = ''
+		editLinks.value.wiki.val = ''
+		editLinks.value.discord.val = ''
+		editLinks.value.issues.clear = false
+		editLinks.value.source.clear = false
+		editLinks.value.wiki.clear = false
+		editLinks.value.discord.clear = false
+	} catch (e) {
+		addNotification({
+			title: 'An error occurred',
+			text: e?.data?.description || e?.message || e || 'Unknown error',
+			type: 'error',
+		})
+		console.error(e)
 	}
-
-	if (linkData.source.clear) {
-		baseData.source_url = null
-	} else if (linkData.source.val.trim().length > 0) {
-		baseData.source_url = linkData.source.val.trim()
-	}
-
-	if (linkData.wiki.clear) {
-		baseData.wiki_url = null
-	} else if (linkData.wiki.val.trim().length > 0) {
-		baseData.wiki_url = linkData.wiki.val.trim()
-	}
-
-	if (linkData.discord.clear) {
-		baseData.discord_url = null
-	} else if (linkData.discord.val.trim().length > 0) {
-		baseData.discord_url = linkData.discord.val.trim()
-	}
-
-	await useBaseFetch(`projects?ids=${JSON.stringify(selectedProjects.value.map((x) => x.id))}`, {
-		method: 'PATCH',
-		body: JSON.stringify(baseData),
-	})
-
-	editLinksModal.value.hide()
-
-	addNotification({
-		title: 'Success',
-		text: "Bulk edited selected project's links.",
-		type: 'success',
-	})
-
-	selectedProjects.value = []
-	editLinks.value = emptyLinksData
-})
+}
 </script>
 <style lang="scss" scoped>
-.table {
+.grid-table {
 	display: grid;
-	border-radius: var(--radius-md);
+	grid-template-columns:
+		min-content min-content minmax(min-content, 2fr)
+		minmax(min-content, 1fr) minmax(min-content, 1fr) minmax(min-content, 1fr) min-content;
+	border-radius: var(--size-rounded-sm);
 	overflow: hidden;
-	margin-top: var(--gap-md);
-	border: 1px solid var(--color-button-bg);
-	background-color: var(--color-raised-bg);
+	margin-top: var(--spacing-card-md);
+	outline: 1px solid transparent;
 
-	.table-row {
-		grid-template-columns: 2.75rem 3.75rem 2fr 1fr 1fr 1fr 3.5rem;
-	}
+	.grid-table__row {
+		display: contents;
 
-	.table-cell {
-		display: flex;
-		align-items: center;
-		gap: var(--gap-xs);
-		padding: var(--gap-md);
-		padding-left: 0;
-	}
+		> div {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			padding: var(--spacing-card-sm);
 
-	.check-cell {
-		padding-left: var(--gap-md);
+			&:first-child {
+				padding-left: var(--spacing-card-bg);
+			}
+
+			&:last-child {
+				padding-right: var(--spacing-card-bg);
+			}
+		}
+
+		&:nth-child(2n + 1) > div {
+			background-color: var(--color-table-alternate-row);
+		}
+
+		&.grid-table__header > div {
+			background-color: var(--color-bg);
+			font-weight: bold;
+			color: var(--color-text-dark);
+			padding-top: var(--spacing-card-bg);
+			padding-bottom: var(--spacing-card-bg);
+		}
 	}
 
 	@media screen and (max-width: 750px) {
 		display: flex;
 		flex-direction: column;
 
-		.table-row {
+		.grid-table__row {
 			display: grid;
 			grid-template: 'checkbox icon name type settings' 'checkbox icon id status settings';
 			grid-template-columns:
@@ -596,7 +612,7 @@ const onBulkEditLinks = useClientTry(async () => {
 			}
 		}
 
-		.table-head {
+		.grid-table__header {
 			grid-template: 'checkbox settings';
 			grid-template-columns: min-content minmax(min-content, 1fr);
 
@@ -611,7 +627,7 @@ const onBulkEditLinks = useClientTry(async () => {
 	}
 
 	@media screen and (max-width: 560px) {
-		.table-row {
+		.grid-table__row {
 			display: grid;
 			grid-template: 'checkbox icon name settings' 'checkbox icon id settings' 'checkbox icon type settings' 'checkbox icon status settings';
 			grid-template-columns: min-content min-content minmax(min-content, 1fr) min-content;
@@ -621,7 +637,7 @@ const onBulkEditLinks = useClientTry(async () => {
 			}
 		}
 
-		.table-head {
+		.grid-table__header {
 			grid-template: 'checkbox settings';
 			grid-template-columns: min-content minmax(min-content, 1fr);
 		}
@@ -652,13 +668,13 @@ const onBulkEditLinks = useClientTry(async () => {
 	flex-direction: row;
 	min-width: 0;
 	align-items: center;
-	gap: var(--gap-sm);
+	gap: var(--spacing-card-md);
 	white-space: nowrap;
 }
 
 .small-select {
-	width: fit-content;
 	width: -moz-fit-content;
+	width: fit-content;
 }
 
 .label-button[data-active='true'] {
@@ -688,16 +704,4 @@ const onBulkEditLinks = useClientTry(async () => {
 		margin: 0 0 var(--spacing-card-sm) 0;
 	}
 }
-
-h1 {
-	margin-block: var(--gap-sm) var(--gap-lg);
-	font-size: 2em;
-	line-height: 1em;
-}
-
-:deep(.checkbox-outer) {
-	button.checkbox {
-		border: none;
-	}
-}
 </style>
diff --git a/apps/frontend/src/pages/report.vue b/apps/frontend/src/pages/report.vue
index 39d8ba43..6ccc05e1 100644
--- a/apps/frontend/src/pages/report.vue
+++ b/apps/frontend/src/pages/report.vue
@@ -107,7 +107,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="flex flex-col gap-4 rounded-xl bg-bg-raised p-6">
+				<div class="card-shadow flex flex-col gap-4 rounded-xl bg-bg-raised p-6">
 					<template v-if="!prefilled || !currentItemValid">
 						<div class="flex flex-col gap-2">
 							<span class="text-lg font-bold text-contrast">
diff --git a/apps/frontend/src/pages/search/[searchProjectType].vue b/apps/frontend/src/pages/search/[searchProjectType].vue
index c3b1925f..f59e4f12 100644
--- a/apps/frontend/src/pages/search/[searchProjectType].vue
+++ b/apps/frontend/src/pages/search/[searchProjectType].vue
@@ -88,7 +88,10 @@
 						</button>
 					</ButtonStyled>
 				</div>
-				<div v-if="server && projectType.id === 'modpack'" class="rounded-2xl bg-bg-raised">
+				<div
+					v-if="server && projectType.id === 'modpack'"
+					class="card-shadow rounded-2xl bg-bg-raised"
+				>
 					<div class="flex flex-row items-center gap-2 px-6 py-4 text-contrast">
 						<h3 class="m-0 text-lg">Options</h3>
 					</div>
@@ -107,7 +110,10 @@
 						the selected modpack.
 					</div>
 				</div>
-				<div v-if="server && projectType.id !== 'modpack'" class="rounded-2xl bg-bg-raised p-4">
+				<div
+					v-if="server && projectType.id !== 'modpack'"
+					class="card-shadow rounded-2xl bg-bg-raised p-4"
+				>
 					<Checkbox
 						v-model="serverHideInstalled"
 						label="Hide installed content"
@@ -126,7 +132,7 @@
 					:class="
 						filtersMenuOpen
 							? 'border-0 border-b-[1px] border-solid border-divider last:border-b-0'
-							: 'rounded-2xl bg-bg-raised'
+							: 'card-shadow rounded-2xl bg-bg-raised'
 					"
 					button-class="button-animation flex flex-col gap-1 px-6 py-4 w-full bg-transparent cursor-pointer border-none"
 					content-class="mb-4 mx-3"
diff --git a/packages/assets/styles/classes.scss b/packages/assets/styles/classes.scss
index bb48d5f1..e6adcce6 100644
--- a/packages/assets/styles/classes.scss
+++ b/packages/assets/styles/classes.scss
@@ -825,7 +825,7 @@ a,
 .v-popper--theme-dropdown,
 .v-popper--theme-dropdown.v-popper--theme-ribbit-popout {
 	.v-popper__inner {
-		border: 1px solid var(--color-button-bg) !important;
+		border: 1px solid var(--color-divider) !important;
 		padding: var(--gap-sm) !important;
 		width: fit-content !important;
 		border-radius: var(--radius-md) !important;
@@ -834,7 +834,7 @@ a,
 	}
 
 	.v-popper__arrow-outer {
-		border-color: var(--color-button-bg) !important;
+		border-color: var(--color-divider) !important;
 	}
 
 	.v-popper__arrow-inner {
diff --git a/packages/assets/styles/highlightjs.scss b/packages/assets/styles/highlightjs.scss
index 63646a73..9b5eb743 100644
--- a/packages/assets/styles/highlightjs.scss
+++ b/packages/assets/styles/highlightjs.scss
@@ -76,7 +76,7 @@ pre {
 	padding: 1em 1em 1em 1em;
 	border-width: 5px;
 	border-radius: 2em;
-	border-color: var(--color-button-bg);
+	border-color: var(--color-divider);
 	overflow-x: hidden;
 
 	code {
diff --git a/packages/assets/styles/variables.scss b/packages/assets/styles/variables.scss
index 2d8a82f0..f1045b6a 100644
--- a/packages/assets/styles/variables.scss
+++ b/packages/assets/styles/variables.scss
@@ -3,7 +3,7 @@
 	--surface-2: #f5f5f5;
 	--surface-3: #f8f8f8;
 	--surface-4: #ffffff;
-	--surface-5: #e6e6e6;
+	--surface-5: #dddddd;
 
 	--color-red-50: #fef2f2;
 	--color-red-100: #fee5e7;
@@ -97,8 +97,8 @@
 	--color-button-border: rgba(161, 161, 161, 0.35);
 	--color-scrollbar: #96a2b0;
 
-	--color-divider: var(--surface-2);
-	--color-divider-dark: #c8cdd3;
+	--color-divider: var(--surface-5);
+	--color-divider-dark: var(--surface-5);
 
 	--color-base: var(--color-text-default);
 	--color-secondary: var(--color-text-tertiary);
@@ -207,6 +207,8 @@ html {
 	--color-link: var(--color-blue) !important;
 	--color-link-hover: var(--color-blue) !important; // DEPRECATED, use filters in future
 	--color-link-active: var(--color-blue) !important; // DEPRECATED, use filters in future
+
+	--shadow-button: 0 1px 3px 0 rgba(0, 0, 0, 0.05), 0 1px 2px 0 rgba(0, 0, 0, 0.15);
 }
 
 .light-mode,
diff --git a/packages/ui/src/components/base/ButtonStyled.vue b/packages/ui/src/components/base/ButtonStyled.vue
index 7782a927..30b7eb9a 100644
--- a/packages/ui/src/components/base/ButtonStyled.vue
+++ b/packages/ui/src/components/base/ButtonStyled.vue
@@ -164,23 +164,31 @@ function setColorFill(
 }
 
 const colorVariables = computed(() => {
+	const defaultShadow =
+		props.type === 'standard' || props.type === 'highlight' || props.highlighted
+			? 'var(--shadow-button)'
+			: 'none'
+
 	if (props.highlighted) {
 		const colors = {
 			bg:
 				props.highlightedStyle === 'main-nav-primary'
-					? 'var(--color-brand-highlight)'
+					? 'var(--color-button-bg-selected)'
 					: 'var(--color-button-bg)',
-			text: 'var(--color-contrast)',
+			text:
+				props.highlightedStyle === 'main-nav-primary'
+					? 'var(--color-button-text-selected)'
+					: 'var(--color-contrast)',
 			icon:
 				props.type === 'chip'
 					? 'var(--color-contrast)'
 					: props.highlightedStyle === 'main-nav-primary'
-						? 'var(--color-brand)'
+						? 'var(--color-button-text-selected)'
 						: 'var(--color-contrast)',
 		}
 		const hoverColors = JSON.parse(JSON.stringify(colors))
 		const boxShadow =
-			props.type === 'chip' && colorVar.value ? `0 0 0 2px ${colorVar.value}` : 'none'
+			props.type === 'chip' && colorVar.value ? `0 0 0 2px ${colorVar.value}` : defaultShadow
 		return `--_bg: ${colors.bg}; --_text: ${colors.text}; --_icon: ${colors.icon}; --_hover-bg: ${hoverColors.bg}; --_hover-text: ${hoverColors.text}; --_hover-icon: ${hoverColors.icon}; --_box-shadow: ${boxShadow};`
 	}
 
@@ -217,7 +225,8 @@ const colorVariables = computed(() => {
 		)
 	}
 
-	const boxShadow = props.type === 'chip' && colorVar.value ? `0 0 0 2px ${colorVar.value}` : 'none'
+	const boxShadow =
+		props.type === 'chip' && colorVar.value ? `0 0 0 2px ${colorVar.value}` : defaultShadow
 	return `--_bg: ${colors.bg}; --_text: ${colors.text}; --_hover-bg: ${hoverColors.bg}; --_hover-text: ${hoverColors.text}; --_box-shadow: ${boxShadow};`
 })
 
diff --git a/packages/ui/src/components/base/Checkbox.vue b/packages/ui/src/components/base/Checkbox.vue
index 49d874fe..ffc94897 100644
--- a/packages/ui/src/components/base/Checkbox.vue
+++ b/packages/ui/src/components/base/Checkbox.vue
@@ -1,31 +1,38 @@
 <template>
-	<div
-		class="checkbox-outer button-within"
-		:class="{ disabled }"
-		role="presentation"
+	<button
+		class="group bg-transparent border-none p-0 m-0 flex items-center gap-3 checkbox-outer outline-offset-4 text-contrast"
+		:disabled="disabled"
+		:class="
+			disabled
+				? 'cursor-not-allowed opacity-50'
+				: 'cursor-pointer hover:brightness-[--hover-brightness] focus-visible:brightness-[--hover-brightness]'
+		"
+		:aria-label="description"
+		:aria-checked="modelValue"
+		role="checkbox"
 		@click="toggle"
 	>
-		<button
-			class="checkbox border-none"
-			role="checkbox"
-			:disabled="disabled"
-			:class="{ checked: modelValue, collapsing: collapsingToggleStyle }"
-			:aria-label="description"
-			:aria-checked="modelValue"
+		<span
+			class="w-5 h-5 rounded-md flex items-center justify-center border-[1px] border-solid"
+			:class="
+				(modelValue
+					? 'bg-brand border-button-border text-brand-inverted'
+					: 'bg-surface-2 border-surface-5') +
+				(disabled ? '' : ' checkbox-shadow group-active:scale-95')
+			"
 		>
-			<MinusIcon v-if="indeterminate" aria-hidden="true" />
-			<CheckIcon v-else-if="modelValue && !collapsingToggleStyle" aria-hidden="true" />
-			<DropdownIcon v-else-if="collapsingToggleStyle" aria-hidden="true" />
-		</button>
+			<MinusIcon v-if="indeterminate" aria-hidden="true" stroke-width="3" />
+			<CheckIcon v-else-if="modelValue" aria-hidden="true" stroke-width="3" />
+		</span>
 		<!-- aria-hidden is set so screenreaders only use the <button>'s aria-label -->
-		<p v-if="label" aria-hidden="true" class="checkbox-label">
+		<span v-if="label" aria-hidden="true">
 			{{ label }}
-		</p>
+		</span>
 		<slot v-else />
-	</div>
+	</button>
 </template>
 <script setup lang="ts">
-import { CheckIcon, DropdownIcon, MinusIcon } from '@modrinth/assets'
+import { CheckIcon, MinusIcon } from '@modrinth/assets'
 
 const emit = defineEmits<{
 	'update:modelValue': [boolean]
@@ -38,7 +45,6 @@ const props = withDefaults(
 		description?: string
 		modelValue: boolean
 		clickEvent?: () => void
-		collapsingToggleStyle?: boolean
 		indeterminate?: boolean
 	}>(),
 	{
@@ -47,7 +53,6 @@ const props = withDefaults(
 		description: '',
 		modelValue: false,
 		clickEvent: () => {},
-		collapsingToggleStyle: false,
 		indeterminate: false,
 	},
 )
@@ -60,86 +65,7 @@ function toggle() {
 </script>
 
 <style lang="scss" scoped>
-.checkbox-outer {
-	display: flex;
-	align-items: center;
-	cursor: pointer;
-
-	p {
-		user-select: none;
-		padding: 0.2rem 0;
-		margin: 0;
-	}
-
-	&.disabled {
-		cursor: not-allowed;
-	}
-}
-
-.checkbox {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	cursor: pointer;
-
-	min-width: 1rem;
-	min-height: 1rem;
-
-	padding: 0;
-	margin: 0 0.5rem 0 0;
-
-	color: var(--color-contrast);
-	background-color: var(--color-button-bg);
-	border-radius: var(--radius-xs);
-	box-shadow:
-		var(--shadow-inset-sm),
-		0 0 0 0 transparent;
-
-	&.checked {
-		background-color: var(--color-brand);
-
-		svg {
-			color: var(--color-accent-contrast);
-		}
-	}
-
-	svg {
-		color: var(--color-secondary);
-		stroke-width: 0.2rem;
-		height: 0.8rem;
-		width: 0.8rem;
-		flex-shrink: 0;
-	}
-
-	&.collapsing {
-		background-color: transparent !important;
-		box-shadow: none;
-
-		svg {
-			color: inherit;
-			height: 1rem;
-			width: 1rem;
-			transition: transform 0.25s ease-in-out;
-
-			@media (prefers-reduced-motion) {
-				transition: none !important;
-			}
-		}
-
-		&.checked {
-			svg {
-				transform: rotate(180deg);
-			}
-		}
-	}
-
-	&:disabled {
-		box-shadow: none;
-		cursor: not-allowed;
-	}
-}
-
-.checkbox-label {
-	color: var(--color-base);
+.checkbox-shadow {
+	box-shadow: 1px 1px 2px 0 rgba(0, 0, 0, 0.08);
 }
 </style>
diff --git a/packages/ui/src/components/base/MarkdownEditor.vue b/packages/ui/src/components/base/MarkdownEditor.vue
index c60cf8ab..671f5e58 100644
--- a/packages/ui/src/components/base/MarkdownEditor.vue
+++ b/packages/ui/src/components/base/MarkdownEditor.vue
@@ -891,7 +891,7 @@ function openVideoModal() {
 }
 
 .markdown-body-wrapper {
-	border: 1px solid var(--color-button-bg);
+	border: 1px solid var(--color-divider);
 	border-radius: var(--radius-md);
 	width: 100%;
 	padding: var(--radius-md);
diff --git a/packages/ui/src/components/base/OverflowMenu.vue b/packages/ui/src/components/base/OverflowMenu.vue
index 59d2bcfa..61bfcc20 100644
--- a/packages/ui/src/components/base/OverflowMenu.vue
+++ b/packages/ui/src/components/base/OverflowMenu.vue
@@ -14,7 +14,7 @@
 				<div
 					v-if="isDivider(option)"
 					:key="`divider-${index}`"
-					class="h-px mx-3 my-2 bg-button-bg"
+					class="h-px mx-3 my-2 bg-surface-5"
 				></div>
 				<Button
 					v-else
diff --git a/packages/ui/src/components/chart/Chart.vue b/packages/ui/src/components/chart/Chart.vue
index 5eb65f22..c1526215 100644
--- a/packages/ui/src/components/chart/Chart.vue
+++ b/packages/ui/src/components/chart/Chart.vue
@@ -286,7 +286,7 @@ svg {
 :deep(.apexcharts-yaxistooltip) {
 	background: var(--color-raised-bg) !important;
 	border-radius: var(--radius-sm) !important;
-	border: 1px solid var(--color-button-bg) !important;
+	border: 1px solid var(--color-divider) !important;
 	box-shadow: var(--shadow-floating) !important;
 	font-size: var(--font-size-nm) !important;
 }
@@ -301,7 +301,7 @@ svg {
 :deep(.apexcharts-xaxistooltip) {
 	background: var(--color-raised-bg) !important;
 	border-radius: var(--radius-sm) !important;
-	border: 1px solid var(--color-button-bg) !important;
+	border: 1px solid var(--color-divider) !important;
 	font-size: var(--font-size-nm) !important;
 	color: var(--color-base) !important;
 
diff --git a/packages/ui/src/components/chart/CompactChart.vue b/packages/ui/src/components/chart/CompactChart.vue
index d8dbf54a..387e1b92 100644
--- a/packages/ui/src/components/chart/CompactChart.vue
+++ b/packages/ui/src/components/chart/CompactChart.vue
@@ -161,10 +161,10 @@ const chartOptions = ref({
 	display: flex;
 	flex-direction: column;
 	gap: var(--gap-xs);
-	border: 1px solid var(--color-button-bg);
+	border: 1px solid var(--color-divider);
 	border-radius: var(--radius-md);
 	background-color: var(--color-raised-bg);
-	box-shadow: var(--shadow-floating);
+	box-shadow: var(--shadow-card);
 	color: var(--color-base);
 	font-size: var(--font-size-nm);
 	width: 100%;
@@ -190,7 +190,7 @@ svg {
 :deep(.apexcharts-yaxistooltip) {
 	background: var(--color-raised-bg) !important;
 	border-radius: var(--radius-sm) !important;
-	border: 1px solid var(--color-button-bg) !important;
+	border: 1px solid var(--color-divider) !important;
 	box-shadow: var(--shadow-floating) !important;
 	font-size: var(--font-size-nm) !important;
 }
diff --git a/packages/ui/src/components/modal/NewModal.vue b/packages/ui/src/components/modal/NewModal.vue
index d4e1bccd..56d06a63 100644
--- a/packages/ui/src/components/modal/NewModal.vue
+++ b/packages/ui/src/components/modal/NewModal.vue
@@ -151,21 +151,10 @@ const visible = ref(false)
 const scrollContainer = ref<HTMLElement | null>(null)
 const { showTopFade, showBottomFade, checkScrollState } = useScrollIndicator(scrollContainer)
 
-// make modal opening not shift page when there's a vertical scrollbar
-function addBodyPadding() {
-	const scrollBarWidth = window.innerWidth - document.documentElement.clientWidth
-	if (scrollBarWidth > 0) {
-		document.body.style.paddingRight = `${scrollBarWidth}px`
-	} else {
-		document.body.style.paddingRight = ''
-	}
-}
-
 function show(event?: MouseEvent) {
 	props.onShow?.()
 	open.value = true
 
-	addBodyPadding()
 	document.body.style.overflow = 'hidden'
 	window.addEventListener('mousedown', updateMousePosition)
 	window.addEventListener('keydown', handleKeyDown)
@@ -184,7 +173,6 @@ function hide() {
 	props.onHide?.()
 	visible.value = false
 	document.body.style.overflow = ''
-	document.body.style.paddingRight = ''
 	window.removeEventListener('mousedown', updateMousePosition)
 	window.removeEventListener('keydown', handleKeyDown)
 	setTimeout(() => {
diff --git a/packages/ui/src/components/project/ProjectPageVersions.vue b/packages/ui/src/components/project/ProjectPageVersions.vue
index 07421fe8..6f27fe76 100644
--- a/packages/ui/src/components/project/ProjectPageVersions.vue
+++ b/packages/ui/src/components/project/ProjectPageVersions.vue
@@ -50,7 +50,7 @@
 		<template v-for="(version, index) in currentVersions" :key="index">
 			<!-- Row divider -->
 			<div
-				class="versions-grid-row h-px w-full bg-button-bg"
+				class="versions-grid-row h-px w-full bg-surface-5"
 				:class="{
 					'max-sm:!hidden': index === 0,
 				}"

From 26feaf753a4d481095f5ccc1f6f87b324cd1103d Mon Sep 17 00:00:00 2001
From: Truman Gao <106889354+tdgao@users.noreply.github.com>
Date: Thu, 13 Nov 2025 15:51:08 -0800
Subject: [PATCH 55/64] Fixes #4348 (#4773)

* also fixes spacing issue in collections card small width

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 apps/frontend/src/pages/user/[id].vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/frontend/src/pages/user/[id].vue b/apps/frontend/src/pages/user/[id].vue
index e6d876a8..da7f8db8 100644
--- a/apps/frontend/src/pages/user/[id].vue
+++ b/apps/frontend/src/pages/user/[id].vue
@@ -318,7 +318,10 @@
 					</span>
 					<span v-else class="text">{{ formatMessage(messages.profileNoProjectsLabel) }}</span>
 				</div>
-				<div v-if="['collections'].includes(route.params.projectType)" class="collections-grid">
+				<div
+					v-if="!route.params.projectType || route.params.projectType === 'collections'"
+					class="collections-grid"
+				>
 					<nuxt-link
 						v-for="collection in collections.sort(
 							(a, b) => new Date(b.created) - new Date(a.created),
@@ -902,6 +905,7 @@ export default defineNuxtComponent({
 	}
 
 	gap: var(--gap-md);
+	margin-bottom: var(--gap-md);
 
 	.collection-item {
 		display: flex;

From 7ccc32675b0f9d9442aef2dbf3596667c5a7d550 Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Fri, 14 Nov 2025 17:15:09 +0000
Subject: [PATCH 56/64] feat: start of cross platform page system (#4731)

* feat: abstract api-client DI into ui package

* feat: cross platform page system

* feat: tanstack as cross platform useAsyncData

* feat: archon servers routes + labrinth billing routes

* fix: dont use partial

* feat: migrate server list page to tanstack + api-client + re-enabled broken features!

* feat: migrate servers manage page to api-client before page system

* feat: migrate manage page to page system

* fix: type issues

* fix: upgrade wrapper bugs

* refactor: move state types into api-client

* feat: disable financial stuff on app frontend

* feat: finalize cross platform page system for now

* fix: lint

* fix: build issues

* feat: remove papaparse

* fix: lint

* fix: interface error

---------

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 apps/app-frontend/package.json                |   6 +-
 apps/app-frontend/src/App.vue                 |  20 +
 apps/app-frontend/src/main.js                 |   2 +
 apps/app-frontend/src/routes.js               |   9 +
 apps/app-frontend/src/store/theme.ts          |   1 +
 apps/frontend/nuxt.config.ts                  | 133 +----
 apps/frontend/package.json                    |   5 +-
 apps/frontend/src/app.vue                     |   7 +-
 .../ui/servers/PanelServerActionButton.vue    |   3 +-
 .../ui/servers/ServerListingSkeleton.vue      |  24 -
 .../ui/servers/ServerManageEmptyState.vue     |  19 -
 .../ui/servers/ServersUpgradeModalWrapper.vue | 268 +----------
 .../servers/marketing/MedalPlanPromotion.vue  |   3 +-
 .../marketing/MedalServerCountdown.vue        |   4 +-
 apps/frontend/src/composables/generated.ts    |  74 +--
 apps/frontend/src/error.vue                   |   4 +-
 .../api-client.ts => helpers/api.ts}          |  10 +-
 .../[type]/[id]/settings/environment.vue      |   9 +-
 .../pages/[type]/[id]/settings/general.vue    |   3 +-
 .../src/pages/servers/manage/[id].vue         |   4 +-
 .../servers/manage/[id]/options/index.vue     |   3 +-
 .../src/pages/servers/manage/index.vue        | 257 +---------
 .../src/pages/settings/billing/index.vue      |   2 +-
 apps/frontend/src/plugins/tanstack.ts         |  28 ++
 .../api-client/src/core/abstract-client.ts    |   9 +-
 packages/api-client/src/features/auth.ts      |   6 +
 .../api-client/src/modules/archon/index.ts    |   3 +
 .../src/modules/archon/servers/v0.ts          |  57 +++
 .../src/modules/archon/servers/v1.ts          |  20 +
 .../api-client/src/modules/archon/types.ts    | 128 +++++
 packages/api-client/src/modules/index.ts      |  12 +
 .../api-client/src/modules/iso3166/index.ts   | 121 +++++
 .../api-client/src/modules/iso3166/types.ts   |  23 +
 .../api-client/src/modules/kyros/files/v0.ts  |  52 ++
 .../api-client/src/modules/kyros/types.ts     |   7 +
 .../src/modules/labrinth/billing/internal.ts  | 189 ++++++++
 .../api-client/src/modules/labrinth/index.ts  |   2 +
 .../src/modules/labrinth/projects/types/v2.ts | 115 -----
 .../src/modules/labrinth/projects/types/v3.ts |  54 ---
 .../src/modules/labrinth/projects/v2.ts       |  18 +-
 .../src/modules/labrinth/projects/v3.ts       |  12 +-
 .../src/modules/labrinth/state/index.ts       | 135 ++++++
 .../api-client/src/modules/labrinth/types.ts  | 453 ++++++++++++++++++
 packages/api-client/src/modules/types.ts      |   6 +-
 packages/api-client/src/types/request.ts      |   2 +-
 packages/api-client/tsconfig.json             |   5 +-
 .../illustrations}/minecraft_server_icon.png  | Bin
 packages/assets/index.ts                      |   2 +
 packages/tooling-config/eslint/common.mjs     |   2 +
 packages/ui/index.ts                          |   1 +
 packages/ui/package.json                      |  16 +-
 .../billing/ModalBasedServerPlan.vue          |  32 +-
 .../billing/ModrinthServersPurchaseModal.vue  |  46 +-
 .../src/components/billing/PurchaseModal.vue  |   2 +-
 .../billing/ServersPurchase0Plan.vue          |  29 +-
 .../billing/ServersPurchase1Region.vue        | 143 +++---
 .../billing/ServersPurchase3Review.vue        |  61 ++-
 .../billing/ServersRegionButton.vue           |   4 +-
 .../billing/ServersUpgradeModalWrapper.vue    | 341 +++++++++++++
 packages/ui/src/components/index.ts           |   8 +
 .../ProjectSettingsEnvSelector.vue            |   5 +-
 .../src/components}/servers/ServerListing.vue | 141 ++++--
 .../servers/{ => icons}/LoaderIcon.vue        |   0
 .../components/servers/icons}/ServerIcon.vue  |   4 +-
 .../servers/labels}/ServerGameLabel.vue       |   9 +-
 .../servers/labels}/ServerInfoLabels.vue      |   1 +
 .../servers/labels}/ServerLoaderLabel.vue     |  12 +-
 .../servers/labels}/ServerSubdomainLabel.vue  |   4 +-
 .../servers/labels}/ServerUptimeLabel.vue     |   5 +-
 .../marketing/MedalBackgroundImage.vue        |   1 -
 .../servers/marketing/MedalServerListing.vue  |  66 +--
 packages/ui/src/composables/stripe.ts         | 138 ++----
 packages/ui/src/pages/index.ts                |   1 +
 .../ui/src/pages/servers/manage/index.vue     | 339 +++++++++++++
 packages/ui/src/providers/api-client.ts       |   8 +
 packages/ui/src/providers/index.ts            |   1 +
 packages/ui/src/providers/project-page.ts     |   8 +-
 packages/ui/src/utils/product-utils.ts        |  54 +++
 pnpm-lock.yaml                                |  79 ++-
 79 files changed, 2631 insertions(+), 1259 deletions(-)
 delete mode 100644 apps/frontend/src/components/ui/servers/ServerListingSkeleton.vue
 delete mode 100644 apps/frontend/src/components/ui/servers/ServerManageEmptyState.vue
 rename apps/frontend/src/{providers/api-client.ts => helpers/api.ts} (78%)
 create mode 100644 apps/frontend/src/plugins/tanstack.ts
 create mode 100644 packages/api-client/src/modules/archon/index.ts
 create mode 100644 packages/api-client/src/modules/archon/servers/v0.ts
 create mode 100644 packages/api-client/src/modules/archon/servers/v1.ts
 create mode 100644 packages/api-client/src/modules/archon/types.ts
 create mode 100644 packages/api-client/src/modules/iso3166/index.ts
 create mode 100644 packages/api-client/src/modules/iso3166/types.ts
 create mode 100644 packages/api-client/src/modules/kyros/files/v0.ts
 create mode 100644 packages/api-client/src/modules/kyros/types.ts
 create mode 100644 packages/api-client/src/modules/labrinth/billing/internal.ts
 delete mode 100644 packages/api-client/src/modules/labrinth/projects/types/v2.ts
 delete mode 100644 packages/api-client/src/modules/labrinth/projects/types/v3.ts
 create mode 100644 packages/api-client/src/modules/labrinth/state/index.ts
 create mode 100644 packages/api-client/src/modules/labrinth/types.ts
 rename {apps/frontend/src/assets/images/servers => packages/assets/external/illustrations}/minecraft_server_icon.png (100%)
 create mode 100644 packages/ui/src/components/billing/ServersUpgradeModalWrapper.vue
 rename {apps/frontend/src/components/ui => packages/ui/src/components}/servers/ServerListing.vue (56%)
 rename packages/ui/src/components/servers/{ => icons}/LoaderIcon.vue (100%)
 rename {apps/frontend/src/components/ui/servers => packages/ui/src/components/servers/icons}/ServerIcon.vue (85%)
 rename {apps/frontend/src/components/ui/servers => packages/ui/src/components/servers/labels}/ServerGameLabel.vue (89%)
 rename {apps/frontend/src/components/ui/servers => packages/ui/src/components/servers/labels}/ServerInfoLabels.vue (94%)
 rename {apps/frontend/src/components/ui/servers => packages/ui/src/components/servers/labels}/ServerLoaderLabel.vue (89%)
 rename {apps/frontend/src/components/ui/servers => packages/ui/src/components/servers/labels}/ServerSubdomainLabel.vue (93%)
 rename {apps/frontend/src/components/ui/servers => packages/ui/src/components/servers/labels}/ServerUptimeLabel.vue (94%)
 rename {apps/frontend/src/components/ui => packages/ui/src/components}/servers/marketing/MedalBackgroundImage.vue (96%)
 rename {apps/frontend/src/components/ui => packages/ui/src/components}/servers/marketing/MedalServerListing.vue (78%)
 create mode 100644 packages/ui/src/pages/index.ts
 create mode 100644 packages/ui/src/pages/servers/manage/index.vue
 create mode 100644 packages/ui/src/providers/api-client.ts
 create mode 100644 packages/ui/src/utils/product-utils.ts

diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json
index 565b2391..d68bcf03 100644
--- a/apps/app-frontend/package.json
+++ b/apps/app-frontend/package.json
@@ -13,11 +13,13 @@
 		"test": "vue-tsc --noEmit"
 	},
 	"dependencies": {
-		"@sfirew/minecraft-motd-parser": "^1.1.6",
+		"@modrinth/api-client": "workspace:^",
 		"@modrinth/assets": "workspace:*",
 		"@modrinth/ui": "workspace:*",
 		"@modrinth/utils": "workspace:*",
 		"@sentry/vue": "^8.27.0",
+		"@sfirew/minecraft-motd-parser": "^1.1.6",
+		"@tanstack/vue-query": "^5.90.7",
 		"@tauri-apps/api": "^2.5.0",
 		"@tauri-apps/plugin-dialog": "^2.2.1",
 		"@tauri-apps/plugin-http": "^2.5.0",
@@ -41,9 +43,9 @@
 		"vue-virtual-scroller": "v2.0.0-beta.8"
 	},
 	"devDependencies": {
-		"@modrinth/tooling-config": "workspace:*",
 		"@eslint/compat": "^1.1.1",
 		"@formatjs/cli": "^6.2.12",
+		"@modrinth/tooling-config": "workspace:*",
 		"@nuxt/eslint-config": "^0.5.6",
 		"@taijased/vue-render-tracker": "^1.0.7",
 		"@vitejs/plugin-vue": "^5.0.4",
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 6eda2bc5..da980ba1 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -1,4 +1,5 @@
 <script setup>
+import { AuthFeature, TauriModrinthClient } from '@modrinth/api-client'
 import {
 	ArrowBigUpDashIcon,
 	ChangeSkinIcon,
@@ -18,6 +19,7 @@ import {
 	RefreshCwIcon,
 	RestoreIcon,
 	RightArrowIcon,
+	ServerIcon,
 	SettingsIcon,
 	UserIcon,
 	WorldIcon,
@@ -32,6 +34,7 @@ import {
 	NotificationPanel,
 	OverflowMenu,
 	ProgressSpinner,
+	provideModrinthClient,
 	provideNotificationManager,
 } from '@modrinth/ui'
 import { renderString } from '@modrinth/utils'
@@ -102,6 +105,16 @@ const notificationManager = new AppNotificationManager()
 provideNotificationManager(notificationManager)
 const { handleError, addNotification } = notificationManager
 
+const tauriApiClient = new TauriModrinthClient({
+	userAgent: `modrinth/theseus/${getVersion()} (support@modrinth.com)`,
+	features: [
+		new AuthFeature({
+			token: async () => (await getCreds()).session,
+		}),
+	],
+})
+provideModrinthClient(tauriApiClient)
+
 const news = ref([])
 const availableSurvey = ref(false)
 
@@ -742,6 +755,13 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			<NavButton v-if="themeStore.featureFlags.worlds_tab" v-tooltip.right="'Worlds'" to="/worlds">
 				<WorldIcon />
 			</NavButton>
+			<NavButton
+				v-if="themeStore.featureFlags.servers_in_app"
+				v-tooltip.right="'Servers'"
+				to="/servers/manage"
+			>
+				<ServerIcon />
+			</NavButton>
 			<NavButton
 				v-tooltip.right="'Discover content'"
 				to="/browse/modpack"
diff --git a/apps/app-frontend/src/main.js b/apps/app-frontend/src/main.js
index e9160d23..5c01126f 100644
--- a/apps/app-frontend/src/main.js
+++ b/apps/app-frontend/src/main.js
@@ -2,6 +2,7 @@ import 'floating-vue/dist/style.css'
 
 import * as Sentry from '@sentry/vue'
 import { VueScanPlugin } from '@taijased/vue-render-tracker'
+import { VueQueryPlugin } from '@tanstack/vue-query'
 import { createPlugin } from '@vintl/vintl/plugin'
 import FloatingVue from 'floating-vue'
 import { createPinia } from 'pinia'
@@ -45,6 +46,7 @@ Sentry.init({
 	tracesSampleRate: 0.1,
 })
 
+app.use(VueQueryPlugin)
 app.use(vueScan)
 app.use(router)
 app.use(pinia)
diff --git a/apps/app-frontend/src/routes.js b/apps/app-frontend/src/routes.js
index 22ae62ad..0384017e 100644
--- a/apps/app-frontend/src/routes.js
+++ b/apps/app-frontend/src/routes.js
@@ -1,3 +1,4 @@
+import { ServersManagePageIndex } from '@modrinth/ui'
 import { createRouter, createWebHistory } from 'vue-router'
 
 import * as Pages from '@/pages'
@@ -27,6 +28,14 @@ export default new createRouter({
 				breadcrumb: [{ name: 'Worlds' }],
 			},
 		},
+		{
+			path: '/servers/manage/',
+			name: 'Servers',
+			component: ServersManagePageIndex,
+			meta: {
+				breadcrumb: [{ name: 'Servers' }],
+			},
+		},
 		{
 			path: '/browse/:projectType',
 			name: 'Discover content',
diff --git a/apps/app-frontend/src/store/theme.ts b/apps/app-frontend/src/store/theme.ts
index b187f1a4..9e082dfc 100644
--- a/apps/app-frontend/src/store/theme.ts
+++ b/apps/app-frontend/src/store/theme.ts
@@ -5,6 +5,7 @@ export const DEFAULT_FEATURE_FLAGS = {
 	page_path: false,
 	worlds_tab: false,
 	worlds_in_home: true,
+	servers_in_app: false,
 }
 
 export const THEME_OPTIONS = ['dark', 'light', 'oled', 'system'] as const
diff --git a/apps/frontend/nuxt.config.ts b/apps/frontend/nuxt.config.ts
index 0e41c083..beaf5a99 100644
--- a/apps/frontend/nuxt.config.ts
+++ b/apps/frontend/nuxt.config.ts
@@ -1,22 +1,16 @@
 import { pathToFileURL } from 'node:url'
 
 import { match as matchLocale } from '@formatjs/intl-localematcher'
+import { GenericModrinthClient, type Labrinth } from '@modrinth/api-client'
 import serverSidedVue from '@vitejs/plugin-vue'
 import { consola } from 'consola'
 import { promises as fs } from 'fs'
 import { globIterate } from 'glob'
 import { defineNuxtConfig } from 'nuxt/config'
-import { $fetch } from 'ofetch'
-import Papa from 'papaparse'
 import { basename, relative, resolve } from 'pathe'
 import svgLoader from 'vite-svg-loader'
 
-import type { GeneratedState } from './src/composables/generated'
-
 const STAGING_API_URL = 'https://staging-api.modrinth.com/v2/'
-// ISO 3166 data from https://github.com/ipregistry/iso3166
-// Licensed under CC BY-SA 4.0
-const ISO3166_REPO = 'https://raw.githubusercontent.com/ipregistry/iso3166/master'
 
 const preloadedFonts = [
 	'inter/Inter-Regular.woff2',
@@ -139,7 +133,7 @@ export default defineNuxtConfig({
 			// 30 minutes
 			const TTL = 30 * 60 * 1000
 
-			let state: Partial<GeneratedState> = {}
+			let state: Partial<Labrinth.State.GeneratedState & Record<string, any>> = {}
 
 			try {
 				state = JSON.parse(await fs.readFile('./src/generated/state.json', 'utf8'))
@@ -165,124 +159,19 @@ export default defineNuxtConfig({
 				return
 			}
 
+			const client = new GenericModrinthClient({
+				labrinthBaseUrl: API_URL.replace('/v2/', ''),
+				userAgent: 'Knossos generator (support@modrinth.com)',
+			})
+
+			const generatedState = await client.labrinth.state.build()
 			state.lastGenerated = new Date().toISOString()
-
 			state.apiUrl = API_URL
-
-			const headers = {
-				headers: {
-					'user-agent': 'Knossos generator (support@modrinth.com)',
-				},
+			state = {
+				...state,
+				...generatedState,
 			}
 
-			const caughtErrorCodes = new Set<number>()
-
-			function handleFetchError(err: any, defaultValue: any) {
-				console.error('Error generating state: ', err)
-				caughtErrorCodes.add(err.status)
-				return defaultValue
-			}
-
-			const [
-				categories,
-				loaders,
-				gameVersions,
-				donationPlatforms,
-				reportTypes,
-				homePageProjects,
-				homePageSearch,
-				homePageNotifs,
-				products,
-				muralBankDetails,
-				countriesCSV,
-				subdivisionsCSV,
-			] = await Promise.all([
-				$fetch(`${API_URL}tag/category`, headers).catch((err) => handleFetchError(err, [])),
-				$fetch(`${API_URL}tag/loader`, headers).catch((err) => handleFetchError(err, [])),
-				$fetch(`${API_URL}tag/game_version`, headers).catch((err) => handleFetchError(err, [])),
-				$fetch(`${API_URL}tag/donation_platform`, headers).catch((err) =>
-					handleFetchError(err, []),
-				),
-				$fetch(`${API_URL}tag/report_type`, headers).catch((err) => handleFetchError(err, [])),
-				$fetch(`${API_URL}projects_random?count=60`, headers).catch((err) =>
-					handleFetchError(err, []),
-				),
-				$fetch(`${API_URL}search?limit=3&query=leave&index=relevance`, headers).catch((err) =>
-					handleFetchError(err, {}),
-				),
-				$fetch(`${API_URL}search?limit=3&query=&index=updated`, headers).catch((err) =>
-					handleFetchError(err, {}),
-				),
-				$fetch(`${API_URL.replace('/v2/', '/_internal/')}billing/products`, headers).catch((err) =>
-					handleFetchError(err, []),
-				),
-				$fetch(`${API_URL.replace('/v2/', '/_internal/')}mural/bank-details`, headers).catch(
-					(err) => handleFetchError(err, null),
-				),
-				$fetch<string>(`${ISO3166_REPO}/countries.csv`, {
-					...headers,
-					responseType: 'text',
-				}).catch((err) => handleFetchError(err, '')),
-				$fetch<string>(`${ISO3166_REPO}/subdivisions.csv`, {
-					...headers,
-					responseType: 'text',
-				}).catch((err) => handleFetchError(err, '')),
-			])
-
-			const countriesData = Papa.parse(countriesCSV, {
-				header: true,
-				skipEmptyLines: true,
-				transformHeader: (header) => (header.startsWith('#') ? header.slice(1) : header),
-			}).data
-			const subdivisionsData = Papa.parse(subdivisionsCSV, {
-				header: true,
-				skipEmptyLines: true,
-				transformHeader: (header) => (header.startsWith('#') ? header.slice(1) : header),
-			}).data
-
-			const subdivisionsByCountry = (subdivisionsData as any[]).reduce(
-				(acc, sub) => {
-					const countryCode = sub.country_code_alpha2
-
-					if (!countryCode || typeof countryCode !== 'string' || countryCode.trim() === '') {
-						return acc
-					}
-
-					if (!acc[countryCode]) acc[countryCode] = []
-
-					acc[countryCode].push({
-						code: sub['subdivision_code_iso3166-2'],
-						name: sub.subdivision_name,
-						localVariant: sub.localVariant || null,
-						category: sub.category,
-						parent: sub.parent_subdivision || null,
-						language: sub.language_code,
-					})
-					return acc
-				},
-				{} as Record<string, any[]>,
-			)
-
-			state.categories = categories
-			state.loaders = loaders
-			state.gameVersions = gameVersions
-			state.donationPlatforms = donationPlatforms
-			state.reportTypes = reportTypes
-			state.homePageProjects = homePageProjects
-			state.homePageSearch = homePageSearch
-			state.homePageNotifs = homePageNotifs
-			state.products = products
-			state.muralBankDetails = muralBankDetails.bankDetails
-			state.countries = (countriesData as any[]).map((c) => ({
-				alpha2: c.country_code_alpha2,
-				alpha3: c.country_code_alpha3,
-				numeric: c.numeric_code,
-				nameShort: c.name_short,
-				nameLong: c.name_long,
-			}))
-			state.subdivisions = subdivisionsByCountry
-			state.errors = [...caughtErrorCodes]
-
 			await fs.writeFile('./src/generated/state.json', JSON.stringify(state))
 
 			console.log('Tags generated!')
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index c650cdf3..e55353eb 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -18,7 +18,6 @@
 		"@nuxt/devtools": "^1.3.3",
 		"@types/dompurify": "^3.0.5",
 		"@types/node": "^20.1.0",
-		"@types/papaparse": "^5.3.15",
 		"@vintl/compact-number": "^2.0.5",
 		"@vintl/how-ago": "^3.0.1",
 		"@vintl/nuxt": "^1.9.2",
@@ -38,13 +37,14 @@
 		"@formatjs/intl-localematcher": "^0.5.4",
 		"@intercom/messenger-js-sdk": "^0.0.14",
 		"@ltd/j-toml": "^1.38.0",
+		"@modrinth/api-client": "workspace:*",
 		"@modrinth/assets": "workspace:*",
 		"@modrinth/blog": "workspace:*",
 		"@modrinth/moderation": "workspace:*",
 		"@modrinth/ui": "workspace:*",
 		"@modrinth/utils": "workspace:*",
-		"@modrinth/api-client": "workspace:*",
 		"@pinia/nuxt": "^0.5.1",
+		"@tanstack/vue-query": "^5.90.7",
 		"@types/three": "^0.172.0",
 		"@vintl/vintl": "^4.4.1",
 		"@vitejs/plugin-vue": "^5.0.4",
@@ -61,7 +61,6 @@
 		"js-yaml": "^4.1.0",
 		"jszip": "^3.10.1",
 		"markdown-it": "14.1.0",
-		"papaparse": "^5.4.1",
 		"pathe": "^1.1.2",
 		"pinia": "^2.1.7",
 		"pinia-plugin-persistedstate": "^4.4.1",
diff --git a/apps/frontend/src/app.vue b/apps/frontend/src/app.vue
index 5c58f2f2..d37d0e71 100644
--- a/apps/frontend/src/app.vue
+++ b/apps/frontend/src/app.vue
@@ -6,12 +6,11 @@
 	</NuxtLayout>
 </template>
 <script setup lang="ts">
-import { NotificationPanel, provideNotificationManager } from '@modrinth/ui'
+import { NotificationPanel, provideModrinthClient, provideNotificationManager } from '@modrinth/ui'
 
 import ModrinthLoadingIndicator from '~/components/ui/modrinth-loading-indicator.ts'
-
-import { createModrinthClient, provideModrinthClient } from './providers/api-client.ts'
-import { FrontendNotificationManager } from './providers/frontend-notifications.ts'
+import { createModrinthClient } from '~/helpers/api.ts'
+import { FrontendNotificationManager } from '~/providers/frontend-notifications.ts'
 
 const auth = await useAuth()
 const config = useRuntimeConfig()
diff --git a/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue b/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
index 4899838a..a5ef8f0b 100644
--- a/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
+++ b/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
@@ -120,7 +120,7 @@ import {
 	UpdatedIcon,
 	XIcon,
 } from '@modrinth/assets'
-import { ButtonStyled, Checkbox, NewModal } from '@modrinth/ui'
+import { ButtonStyled, Checkbox, NewModal, ServerInfoLabels } from '@modrinth/ui'
 import type { PowerAction as ServerPowerAction, ServerState } from '@modrinth/utils'
 import { useStorage } from '@vueuse/core'
 import { computed, ref } from 'vue'
@@ -130,7 +130,6 @@ import type { BackupInProgressReason } from '~/pages/servers/manage/[id].vue'
 
 import LoadingIcon from './icons/LoadingIcon.vue'
 import PanelSpinner from './PanelSpinner.vue'
-import ServerInfoLabels from './ServerInfoLabels.vue'
 import TeleportOverflowMenu from './TeleportOverflowMenu.vue'
 
 const flags = useFeatureFlags()
diff --git a/apps/frontend/src/components/ui/servers/ServerListingSkeleton.vue b/apps/frontend/src/components/ui/servers/ServerListingSkeleton.vue
deleted file mode 100644
index ae9b0d85..00000000
--- a/apps/frontend/src/components/ui/servers/ServerListingSkeleton.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-	<div class="flex flex-row items-center gap-8 overflow-x-hidden rounded-3xl bg-bg-raised p-4">
-		<div class="relative grid place-content-center">
-			<img
-				no-shadow
-				size="lg"
-				alt="Server Icon"
-				class="size-[96px] rounded-xl bg-bg-raised opacity-50"
-				src="~/assets/images/servers/minecraft_server_icon.png"
-			/>
-			<div class="absolute inset-0 grid place-content-center">
-				<LoadingIcon class="size-8 animate-spin text-contrast" />
-			</div>
-		</div>
-		<div class="flex flex-col gap-4">
-			<h2 class="m-0 text-contrast">Your new server is being prepared.</h2>
-			<p class="m-0">It'll appear here once it's ready.</p>
-		</div>
-	</div>
-</template>
-
-<script lang="ts" setup>
-import LoadingIcon from './icons/LoadingIcon.vue'
-</script>
diff --git a/apps/frontend/src/components/ui/servers/ServerManageEmptyState.vue b/apps/frontend/src/components/ui/servers/ServerManageEmptyState.vue
deleted file mode 100644
index cc2ab2ba..00000000
--- a/apps/frontend/src/components/ui/servers/ServerManageEmptyState.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-	<div class="flex h-full flex-col items-center justify-center gap-8">
-		<img
-			src="https://cdn.modrinth.com/servers/excitement.webp"
-			alt=""
-			class="max-w-[360px]"
-			style="mask-image: radial-gradient(97% 77% at 50% 25%, #d9d9d9 0, hsla(0, 0%, 45%, 0) 100%)"
-		/>
-		<h1 class="m-0 text-contrast">You don't have any servers yet!</h1>
-		<p class="m-0">Modrinth Servers is a new way to play modded Minecraft with your friends.</p>
-		<ButtonStyled size="large" type="standard" color="brand">
-			<NuxtLink to="/servers#plan">Create a Server</NuxtLink>
-		</ButtonStyled>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { ButtonStyled } from '@modrinth/ui'
-</script>
diff --git a/apps/frontend/src/components/ui/servers/ServersUpgradeModalWrapper.vue b/apps/frontend/src/components/ui/servers/ServersUpgradeModalWrapper.vue
index a9e5cf47..b3354419 100644
--- a/apps/frontend/src/components/ui/servers/ServersUpgradeModalWrapper.vue
+++ b/apps/frontend/src/components/ui/servers/ServersUpgradeModalWrapper.vue
@@ -1,270 +1,24 @@
 <template>
-	<ModrinthServersPurchaseModal
-		v-if="customer"
-		ref="purchaseModal"
-		:publishable-key="config.public.stripePublishableKey"
-		:initiate-payment="async (body) => await initiatePayment(body)"
-		:available-products="pyroProducts"
-		:on-error="handleError"
-		:customer="customer"
-		:payment-methods="paymentMethods"
-		:currency="selectedCurrency"
-		:return-url="`${config.public.siteUrl}/servers/manage`"
-		:pings="regionPings"
-		:regions="regions"
-		:refresh-payment-methods="fetchPaymentData"
-		:fetch-stock="fetchStock"
-		:plan-stage="true"
-		:existing-plan="currentPlanFromSubscription"
-		:existing-subscription="subscription || undefined"
-		:on-finalize-no-payment-change="finalizeDowngrade"
-		@hide="
-			() => {
-				subscription = null
-			}
-		"
+	<ServersUpgradeModalWrapperBase
+		ref="wrapperRef"
+		:stripe-publishable-key="config.public.stripePublishableKey"
+		:site-url="config.public.siteUrl"
+		:products="generatedState.products || []"
 	/>
 </template>
 
 <script setup lang="ts">
-import { injectNotificationManager, ModrinthServersPurchaseModal } from '@modrinth/ui'
-import type { ServerPlan } from '@modrinth/ui/src/utils/billing'
-import type { UserSubscription } from '@modrinth/utils'
-import { computed, onMounted, ref } from 'vue'
+// TODO: Remove this wrapper when we figure out how to do cross platform state + stripe
+import { ServersUpgradeModalWrapper as ServersUpgradeModalWrapperBase } from '@modrinth/ui'
 
-import { useServersFetch } from '~/composables/servers/servers-fetch.ts'
-import { products } from '~/generated/state.json'
-
-const { addNotification } = injectNotificationManager()
+import { useGeneratedState } from '~/composables/generated'
 
 const config = useRuntimeConfig()
-const purchaseModal = ref<InstanceType<typeof ModrinthServersPurchaseModal> | null>(null)
-const customer = ref<any>(null)
-const paymentMethods = ref<any[]>([])
-const selectedCurrency = ref<string>('USD')
-const regions = ref<any[]>([])
-const regionPings = ref<any[]>([])
+const generatedState = useGeneratedState()
 
-const pyroProducts = (products as any[])
-	.filter((p) => p?.metadata?.type === 'pyro')
-	.sort((a, b) => (a?.metadata?.ram ?? 0) - (b?.metadata?.ram ?? 0))
-
-function handleError(err: any) {
-	console.error('Purchase modal error:', err)
-}
-
-async function fetchPaymentData() {
-	try {
-		const [customerData, paymentMethodsData] = await Promise.all([
-			useBaseFetch('billing/customer', { internal: true }),
-			useBaseFetch('billing/payment_methods', { internal: true }),
-		])
-		customer.value = customerData as any
-		paymentMethods.value = paymentMethodsData as any[]
-	} catch (error) {
-		console.error('Error fetching payment data:', error)
-	}
-}
-
-function fetchStock(region: any, request: any) {
-	return useServersFetch(`stock?region=${region.shortcode}`, {
-		method: 'POST',
-		body: {
-			...request,
-		},
-		bypassAuth: true,
-	}).then((res: any) => res.available as number)
-}
-
-function pingRegions() {
-	useServersFetch('regions', {
-		method: 'GET',
-		version: 1,
-		bypassAuth: true,
-	}).then((res: any) => {
-		regions.value = res as any[]
-		;(regions.value as any[]).forEach((region: any) => {
-			runPingTest(region)
-		})
-	})
-}
-
-const PING_COUNT = 20
-const PING_INTERVAL = 200
-const MAX_PING_TIME = 1000
-
-function runPingTest(region: any, index = 1) {
-	if (index > 10) {
-		regionPings.value.push({
-			region: region.shortcode,
-			ping: -1,
-		})
-		return
-	}
-
-	const wsUrl = `wss://${region.shortcode}${index}.${region.zone}/pingtest`
-	try {
-		const socket = new WebSocket(wsUrl)
-		const pings: number[] = []
-
-		socket.onopen = () => {
-			for (let i = 0; i < PING_COUNT; i++) {
-				setTimeout(() => {
-					socket.send(String(performance.now()))
-				}, i * PING_INTERVAL)
-			}
-			setTimeout(
-				() => {
-					socket.close()
-					const median = Math.round([...pings].sort((a, b) => a - b)[Math.floor(pings.length / 2)])
-					if (median) {
-						regionPings.value.push({
-							region: region.shortcode,
-							ping: median,
-						})
-					}
-				},
-				PING_COUNT * PING_INTERVAL + MAX_PING_TIME,
-			)
-		}
-
-		socket.onmessage = (event) => {
-			const start = Number(event.data)
-			pings.push(performance.now() - start)
-		}
-
-		socket.onerror = () => {
-			runPingTest(region, index + 1)
-		}
-	} catch {
-		// ignore
-	}
-}
-
-const subscription = ref<UserSubscription | null>(null)
-// Dry run state
-const dryRunResponse = ref<{
-	requires_payment: boolean
-	required_payment_is_proration: boolean
-} | null>(null)
-const pendingDowngradeBody = ref<any | null>(null)
-const currentPlanFromSubscription = computed<ServerPlan | undefined>(() => {
-	return subscription.value
-		? (pyroProducts.find(
-				(p) =>
-					p.prices.filter((price: { id: string }) => price.id === subscription.value?.price_id)
-						.length > 0,
-			) ?? undefined)
-		: undefined
-})
-
-const currentInterval = computed(() => {
-	const interval = subscription.value?.interval
-
-	if (interval === 'monthly' || interval === 'quarterly') {
-		return interval
-	}
-	return 'monthly'
-})
-
-async function initiatePayment(body: any): Promise<any> {
-	if (subscription.value) {
-		const transformedBody = {
-			interval: body.charge?.interval,
-			payment_method: body.type === 'confirmation_token' ? body.token : body.id,
-			product: body.charge?.product_id,
-			region: body.metadata?.server_region,
-		}
-
-		try {
-			const dry = await useBaseFetch(`billing/subscription/${subscription.value.id}?dry=true`, {
-				internal: true,
-				method: 'PATCH',
-				body: transformedBody,
-			})
-
-			if (dry && typeof dry === 'object' && 'requires_payment' in dry) {
-				dryRunResponse.value = dry as any
-				pendingDowngradeBody.value = transformedBody
-				if (dry.requires_payment) {
-					return await finalizeImmediate(transformedBody)
-				} else {
-					return null
-				}
-			} else {
-				// Fallback if dry run not supported
-				return await finalizeImmediate(transformedBody)
-			}
-		} catch (e) {
-			console.error('Dry run failed, attempting immediate patch', e)
-			return await finalizeImmediate(transformedBody)
-		}
-	} else {
-		addNotification({
-			title: 'Unable to determine subscription ID.',
-			text: 'Please contact support.',
-			type: 'error',
-		})
-		return Promise.reject(new Error('Unable to determine subscription ID.'))
-	}
-}
-
-async function finalizeImmediate(body: any) {
-	const result = await useBaseFetch(`billing/subscription/${subscription.value?.id}`, {
-		internal: true,
-		method: 'PATCH',
-		body,
-	})
-
-	return result
-}
-
-async function finalizeDowngrade() {
-	if (!subscription.value || !pendingDowngradeBody.value) return
-	try {
-		await finalizeImmediate(pendingDowngradeBody.value)
-		addNotification({
-			title: 'Subscription updated',
-			text: 'Your plan has been downgraded and will take effect next billing cycle.',
-			type: 'success',
-		})
-	} catch (e) {
-		addNotification({
-			title: 'Failed to apply subscription changes',
-			text: 'Please try again or contact support.',
-			type: 'error',
-		})
-		throw e
-	} finally {
-		dryRunResponse.value = null
-		pendingDowngradeBody.value = null
-	}
-}
-
-async function open(id?: string) {
-	if (id) {
-		const subscriptions = (await useBaseFetch(`billing/subscriptions`, {
-			internal: true,
-		})) as any[]
-		for (const sub of subscriptions) {
-			if (sub?.metadata?.id === id) {
-				subscription.value = sub
-				break
-			}
-		}
-	} else {
-		subscription.value = null
-	}
-
-	purchaseModal.value?.show(currentInterval.value)
-}
+const wrapperRef = ref<InstanceType<typeof ServersUpgradeModalWrapperBase> | null>(null)
 
 defineExpose({
-	open,
-})
-
-onMounted(() => {
-	fetchPaymentData()
-	pingRegions()
+	open: (id?: string) => wrapperRef.value?.open(id),
 })
 </script>
diff --git a/apps/frontend/src/components/ui/servers/marketing/MedalPlanPromotion.vue b/apps/frontend/src/components/ui/servers/marketing/MedalPlanPromotion.vue
index 93898912..5af4b72f 100644
--- a/apps/frontend/src/components/ui/servers/marketing/MedalPlanPromotion.vue
+++ b/apps/frontend/src/components/ui/servers/marketing/MedalPlanPromotion.vue
@@ -31,10 +31,9 @@
 
 <script lang="ts" setup>
 import { ExternalIcon } from '@modrinth/assets'
-import { ButtonStyled } from '@modrinth/ui'
+import { ButtonStyled, MedalBackgroundImage } from '@modrinth/ui'
 
 import MedalIcon from '~/assets/images/illustrations/medal_icon.svg?component'
-import MedalBackgroundImage from '~/components/ui/servers/marketing/MedalBackgroundImage.vue'
 </script>
 
 <style scoped lang="scss">
diff --git a/apps/frontend/src/components/ui/servers/marketing/MedalServerCountdown.vue b/apps/frontend/src/components/ui/servers/marketing/MedalServerCountdown.vue
index 33f63eb3..906a7a3d 100644
--- a/apps/frontend/src/components/ui/servers/marketing/MedalServerCountdown.vue
+++ b/apps/frontend/src/components/ui/servers/marketing/MedalServerCountdown.vue
@@ -39,14 +39,12 @@
 
 <script setup lang="ts">
 import { ClockIcon, RocketIcon } from '@modrinth/assets'
-import { ButtonStyled } from '@modrinth/ui'
+import { ButtonStyled, MedalBackgroundImage } from '@modrinth/ui'
 import type { UserSubscription } from '@modrinth/utils'
 import dayjs from 'dayjs'
 import dayjsDuration from 'dayjs/plugin/duration'
 import type { ComponentPublicInstance } from 'vue'
 
-import MedalBackgroundImage from '~/components/ui/servers/marketing/MedalBackgroundImage.vue'
-
 import ServersUpgradeModalWrapper from '../ServersUpgradeModalWrapper.vue'
 
 dayjs.extend(dayjsDuration)
diff --git a/apps/frontend/src/composables/generated.ts b/apps/frontend/src/composables/generated.ts
index cd7415af..12629657 100644
--- a/apps/frontend/src/composables/generated.ts
+++ b/apps/frontend/src/composables/generated.ts
@@ -1,3 +1,5 @@
+import type { ISO3166, Labrinth } from '@modrinth/api-client'
+
 import generatedState from '~/generated/state.json'
 
 export interface ProjectType {
@@ -15,38 +17,12 @@ export interface LoaderData {
 	hiddenModLoaders: string[]
 }
 
-export interface Country {
-	alpha2: string
-	alpha3: string
-	numeric: string
-	nameShort: string
-	nameLong: string
-}
-
-export interface Subdivision {
-	code: string // Full ISO 3166-2 code (e.g., "US-NY")
-	name: string // Official name in local language
-	localVariant: string | null // English variant if different
-	category: string // STATE, PROVINCE, REGION, etc.
-	parent: string | null // Parent subdivision code
-	language: string // Language code
-}
-
-export interface GeneratedState {
-	categories: any[]
-	loaders: any[]
-	gameVersions: any[]
-	donationPlatforms: any[]
-	reportTypes: any[]
-	muralBankDetails: Record<
-		string,
-		{
-			bankNames: string[]
-		}
-	>
-	countries: Country[]
-	subdivisions: Record<string, Subdivision[]>
+// Re-export types from api-client for convenience
+export type Country = ISO3166.Country
+export type Subdivision = ISO3166.Subdivision
 
+export interface GeneratedState extends Labrinth.State.GeneratedState {
+	// Additional runtime-defined fields not from the API
 	projectTypes: ProjectType[]
 	loaderData: LoaderData
 	projectViewModes: string[]
@@ -54,15 +30,9 @@ export interface GeneratedState {
 	rejectedStatuses: string[]
 	staffRoles: string[]
 
-	homePageProjects?: any[]
-	homePageSearch?: any
-	homePageNotifs?: any
-	products?: any[]
-
 	// Metadata
 	lastGenerated?: string
 	apiUrl?: string
-	errors?: number[]
 }
 
 /**
@@ -71,14 +41,18 @@ export interface GeneratedState {
  */
 export const useGeneratedState = () =>
 	useState<GeneratedState>('generatedState', () => ({
-		categories: generatedState.categories ?? [],
-		loaders: generatedState.loaders ?? [],
-		gameVersions: generatedState.gameVersions ?? [],
-		donationPlatforms: generatedState.donationPlatforms ?? [],
-		reportTypes: generatedState.reportTypes ?? [],
-		muralBankDetails: generatedState.muralBankDetails ?? null,
-		countries: generatedState.countries ?? [],
-		subdivisions: generatedState.subdivisions ?? {},
+		// Cast JSON data to typed API responses
+		categories: (generatedState.categories ?? []) as Labrinth.Tags.v2.Category[],
+		loaders: (generatedState.loaders ?? []) as Labrinth.Tags.v2.Loader[],
+		gameVersions: (generatedState.gameVersions ?? []) as Labrinth.Tags.v2.GameVersion[],
+		donationPlatforms: (generatedState.donationPlatforms ??
+			[]) as Labrinth.Tags.v2.DonationPlatform[],
+		reportTypes: (generatedState.reportTypes ?? []) as string[],
+		muralBankDetails: generatedState.muralBankDetails as
+			| Record<string, { bankNames: string[] }>
+			| undefined,
+		countries: (generatedState.countries ?? []) as ISO3166.Country[],
+		subdivisions: (generatedState.subdivisions ?? {}) as Record<string, ISO3166.Subdivision[]>,
 
 		projectTypes: [
 			{
@@ -135,10 +109,12 @@ export const useGeneratedState = () =>
 		rejectedStatuses: ['rejected', 'withheld'],
 		staffRoles: ['moderator', 'admin'],
 
-		homePageProjects: generatedState.homePageProjects,
-		homePageSearch: generatedState.homePageSearch,
-		homePageNotifs: generatedState.homePageNotifs,
-		products: generatedState.products,
+		homePageProjects: generatedState.homePageProjects as unknown as
+			| Labrinth.Projects.v2.Project[]
+			| undefined,
+		homePageSearch: generatedState.homePageSearch as Labrinth.Search.v2.SearchResults | undefined,
+		homePageNotifs: generatedState.homePageNotifs as Labrinth.Search.v2.SearchResults | undefined,
+		products: generatedState.products as Labrinth.Billing.Internal.Product[] | undefined,
 
 		lastGenerated: generatedState.lastGenerated,
 		apiUrl: generatedState.apiUrl,
diff --git a/apps/frontend/src/error.vue b/apps/frontend/src/error.vue
index 7f345509..451ad1eb 100644
--- a/apps/frontend/src/error.vue
+++ b/apps/frontend/src/error.vue
@@ -52,14 +52,14 @@
 
 <script setup>
 import { SadRinthbot } from '@modrinth/assets'
-import { NotificationPanel, provideNotificationManager } from '@modrinth/ui'
+import { NotificationPanel, provideModrinthClient, provideNotificationManager } from '@modrinth/ui'
 import { defineMessage, useVIntl } from '@vintl/vintl'
 import { IntlFormatted } from '@vintl/vintl/components'
 
 import Logo404 from '~/assets/images/404.svg'
 
 import ModrinthLoadingIndicator from './components/ui/modrinth-loading-indicator.ts'
-import { createModrinthClient, provideModrinthClient } from './providers/api-client.ts'
+import { createModrinthClient } from './helpers/api.ts'
 import { FrontendNotificationManager } from './providers/frontend-notifications.ts'
 
 const auth = await useAuth()
diff --git a/apps/frontend/src/providers/api-client.ts b/apps/frontend/src/helpers/api.ts
similarity index 78%
rename from apps/frontend/src/providers/api-client.ts
rename to apps/frontend/src/helpers/api.ts
index 31bcba6c..4cee73fa 100644
--- a/apps/frontend/src/providers/api-client.ts
+++ b/apps/frontend/src/helpers/api.ts
@@ -1,12 +1,13 @@
-import type { AbstractFeature, AuthConfig, NuxtClientConfig } from '@modrinth/api-client'
 import {
+	type AbstractFeature,
+	type AuthConfig,
 	AuthFeature,
 	CircuitBreakerFeature,
 	NuxtCircuitBreakerStorage,
+	type NuxtClientConfig,
 	NuxtModrinthClient,
 	VerboseLoggingFeature,
 } from '@modrinth/api-client'
-import { createContext } from '@modrinth/ui'
 
 export function createModrinthClient(
 	auth: { token: string | undefined },
@@ -35,8 +36,3 @@ export function createModrinthClient(
 
 	return new NuxtModrinthClient(clientConfig)
 }
-
-export const [injectModrinthClient, provideModrinthClient] = createContext<NuxtModrinthClient>(
-	'root',
-	'modrinthClient',
-)
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/environment.vue b/apps/frontend/src/pages/[type]/[id]/settings/environment.vue
index 01054a72..8a43a077 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/environment.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/environment.vue
@@ -3,6 +3,7 @@ import { CheckIcon } from '@modrinth/assets'
 import {
 	Admonition,
 	commonProjectSettingsMessages,
+	injectModrinthClient,
 	injectNotificationManager,
 	injectProjectPageContext,
 	ProjectSettingsEnvSelector,
@@ -11,8 +12,6 @@ import {
 } from '@modrinth/ui'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 
-import { injectModrinthClient } from '~/providers/api-client.ts'
-
 const { formatMessage } = useVIntl()
 
 const { currentMember, projectV2, projectV3, refreshProject } = injectProjectPageContext()
@@ -28,7 +27,7 @@ const supportsEnvironment = computed(() =>
 const needsToVerify = computed(
 	() =>
 		projectV3.value.side_types_migration_review_status === 'pending' &&
-		projectV3.value.environment?.length > 0 &&
+		(projectV3.value.environment?.length ?? 0) > 0 &&
 		projectV3.value.environment?.[0] !== 'unknown' &&
 		supportsEnvironment.value,
 )
@@ -157,12 +156,12 @@ const messages = defineMessages({
 				/>
 				<ProjectSettingsEnvSelector
 					v-model="current.environment"
-					:disabled="!hasPermission || projectV3?.environment?.length > 1"
+					:disabled="!hasPermission || (projectV3?.environment?.length ?? 0) > 1"
 				/>
 			</template>
 		</div>
 		<UnsavedChangesPopup
-			v-if="supportsEnvironment && hasPermission && projectV3?.environment?.length <= 1"
+			v-if="supportsEnvironment && hasPermission && (projectV3?.environment?.length ?? 0) <= 1"
 			:original="saved"
 			:modified="current"
 			:saving="saving"
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/general.vue b/apps/frontend/src/pages/[type]/[id]/settings/general.vue
index 00abbe47..9ac98e49 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/general.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/general.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import {
 	IconSelect,
+	injectModrinthClient,
 	injectNotificationManager,
 	injectProjectPageContext,
 	SettingsLabel,
@@ -9,8 +10,6 @@ import {
 } from '@modrinth/ui'
 import { defineMessages, type MessageDescriptor, useVIntl } from '@vintl/vintl'
 
-import { injectModrinthClient } from '~/providers/api-client.ts'
-
 const { formatMessage } = useVIntl()
 
 const { projectV2: project, refreshProject } = injectProjectPageContext()
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index a6af4bf8..7a04ce38 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -377,6 +377,8 @@ import {
 	ButtonStyled,
 	ErrorInformationCard,
 	injectNotificationManager,
+	ServerIcon,
+	ServerInfoLabels,
 	ServerNotice,
 } from '@modrinth/ui'
 import type {
@@ -398,8 +400,6 @@ import InstallingTicker from '~/components/ui/servers/InstallingTicker.vue'
 import MedalServerCountdown from '~/components/ui/servers/marketing/MedalServerCountdown.vue'
 import PanelServerActionButton from '~/components/ui/servers/PanelServerActionButton.vue'
 import PanelSpinner from '~/components/ui/servers/PanelSpinner.vue'
-import ServerIcon from '~/components/ui/servers/ServerIcon.vue'
-import ServerInfoLabels from '~/components/ui/servers/ServerInfoLabels.vue'
 import ServerInstallation from '~/components/ui/servers/ServerInstallation.vue'
 import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
 import { useModrinthServers } from '~/composables/servers/modrinth-servers.ts'
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/index.vue b/apps/frontend/src/pages/servers/manage/[id]/options/index.vue
index f8edefd9..ec7e8047 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/index.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/index.vue
@@ -112,12 +112,11 @@
 </template>
 
 <script setup lang="ts">
-import { EditIcon, TransferIcon } from '@modrinth/assets'
+import { EditIcon, ServerIcon, TransferIcon } from '@modrinth/assets'
 import { injectNotificationManager } from '@modrinth/ui'
 import ButtonStyled from '@modrinth/ui/src/components/base/ButtonStyled.vue'
 
 import SaveBanner from '~/components/ui/servers/SaveBanner.vue'
-import ServerIcon from '~/components/ui/servers/ServerIcon.vue'
 import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
 
 const { addNotification } = injectNotificationManager()
diff --git a/apps/frontend/src/pages/servers/manage/index.vue b/apps/frontend/src/pages/servers/manage/index.vue
index b67fb9d6..0767051a 100644
--- a/apps/frontend/src/pages/servers/manage/index.vue
+++ b/apps/frontend/src/pages/servers/manage/index.vue
@@ -1,133 +1,7 @@
-<template>
-	<div
-		data-pyro-server-list-root
-		class="experimental-styles-within relative mx-auto mb-6 flex min-h-screen w-full max-w-[1280px] flex-col px-6"
-	>
-		<ServersUpgradeModalWrapper ref="upgradeModal" />
-		<div
-			v-if="hasError || fetchError"
-			class="mx-auto flex h-full min-h-[calc(100vh-4rem)] flex-col items-center justify-center gap-4 text-left"
-		>
-			<div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-				<div class="flex flex-col items-center text-center">
-					<div class="flex flex-col items-center gap-4">
-						<div class="grid place-content-center rounded-full bg-bg-blue p-4">
-							<HammerIcon class="size-12 text-blue" />
-						</div>
-						<h1 class="m-0 w-fit text-3xl font-bold">Servers could not be loaded</h1>
-					</div>
-					<p class="text-lg text-secondary">We may have temporary issues with our servers.</p>
-					<ul class="m-0 list-disc space-y-4 p-0 pl-4 text-left text-sm leading-[170%]">
-						<li>
-							Our systems automatically alert our team when there's an issue. We are already working
-							on getting them back online.
-						</li>
-						<li>
-							If you recently purchased your Modrinth Server, it is currently in a queue and will
-							appear here as soon as it's ready. <br />
-							<span class="font-medium text-contrast"
-								>Do not attempt to purchase a new server.</span
-							>
-						</li>
-						<li>
-							If you require personalized support regarding the status of your server, please
-							contact Modrinth Support.
-						</li>
-
-						<li v-if="fetchError" class="text-red">
-							<p>Error details:</p>
-							<CopyCode
-								:text="(fetchError as ModrinthServersFetchError).message || 'Unknown error'"
-								:copyable="false"
-								:selectable="false"
-								:language="'json'"
-							/>
-						</li>
-					</ul>
-				</div>
-				<ButtonStyled size="large" type="standard" color="brand">
-					<a class="mt-6 !w-full" href="https://support.modrinth.com">Contact Modrinth Support</a>
-				</ButtonStyled>
-				<ButtonStyled size="large" @click="() => reloadNuxtApp()">
-					<button class="mt-3 !w-full">Reload</button>
-				</ButtonStyled>
-			</div>
-		</div>
-
-		<ServerManageEmptyState
-			v-else-if="serverList.length === 0 && !isPollingForNewServers && !hasError"
-		/>
-
-		<template v-else>
-			<div class="relative flex h-fit w-full flex-col items-center justify-between md:flex-row">
-				<h1 class="w-full text-4xl font-bold text-contrast">Servers</h1>
-				<div class="mb-4 flex w-full flex-row items-center justify-end gap-2 md:mb-0 md:gap-4">
-					<div class="relative w-full text-sm md:w-72">
-						<label class="sr-only" for="search">Search</label>
-						<SearchIcon
-							class="pointer-events-none absolute left-3 top-1/2 size-4 -translate-y-1/2"
-							aria-hidden="true"
-						/>
-						<input
-							id="search"
-							v-model="searchInput"
-							class="w-full border-[1px] border-solid border-button-border pl-9"
-							type="search"
-							name="search"
-							autocomplete="off"
-							placeholder="Search servers..."
-						/>
-					</div>
-					<ButtonStyled type="standard">
-						<NuxtLink
-							class="!h-10 whitespace-pre !border-[1px] !border-solid !border-button-border text-sm !font-medium"
-							:to="{ path: '/servers', hash: '#plan' }"
-						>
-							<PlusIcon class="size-4" />
-							New server
-						</NuxtLink>
-					</ButtonStyled>
-				</div>
-			</div>
-
-			<ul
-				v-if="filteredData.length > 0 || isPollingForNewServers"
-				class="m-0 flex flex-col gap-4 p-0"
-			>
-				<MedalServerListing
-					v-for="server in filteredData.filter((s) => s.is_medal)"
-					:key="server.server_id"
-					v-bind="server"
-					@upgrade="openUpgradeModal(server.server_id)"
-				/>
-				<ServerListing
-					v-for="server in filteredData.filter((s) => !s.is_medal)"
-					:key="server.server_id"
-					v-bind="server"
-				/>
-			</ul>
-			<div v-else class="flex h-full items-center justify-center">
-				<p class="text-contrast">No servers found.</p>
-			</div>
-		</template>
-	</div>
-</template>
-
 <script setup lang="ts">
-import { HammerIcon, PlusIcon, SearchIcon } from '@modrinth/assets'
-import { ButtonStyled, CopyCode } from '@modrinth/ui'
-import type { ModrinthServersFetchError, Server } from '@modrinth/utils'
-import dayjs from 'dayjs'
-import Fuse from 'fuse.js'
-import type { ComponentPublicInstance } from 'vue'
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { ServersManagePageIndex } from '@modrinth/ui'
 
-import { reloadNuxtApp } from '#app'
-import MedalServerListing from '~/components/ui/servers/marketing/MedalServerListing.vue'
-import ServerListing from '~/components/ui/servers/ServerListing.vue'
-import ServerManageEmptyState from '~/components/ui/servers/ServerManageEmptyState.vue'
-import ServersUpgradeModalWrapper from '~/components/ui/servers/ServersUpgradeModalWrapper.vue'
-import { useServersFetch } from '~/composables/servers/servers-fetch.ts'
+import { useGeneratedState } from '~/composables/generated'
 
 definePageMeta({
 	middleware: 'auth',
@@ -137,121 +11,14 @@ useHead({
 	title: 'Servers - Modrinth',
 })
 
-interface ServerResponse {
-	servers: Server[]
-}
-
-const router = useRouter()
-const route = useRoute()
-const hasError = ref(false)
-const isPollingForNewServers = ref(false)
-
-const {
-	data: serverResponse,
-	error: fetchError,
-	refresh,
-} = await useAsyncData<ServerResponse>('ServerList', async () => {
-	const serverResponse = await useServersFetch<ServerResponse>('servers')
-
-	let subscriptions: any[] | undefined
-
-	for (const server of serverResponse.servers) {
-		if (server.is_medal) {
-			// Inject end date into server object.
-			const serverID = server.server_id
-
-			if (!subscriptions) {
-				subscriptions = (await useBaseFetch(`billing/subscriptions`, {
-					internal: true,
-				})) as any[]
-			}
-
-			for (const subscription of subscriptions) {
-				if (subscription.metadata?.id === serverID) {
-					server.medal_expires = dayjs(subscription.created as string)
-						.add(5, 'days')
-						.toISOString()
-				}
-			}
-		}
-	}
-
-	return serverResponse
-})
-
-watch([fetchError, serverResponse], ([error, response]) => {
-	hasError.value = !!error || !response
-})
-
-const serverList = computed<Server[]>(() => {
-	if (!serverResponse.value) return []
-	return serverResponse.value.servers
-})
-
-const searchInput = ref('')
-
-const fuse = computed(() => {
-	if (serverList.value.length === 0) return null
-	return new Fuse(serverList.value, {
-		keys: ['name', 'loader', 'mc_version', 'game', 'state'],
-		includeScore: true,
-		threshold: 0.4,
-	})
-})
-
-function introToTop(array: Server[]): Server[] {
-	return array.slice().sort((a, b) => {
-		return Number(b.flows?.intro) - Number(a.flows?.intro)
-	})
-}
-
-const filteredData = computed<Server[]>(() => {
-	if (!searchInput.value.trim()) {
-		return introToTop(serverList.value)
-	}
-	return fuse.value
-		? introToTop(fuse.value.search(searchInput.value).map((result) => result.item))
-		: []
-})
-
-const previousServerList = ref<Server[]>([])
-const refreshCount = ref(0)
-
-const checkForNewServers = async () => {
-	await refresh()
-	refreshCount.value += 1
-	if (JSON.stringify(previousServerList.value) !== JSON.stringify(serverList.value)) {
-		isPollingForNewServers.value = false
-		clearInterval(intervalId)
-		router.replace({ query: {} })
-	} else if (refreshCount.value >= 5) {
-		isPollingForNewServers.value = false
-		clearInterval(intervalId)
-	}
-}
-
-let intervalId: ReturnType<typeof setInterval> | undefined
-
-onMounted(() => {
-	if (route.query.redirect_status === 'succeeded') {
-		isPollingForNewServers.value = true
-		previousServerList.value = [...serverList.value]
-		intervalId = setInterval(checkForNewServers, 5000)
-	}
-})
-
-onUnmounted(() => {
-	if (intervalId) {
-		clearInterval(intervalId)
-	}
-})
-
-type ServersUpgradeModalWrapperRef = ComponentPublicInstance<{
-	open: (id: string) => void | Promise<void>
-}>
-
-const upgradeModal = ref<ServersUpgradeModalWrapperRef | null>(null)
-function openUpgradeModal(serverId: string) {
-	upgradeModal.value?.open(serverId)
-}
+const config = useRuntimeConfig()
+const generatedState = useGeneratedState()
 </script>
+
+<template>
+	<ServersManagePageIndex
+		:stripe-publishable-key="config.public.stripePublishableKey"
+		:site-url="config.public.siteUrl"
+		:products="generatedState.products || []"
+	/>
+</template>
diff --git a/apps/frontend/src/pages/settings/billing/index.vue b/apps/frontend/src/pages/settings/billing/index.vue
index 30041f24..ecc510ac 100644
--- a/apps/frontend/src/pages/settings/billing/index.vue
+++ b/apps/frontend/src/pages/settings/billing/index.vue
@@ -625,13 +625,13 @@ import {
 	injectNotificationManager,
 	OverflowMenu,
 	PurchaseModal,
+	ServerListing,
 } from '@modrinth/ui'
 import { calculateSavings, formatPrice, getCurrency } from '@modrinth/utils'
 import { computed, ref } from 'vue'
 
 import { useBaseFetch } from '@/composables/fetch.js'
 import ModrinthServersIcon from '~/components/ui/servers/ModrinthServersIcon.vue'
-import ServerListing from '~/components/ui/servers/ServerListing.vue'
 import ServersUpgradeModalWrapper from '~/components/ui/servers/ServersUpgradeModalWrapper.vue'
 import { useServersFetch } from '~/composables/servers/servers-fetch.ts'
 import { products } from '~/generated/state.json'
diff --git a/apps/frontend/src/plugins/tanstack.ts b/apps/frontend/src/plugins/tanstack.ts
new file mode 100644
index 00000000..0decaec4
--- /dev/null
+++ b/apps/frontend/src/plugins/tanstack.ts
@@ -0,0 +1,28 @@
+// https://tanstack.com/query/v5/docs/framework/vue/examples/nuxt3
+import type { DehydratedState, VueQueryPluginOptions } from '@tanstack/vue-query'
+import { dehydrate, hydrate, QueryClient, VueQueryPlugin } from '@tanstack/vue-query'
+
+import { defineNuxtPlugin, useState } from '#imports'
+
+export default defineNuxtPlugin((nuxt) => {
+	const vueQueryState = useState<DehydratedState | null>('vue-query')
+
+	const queryClient = new QueryClient({
+		defaultOptions: { queries: { staleTime: 5000 } },
+	})
+	const options: VueQueryPluginOptions = { queryClient }
+
+	nuxt.vueApp.use(VueQueryPlugin, options)
+
+	if (import.meta.server) {
+		nuxt.hooks.hook('app:rendered', () => {
+			vueQueryState.value = dehydrate(queryClient)
+		})
+	}
+
+	if (import.meta.client) {
+		nuxt.hooks.hook('app:created', () => {
+			hydrate(queryClient, vueQueryState.value)
+		})
+	}
+})
diff --git a/packages/api-client/src/core/abstract-client.ts b/packages/api-client/src/core/abstract-client.ts
index 12e3c347..a20ac5cd 100644
--- a/packages/api-client/src/core/abstract-client.ts
+++ b/packages/api-client/src/core/abstract-client.ts
@@ -23,8 +23,10 @@ export abstract class AbstractModrinthClient {
 	 */
 	private _moduleNamespaces: Map<string, Record<string, AbstractModule>> = new Map()
 
-	// TODO: When adding kyros/archon add readonly fields for those too.
 	public readonly labrinth!: InferredClientModules['labrinth']
+	public readonly archon!: InferredClientModules['archon']
+	public readonly kyros!: InferredClientModules['kyros']
+	public readonly iso3166!: InferredClientModules['iso3166']
 
 	constructor(config: ClientConfig) {
 		this.config = {
@@ -171,7 +173,7 @@ export abstract class AbstractModrinthClient {
 	/**
 	 * Build the full URL for a request
 	 */
-	protected buildUrl(path: string, baseUrl: string, version: number | 'internal'): string {
+	protected buildUrl(path: string, baseUrl: string, version: number | 'internal' | string): string {
 		// Remove trailing slash from base URL
 		const base = baseUrl.replace(/\/$/, '')
 
@@ -181,6 +183,9 @@ export abstract class AbstractModrinthClient {
 			versionPath = '/_internal'
 		} else if (typeof version === 'number') {
 			versionPath = `/v${version}`
+		} else if (typeof version === 'string') {
+			// Custom version string (e.g., 'v0', 'modrinth/v0')
+			versionPath = `/${version}`
 		}
 
 		const cleanPath = path.startsWith('/') ? path : `/${path}`
diff --git a/packages/api-client/src/features/auth.ts b/packages/api-client/src/features/auth.ts
index 2b075cc6..b7e67a2e 100644
--- a/packages/api-client/src/features/auth.ts
+++ b/packages/api-client/src/features/auth.ts
@@ -69,6 +69,12 @@ export class AuthFeature extends AbstractFeature {
 			return false
 		}
 
+		// Skip if Authorization header is already explicitly set
+		const headerName = this.config.headerName ?? 'Authorization'
+		if (context.options.headers?.[headerName]) {
+			return false
+		}
+
 		return super.shouldApply(context)
 	}
 
diff --git a/packages/api-client/src/modules/archon/index.ts b/packages/api-client/src/modules/archon/index.ts
new file mode 100644
index 00000000..2dfee23c
--- /dev/null
+++ b/packages/api-client/src/modules/archon/index.ts
@@ -0,0 +1,3 @@
+export * from './servers/types'
+export * from './servers/v0'
+export * from './servers/v1'
diff --git a/packages/api-client/src/modules/archon/servers/v0.ts b/packages/api-client/src/modules/archon/servers/v0.ts
new file mode 100644
index 00000000..11f147b3
--- /dev/null
+++ b/packages/api-client/src/modules/archon/servers/v0.ts
@@ -0,0 +1,57 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { Archon } from '../types'
+
+export class ArchonServersV0Module extends AbstractModule {
+	public getModuleID(): string {
+		return 'archon_servers_v0'
+	}
+
+	/**
+	 * Get list of servers for the authenticated user
+	 * GET /modrinth/v0/servers
+	 */
+	public async list(
+		options?: Archon.Servers.v0.GetServersOptions,
+	): Promise<Archon.Servers.v0.ServerGetResponse> {
+		const params = new URLSearchParams()
+		if (options?.limit) params.set('limit', options.limit.toString())
+		if (options?.offset) params.set('offset', options.offset.toString())
+
+		const query = params.toString() ? `?${params.toString()}` : ''
+
+		return this.client.request<Archon.Servers.v0.ServerGetResponse>(`servers${query}`, {
+			api: 'archon',
+			method: 'GET',
+			version: 'modrinth/v0',
+		})
+	}
+
+	/**
+	 * Check stock availability for a region
+	 * POST /modrinth/v0/stock
+	 */
+	public async checkStock(
+		region: string,
+		request: Archon.Servers.v0.StockRequest,
+	): Promise<Archon.Servers.v0.StockResponse> {
+		return this.client.request<Archon.Servers.v0.StockResponse>(`/stock?region=${region}`, {
+			api: 'archon',
+			version: 'modrinth/v0',
+			method: 'POST',
+			body: request,
+		})
+	}
+
+	/**
+	 * Get filesystem authentication credentials for a server
+	 * Returns URL and JWT token for accessing the server's filesystem via Kyros
+	 * GET /modrinth/v0/servers/:id/fs
+	 */
+	public async getFilesystemAuth(serverId: string): Promise<Archon.Servers.v0.JWTAuth> {
+		return this.client.request<Archon.Servers.v0.JWTAuth>(`/servers/${serverId}/fs`, {
+			api: 'archon',
+			version: 'modrinth/v0',
+			method: 'GET',
+		})
+	}
+}
diff --git a/packages/api-client/src/modules/archon/servers/v1.ts b/packages/api-client/src/modules/archon/servers/v1.ts
new file mode 100644
index 00000000..06edb144
--- /dev/null
+++ b/packages/api-client/src/modules/archon/servers/v1.ts
@@ -0,0 +1,20 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { Archon } from '../types'
+
+export class ArchonServersV1Module extends AbstractModule {
+	public getModuleID(): string {
+		return 'archon_servers_v1'
+	}
+
+	/**
+	 * Get available regions
+	 * GET /v1/regions
+	 */
+	public async getRegions(): Promise<Archon.Servers.v1.Region[]> {
+		return this.client.request<Archon.Servers.v1.Region[]>('/regions', {
+			api: 'archon',
+			version: 1,
+			method: 'GET',
+		})
+	}
+}
diff --git a/packages/api-client/src/modules/archon/types.ts b/packages/api-client/src/modules/archon/types.ts
new file mode 100644
index 00000000..bab5f15b
--- /dev/null
+++ b/packages/api-client/src/modules/archon/types.ts
@@ -0,0 +1,128 @@
+export namespace Archon {
+	export namespace Servers {
+		export namespace v0 {
+			export type ServerGetResponse = {
+				servers: Server[]
+				pagination: Pagination
+			}
+
+			export type Pagination = {
+				current_page: number
+				page_size: number
+				total_pages: number
+				total_items: number
+			}
+
+			export type Status = 'installing' | 'broken' | 'available' | 'suspended'
+
+			export type SuspensionReason =
+				| 'moderated'
+				| 'paymentfailed'
+				| 'cancelled'
+				| 'upgrading'
+				| 'other'
+
+			export type Loader =
+				| 'Forge'
+				| 'NeoForge'
+				| 'Fabric'
+				| 'Quilt'
+				| 'Purpur'
+				| 'Spigot'
+				| 'Vanilla'
+				| 'Paper'
+
+			export type Game = 'Minecraft'
+
+			export type UpstreamKind = 'modpack' | 'none'
+
+			export type Server = {
+				server_id: string
+				name: string
+				owner_id: string
+				net: Net
+				game: Game
+				backup_quota: number
+				used_backup_quota: number
+				status: Status
+				suspension_reason: SuspensionReason | null
+				loader: Loader | null
+				loader_version: string | null
+				mc_version: string | null
+				upstream: Upstream | null
+				sftp_username: string
+				sftp_password: string
+				sftp_host: string
+				datacenter: string
+				notices: Notice[]
+				node: NodeInfo | null
+				flows: Flows
+				is_medal: boolean
+
+				medal_expires?: string
+			}
+
+			export type Net = {
+				ip: string
+				port: number
+				domain: string
+			}
+
+			export type Upstream = {
+				kind: UpstreamKind
+				version_id: string
+				project_id: string
+			}
+
+			export type Notice = {
+				id: number
+				dismissable: boolean
+				title: string
+				message: string
+				level: string
+				announced: string
+			}
+
+			export type NodeInfo = {
+				token: string
+				instance: string
+			}
+
+			export type Flows = {
+				intro: boolean
+			}
+
+			export type GetServersOptions = {
+				limit?: number
+				offset?: number
+			}
+
+			export type StockRequest = {
+				cpu?: number
+				memory_mb?: number
+				swap_mb?: number
+				storage_mb?: number
+			}
+
+			export type StockResponse = {
+				available: number
+			}
+
+			export type JWTAuth = {
+				url: string // e.g., "node-xyz.modrinth.com/modrinth/v0/fs"
+				token: string // JWT token for filesystem access
+			}
+		}
+
+		export namespace v1 {
+			export type Region = {
+				shortcode: string
+				country_code: string
+				display_name: string
+				lat: number
+				lon: number
+				zone: string
+			}
+		}
+	}
+}
diff --git a/packages/api-client/src/modules/index.ts b/packages/api-client/src/modules/index.ts
index ec2c81ec..9727d381 100644
--- a/packages/api-client/src/modules/index.ts
+++ b/packages/api-client/src/modules/index.ts
@@ -1,7 +1,13 @@
 import type { AbstractModrinthClient } from '../core/abstract-client'
 import type { AbstractModule } from '../core/abstract-module'
+import { ArchonServersV0Module } from './archon/servers/v0'
+import { ArchonServersV1Module } from './archon/servers/v1'
+import { ISO3166Module } from './iso3166'
+import { KyrosFilesV0Module } from './kyros/files/v0'
+import { LabrinthBillingInternalModule } from './labrinth/billing/internal'
 import { LabrinthProjectsV2Module } from './labrinth/projects/v2'
 import { LabrinthProjectsV3Module } from './labrinth/projects/v3'
+import { LabrinthStateModule } from './labrinth/state'
 
 type ModuleConstructor = new (client: AbstractModrinthClient) => AbstractModule
 
@@ -15,8 +21,14 @@ type ModuleConstructor = new (client: AbstractModrinthClient) => AbstractModule
  * TODO: Better way? Probably not
  */
 export const MODULE_REGISTRY = {
+	archon_servers_v0: ArchonServersV0Module,
+	archon_servers_v1: ArchonServersV1Module,
+	iso3166_data: ISO3166Module,
+	kyros_files_v0: KyrosFilesV0Module,
+	labrinth_billing_internal: LabrinthBillingInternalModule,
 	labrinth_projects_v2: LabrinthProjectsV2Module,
 	labrinth_projects_v3: LabrinthProjectsV3Module,
+	labrinth_state: LabrinthStateModule,
 } as const satisfies Record<string, ModuleConstructor>
 
 export type ModuleID = keyof typeof MODULE_REGISTRY
diff --git a/packages/api-client/src/modules/iso3166/index.ts b/packages/api-client/src/modules/iso3166/index.ts
new file mode 100644
index 00000000..741d6579
--- /dev/null
+++ b/packages/api-client/src/modules/iso3166/index.ts
@@ -0,0 +1,121 @@
+import { $fetch } from 'ofetch'
+
+import { AbstractModule } from '../../core/abstract-module'
+import type { ISO3166 } from './types'
+
+export type { ISO3166 } from './types'
+
+const ISO3166_REPO = 'https://raw.githubusercontent.com/ipregistry/iso3166/master'
+
+/**
+ * Parse CSV string into array of objects
+ * @param csv - CSV string to parse
+ * @returns Array of objects with header keys mapped to row values
+ */
+function parseCSV(csv: string): Record<string, string>[] {
+	const lines = csv
+		.trim()
+		.split('\n')
+		.filter((line) => line.trim() !== '')
+
+	if (lines.length === 0) return []
+
+	const headerLine = lines[0]
+	const headers = (headerLine.startsWith('#') ? headerLine.slice(1) : headerLine).split(',')
+
+	return lines.slice(1).map((line) => {
+		const values = line.split(',')
+		const row: Record<string, string> = {}
+
+		headers.forEach((header, index) => {
+			row[header] = values[index] || ''
+		})
+
+		return row
+	})
+}
+
+/**
+ * Module for fetching ISO 3166 country and subdivision data
+ * Data from https://github.com/ipregistry/iso3166 (Licensed under CC BY-SA 4.0)
+ * @platform Not for use in Tauri or Nuxt environments, only node.
+ */
+export class ISO3166Module extends AbstractModule {
+	public getModuleID(): string {
+		return 'iso3166_data'
+	}
+
+	/**
+	 * Build ISO 3166 country and subdivision data from the ipregistry repository
+	 *
+	 * @returns Promise resolving to countries and subdivisions data
+	 *
+	 * @example
+	 * ```typescript
+	 * const data = await client.iso3166.data.build()
+	 * console.log(data.countries) // Array of country data
+	 * console.log(data.subdivisions['US']) // Array of US state data
+	 * ```
+	 */
+	public async build(): Promise<ISO3166.State> {
+		try {
+			const [countriesCSV, subdivisionsCSV] = await Promise.all([
+				$fetch<string>(`${ISO3166_REPO}/countries.csv`, {
+					// @ts-expect-error supports text
+					responseType: 'text',
+				}),
+				$fetch<string>(`${ISO3166_REPO}/subdivisions.csv`, {
+					// @ts-expect-error supports text
+					responseType: 'text',
+				}),
+			])
+
+			const countriesData = parseCSV(countriesCSV)
+			const subdivisionsData = parseCSV(subdivisionsCSV)
+
+			const countries: ISO3166.Country[] = countriesData.map((c) => ({
+				alpha2: c.country_code_alpha2,
+				alpha3: c.country_code_alpha3,
+				numeric: c.numeric_code,
+				nameShort: c.name_short,
+				nameLong: c.name_long,
+			}))
+
+			// Group subdivisions by country code
+			const subdivisions: Record<string, ISO3166.Subdivision[]> = subdivisionsData.reduce(
+				(acc, sub) => {
+					const countryCode = sub.country_code_alpha2
+
+					if (!countryCode || typeof countryCode !== 'string' || countryCode.trim() === '') {
+						return acc
+					}
+
+					if (!acc[countryCode]) acc[countryCode] = []
+
+					acc[countryCode].push({
+						code: sub['subdivision_code_iso3166-2'],
+						name: sub.subdivision_name,
+						localVariant: sub.localVariant || null,
+						category: sub.category,
+						parent: sub.parent_subdivision || null,
+						language: sub.language_code,
+					})
+
+					return acc
+				},
+				{} as Record<string, ISO3166.Subdivision[]>,
+			)
+
+			return {
+				countries,
+				subdivisions,
+			}
+		} catch (err) {
+			console.error('Error fetching ISO3166 data:', err)
+			return {
+				countries: [],
+				subdivisions: {},
+			}
+		}
+	}
+}
diff --git a/packages/api-client/src/modules/iso3166/types.ts b/packages/api-client/src/modules/iso3166/types.ts
new file mode 100644
index 00000000..78d76555
--- /dev/null
+++ b/packages/api-client/src/modules/iso3166/types.ts
@@ -0,0 +1,23 @@
+export namespace ISO3166 {
+	export interface Country {
+		alpha2: string
+		alpha3: string
+		numeric: string
+		nameShort: string
+		nameLong: string
+	}
+
+	export interface Subdivision {
+		code: string // Full ISO 3166-2 code (e.g., "US-NY")
+		name: string // Official name in local language
+		localVariant: string | null // English variant if different
+		category: string // STATE, PROVINCE, REGION, etc.
+		parent: string | null // Parent subdivision code
+		language: string // Language code
+	}
+
+	export interface State {
+		countries: Country[]
+		subdivisions: Record<string, Subdivision[]>
+	}
+}
diff --git a/packages/api-client/src/modules/kyros/files/v0.ts b/packages/api-client/src/modules/kyros/files/v0.ts
new file mode 100644
index 00000000..6d1f86b6
--- /dev/null
+++ b/packages/api-client/src/modules/kyros/files/v0.ts
@@ -0,0 +1,52 @@
+import { AbstractModule } from '../../../core/abstract-module'
+
+export class KyrosFilesV0Module extends AbstractModule {
+	public getModuleID(): string {
+		return 'kyros_files_v0'
+	}
+
+	/**
+	 * Download a file from a server's filesystem
+	 *
+	 * @param nodeInstance - Node instance URL (e.g., "node-xyz.modrinth.com/modrinth/v0/fs")
+	 * @param nodeToken - JWT token from getFilesystemAuth
+	 * @param path - File path (e.g., "/server-icon-original.png")
+	 * @returns Promise resolving to file Blob
+	 */
+	public async downloadFile(nodeInstance: string, nodeToken: string, path: string): Promise<Blob> {
+		return this.client.request<Blob>(`/fs/download`, {
+			api: `https://${nodeInstance.replace('v0/fs', '')}`,
+			method: 'GET',
+			version: 'v0',
+			params: { path },
+			headers: { Authorization: `Bearer ${nodeToken}` },
+		})
+	}
+
+	/**
+	 * Upload a file to a server's filesystem
+	 *
+	 * @param nodeInstance - Node instance URL
+	 * @param nodeToken - JWT token from getFilesystemAuth
+	 * @param path - Destination path (e.g., "/server-icon.png")
+	 * @param file - File to upload
+	 */
+	public async uploadFile(
+		nodeInstance: string,
+		nodeToken: string,
+		path: string,
+		file: File,
+	): Promise<void> {
+		return this.client.request<void>(`/fs/create`, {
+			api: `https://${nodeInstance.replace('v0/fs', '')}`,
+			method: 'POST',
+			version: 'v0',
+			params: { path, type: 'file' },
+			headers: {
+				Authorization: `Bearer ${nodeToken}`,
+				'Content-Type': 'application/octet-stream',
+			},
+			body: file,
+		})
+	}
+}
diff --git a/packages/api-client/src/modules/kyros/types.ts b/packages/api-client/src/modules/kyros/types.ts
new file mode 100644
index 00000000..61d65fc2
--- /dev/null
+++ b/packages/api-client/src/modules/kyros/types.ts
@@ -0,0 +1,7 @@
+export namespace Kyros {
+	export namespace Files {
+		export namespace v0 {
+			// Empty for now
+		}
+	}
+}
diff --git a/packages/api-client/src/modules/labrinth/billing/internal.ts b/packages/api-client/src/modules/labrinth/billing/internal.ts
new file mode 100644
index 00000000..fff2a6bf
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/billing/internal.ts
@@ -0,0 +1,189 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { Labrinth } from '../types'
+
+export class LabrinthBillingInternalModule extends AbstractModule {
+	public getModuleID(): string {
+		return 'labrinth_billing_internal'
+	}
+
+	/**
+	 * Get user's subscriptions
+	 * GET /_internal/billing/subscriptions
+	 */
+	public async getSubscriptions(
+		userId?: string,
+	): Promise<Labrinth.Billing.Internal.UserSubscription[]> {
+		const params = userId ? `?user_id=${userId}` : ''
+
+		return this.client.request<Labrinth.Billing.Internal.UserSubscription[]>(
+			`/billing/subscriptions${params}`,
+			{
+				api: 'labrinth',
+				version: 'internal',
+				method: 'GET',
+			},
+		)
+	}
+
+	/**
+	 * Get available products for purchase
+	 * GET /_internal/billing/products
+	 */
+	public async getProducts(): Promise<Labrinth.Billing.Internal.Product[]> {
+		return this.client.request<Labrinth.Billing.Internal.Product[]>('/billing/products', {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'GET',
+		})
+	}
+
+	/**
+	 * Get Stripe customer information
+	 * GET /_internal/billing/customer
+	 */
+	public async getCustomer(): Promise<unknown> {
+		return this.client.request<unknown>('/billing/customer', {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'GET',
+		})
+	}
+
+	/**
+	 * Edit a subscription (change product, interval, cancel, etc.)
+	 * PATCH /_internal/billing/subscription/{id}
+	 */
+	public async editSubscription(
+		id: string,
+		edit: Labrinth.Billing.Internal.EditSubscriptionRequest,
+		dry?: boolean,
+	): Promise<Labrinth.Billing.Internal.EditSubscriptionResponse | void> {
+		const params = dry ? '?dry=true' : ''
+
+		return this.client.request<Labrinth.Billing.Internal.EditSubscriptionResponse | void>(
+			`/billing/subscription/${id}${params}`,
+			{
+				api: 'labrinth',
+				version: 'internal',
+				method: 'PATCH',
+				body: edit,
+			},
+		)
+	}
+
+	/**
+	 * Get user's payment methods
+	 * GET /_internal/billing/payment_methods
+	 */
+	public async getPaymentMethods(): Promise<unknown[]> {
+		return this.client.request<unknown[]>('/billing/payment_methods', {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'GET',
+		})
+	}
+
+	/**
+	 * Initiate flow to add a new payment method
+	 * POST /_internal/billing/payment_method
+	 */
+	public async addPaymentMethodFlow(): Promise<Labrinth.Billing.Internal.AddPaymentMethodFlowResponse> {
+		return this.client.request<Labrinth.Billing.Internal.AddPaymentMethodFlowResponse>(
+			'/billing/payment_method',
+			{
+				api: 'labrinth',
+				version: 'internal',
+				method: 'POST',
+			},
+		)
+	}
+
+	/**
+	 * Edit a payment method (set as primary)
+	 * PATCH /_internal/billing/payment_method/{id}
+	 */
+	public async editPaymentMethod(
+		id: string,
+		body: Labrinth.Billing.Internal.EditPaymentMethodRequest,
+	): Promise<void> {
+		return this.client.request<void>(`/billing/payment_method/${id}`, {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'PATCH',
+			body,
+		})
+	}
+
+	/**
+	 * Remove a payment method
+	 * DELETE /_internal/billing/payment_method/{id}
+	 */
+	public async removePaymentMethod(id: string): Promise<void> {
+		return this.client.request<void>(`/billing/payment_method/${id}`, {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'DELETE',
+		})
+	}
+
+	/**
+	 * Get payment history (charges)
+	 * GET /_internal/billing/payments
+	 */
+	public async getPayments(userId?: string): Promise<Labrinth.Billing.Internal.Charge[]> {
+		const params = userId ? `?user_id=${userId}` : ''
+
+		return this.client.request<Labrinth.Billing.Internal.Charge[]>(`/billing/payments${params}`, {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'GET',
+		})
+	}
+
+	/**
+	 * Initiate a payment
+	 * POST /_internal/billing/payment
+	 */
+	public async initiatePayment(
+		request: Labrinth.Billing.Internal.InitiatePaymentRequest,
+	): Promise<Labrinth.Billing.Internal.InitiatePaymentResponse> {
+		return this.client.request<Labrinth.Billing.Internal.InitiatePaymentResponse>(
+			'/billing/payment',
+			{
+				api: 'labrinth',
+				version: 'internal',
+				method: 'POST',
+				body: request,
+			},
+		)
+	}
+
+	/**
+	 * Refund a charge (Admin only)
+	 * POST /_internal/billing/charge/{id}/refund
+	 */
+	public async refundCharge(
+		id: string,
+		refund: Labrinth.Billing.Internal.RefundChargeRequest,
+	): Promise<void> {
+		return this.client.request<void>(`/billing/charge/${id}/refund`, {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'POST',
+			body: refund,
+		})
+	}
+
+	/**
+	 * Credit subscriptions (Admin only)
+	 * POST /_internal/billing/credit
+	 */
+	public async credit(request: Labrinth.Billing.Internal.CreditRequest): Promise<void> {
+		return this.client.request<void>('/billing/credit', {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'POST',
+			body: request,
+		})
+	}
+}
diff --git a/packages/api-client/src/modules/labrinth/index.ts b/packages/api-client/src/modules/labrinth/index.ts
index b5961a1c..fd99f54b 100644
--- a/packages/api-client/src/modules/labrinth/index.ts
+++ b/packages/api-client/src/modules/labrinth/index.ts
@@ -1,2 +1,4 @@
+export * from './billing/internal'
 export * from './projects/v2'
 export * from './projects/v3'
+export * from './state'
diff --git a/packages/api-client/src/modules/labrinth/projects/types/v2.ts b/packages/api-client/src/modules/labrinth/projects/types/v2.ts
deleted file mode 100644
index 92f0d7cd..00000000
--- a/packages/api-client/src/modules/labrinth/projects/types/v2.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-export type Environment = 'required' | 'optional' | 'unsupported' | 'unknown'
-
-export type ProjectStatus =
-	| 'approved'
-	| 'archived'
-	| 'rejected'
-	| 'draft'
-	| 'unlisted'
-	| 'processing'
-	| 'withheld'
-	| 'scheduled'
-	| 'private'
-	| 'unknown'
-
-export type MonetizationStatus = 'monetized' | 'demonetized' | 'force-demonetized'
-
-export type ProjectType = 'mod' | 'modpack' | 'resourcepack' | 'shader' | 'plugin' | 'datapack'
-
-export type GalleryImageV2 = {
-	url: string
-	featured: boolean
-	title?: string
-	description?: string
-	created: string
-	ordering: number
-}
-
-export type DonationLinkV2 = {
-	id: string
-	platform: string
-	url: string
-}
-
-export type ProjectV2 = {
-	id: string
-	slug: string
-	project_type: ProjectType
-	team: string
-	title: string
-	description: string
-	body: string
-	published: string
-	updated: string
-	approved?: string
-	queued?: string
-	status: ProjectStatus
-	requested_status?: ProjectStatus
-	moderator_message?: {
-		message: string
-		body?: string
-	}
-	license: {
-		id: string
-		name: string
-		url?: string
-	}
-	client_side: Environment
-	server_side: Environment
-	downloads: number
-	followers: number
-	categories: string[]
-	additional_categories: string[]
-	game_versions: string[]
-	loaders: string[]
-	versions: string[]
-	icon_url?: string
-	issues_url?: string
-	source_url?: string
-	wiki_url?: string
-	discord_url?: string
-	donation_urls?: DonationLinkV2[]
-	gallery?: GalleryImageV2[]
-	color?: number
-	thread_id: string
-	monetization_status: MonetizationStatus
-}
-
-export type SearchResultHit = {
-	project_id: string
-	project_type: ProjectType
-	slug: string
-	author: string
-	title: string
-	description: string
-	categories: string[]
-	display_categories: string[]
-	versions: string[]
-	downloads: number
-	follows: number
-	icon_url: string
-	date_created: string
-	date_modified: string
-	latest_version?: string
-	license: string
-	client_side: Environment
-	server_side: Environment
-	gallery: string[]
-	color?: number
-}
-
-export type SearchResult = {
-	hits: SearchResultHit[]
-	offset: number
-	limit: number
-	total_hits: number
-}
-
-export type ProjectSearchParams = {
-	query?: string
-	facets?: string[][]
-	filters?: string
-	index?: 'relevance' | 'downloads' | 'follows' | 'newest' | 'updated'
-	offset?: number
-	limit?: number
-}
diff --git a/packages/api-client/src/modules/labrinth/projects/types/v3.ts b/packages/api-client/src/modules/labrinth/projects/types/v3.ts
deleted file mode 100644
index 3b23f86b..00000000
--- a/packages/api-client/src/modules/labrinth/projects/types/v3.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import type { MonetizationStatus, ProjectStatus } from './v2'
-
-export type GalleryItemV3 = {
-	url: string
-	raw_url: string
-	featured: boolean
-	name?: string
-	description?: string
-	created: string
-	ordering: number
-}
-
-export type LinkV3 = {
-	platform: string
-	donation: boolean
-	url: string
-}
-
-export type ProjectV3 = {
-	id: string
-	slug?: string
-	project_types: string[]
-	games: string[]
-	team_id: string
-	organization?: string
-	name: string
-	summary: string
-	description: string
-	published: string
-	updated: string
-	approved?: string
-	queued?: string
-	status: ProjectStatus
-	requested_status?: ProjectStatus
-	license: {
-		id: string
-		name: string
-		url?: string
-	}
-	downloads: number
-	followers: number
-	categories: string[]
-	additional_categories: string[]
-	loaders: string[]
-	versions: string[]
-	icon_url?: string
-	link_urls: Record<string, LinkV3>
-	gallery: GalleryItemV3[]
-	color?: number
-	thread_id: string
-	monetization_status: MonetizationStatus
-	side_types_migration_review_status: 'reviewed' | 'pending'
-	[key: string]: unknown
-}
diff --git a/packages/api-client/src/modules/labrinth/projects/v2.ts b/packages/api-client/src/modules/labrinth/projects/v2.ts
index b14c80ff..c36b71c8 100644
--- a/packages/api-client/src/modules/labrinth/projects/v2.ts
+++ b/packages/api-client/src/modules/labrinth/projects/v2.ts
@@ -1,5 +1,5 @@
 import { AbstractModule } from '../../../core/abstract-module'
-import type { ProjectSearchParams, ProjectV2, SearchResult } from './types/v2'
+import type { Labrinth } from '../types'
 
 export class LabrinthProjectsV2Module extends AbstractModule {
 	public getModuleID(): string {
@@ -18,8 +18,8 @@ export class LabrinthProjectsV2Module extends AbstractModule {
 	 * console.log(project.title) // "Sodium"
 	 * ```
 	 */
-	public async get(id: string): Promise<ProjectV2> {
-		return this.client.request<ProjectV2>(`/project/${id}`, {
+	public async get(id: string): Promise<Labrinth.Projects.v2.Project> {
+		return this.client.request<Labrinth.Projects.v2.Project>(`/project/${id}`, {
 			api: 'labrinth',
 			version: 2,
 			method: 'GET',
@@ -37,8 +37,8 @@ export class LabrinthProjectsV2Module extends AbstractModule {
 	 * const projects = await client.labrinth.projects_v2.getMultiple(['sodium', 'lithium', 'phosphor'])
 	 * ```
 	 */
-	public async getMultiple(ids: string[]): Promise<ProjectV2[]> {
-		return this.client.request<ProjectV2[]>(`/projects`, {
+	public async getMultiple(ids: string[]): Promise<Labrinth.Projects.v2.Project[]> {
+		return this.client.request<Labrinth.Projects.v2.Project[]>(`/projects`, {
 			api: 'labrinth',
 			version: 2,
 			method: 'GET',
@@ -61,8 +61,10 @@ export class LabrinthProjectsV2Module extends AbstractModule {
 	 * })
 	 * ```
 	 */
-	public async search(params: ProjectSearchParams): Promise<SearchResult> {
-		return this.client.request<SearchResult>(`/search`, {
+	public async search(
+		params: Labrinth.Projects.v2.ProjectSearchParams,
+	): Promise<Labrinth.Projects.v2.SearchResult> {
+		return this.client.request<Labrinth.Projects.v2.SearchResult>(`/search`, {
 			api: 'labrinth',
 			version: 2,
 			method: 'GET',
@@ -83,7 +85,7 @@ export class LabrinthProjectsV2Module extends AbstractModule {
 	 * })
 	 * ```
 	 */
-	public async edit(id: string, data: Partial<ProjectV2>): Promise<void> {
+	public async edit(id: string, data: Partial<Labrinth.Projects.v2.Project>): Promise<void> {
 		return this.client.request(`/project/${id}`, {
 			api: 'labrinth',
 			version: 2,
diff --git a/packages/api-client/src/modules/labrinth/projects/v3.ts b/packages/api-client/src/modules/labrinth/projects/v3.ts
index 0dd397d0..f4e65304 100644
--- a/packages/api-client/src/modules/labrinth/projects/v3.ts
+++ b/packages/api-client/src/modules/labrinth/projects/v3.ts
@@ -1,5 +1,5 @@
 import { AbstractModule } from '../../../core/abstract-module'
-import type { ProjectV3 } from './types/v3'
+import type { Labrinth } from '../types'
 
 export class LabrinthProjectsV3Module extends AbstractModule {
 	public getModuleID(): string {
@@ -18,8 +18,8 @@ export class LabrinthProjectsV3Module extends AbstractModule {
 	 * console.log(project.project_types) // v3 field
 	 * ```
 	 */
-	public async get(id: string): Promise<ProjectV3> {
-		return this.client.request<ProjectV3>(`/project/${id}`, {
+	public async get(id: string): Promise<Labrinth.Projects.v3.Project> {
+		return this.client.request<Labrinth.Projects.v3.Project>(`/project/${id}`, {
 			api: 'labrinth',
 			version: 3,
 			method: 'GET',
@@ -37,8 +37,8 @@ export class LabrinthProjectsV3Module extends AbstractModule {
 	 * const projects = await client.labrinth.projects_v3.getMultiple(['sodium', 'lithium'])
 	 * ```
 	 */
-	public async getMultiple(ids: string[]): Promise<ProjectV3[]> {
-		return this.client.request<ProjectV3[]>(`/projects`, {
+	public async getMultiple(ids: string[]): Promise<Labrinth.Projects.v3.Project[]> {
+		return this.client.request<Labrinth.Projects.v3.Project[]>(`/projects`, {
 			api: 'labrinth',
 			version: 3,
 			method: 'GET',
@@ -59,7 +59,7 @@ export class LabrinthProjectsV3Module extends AbstractModule {
 	 * })
 	 * ```
 	 */
-	public async edit(id: string, data: Partial<ProjectV3>): Promise<void> {
+	public async edit(id: string, data: Labrinth.Projects.v3.EditProjectRequest): Promise<void> {
 		return this.client.request(`/project/${id}`, {
 			api: 'labrinth',
 			version: 3,
diff --git a/packages/api-client/src/modules/labrinth/state/index.ts b/packages/api-client/src/modules/labrinth/state/index.ts
new file mode 100644
index 00000000..8d9d0f19
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/state/index.ts
@@ -0,0 +1,135 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { Labrinth } from '../types'
+
+export class LabrinthStateModule extends AbstractModule {
+	public getModuleID(): string {
+		return 'labrinth_state'
+	}
+
+	/**
+	 * Build the complete generated state by fetching from multiple endpoints
+	 *
+	 * @returns Promise resolving to the generated state containing categories, loaders, products, etc.
+	 *
+	 * @example
+	 * ```typescript
+	 * const state = await client.labrinth.state.build()
+	 * console.log(state.products) // Available billing products
+	 * ```
+	 */
+	public async build(): Promise<Labrinth.State.GeneratedState> {
+		const errors: unknown[] = []
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		const handleError = (err: any, defaultValue: any) => {
+			console.error('Error fetching state data:', err)
+			errors.push(err)
+			return defaultValue
+		}
+
+		// TODO: as we add new modules, move these raw requests to actual
+		// abstractions
+		const [
+			categories,
+			loaders,
+			gameVersions,
+			donationPlatforms,
+			reportTypes,
+			homePageProjects,
+			homePageSearch,
+			homePageNotifs,
+			products,
+			muralBankDetails,
+			iso3166Data,
+		] = await Promise.all([
+			// Tag endpoints
+			this.client
+				.request<Labrinth.Tags.v2.Category[]>('/tag/category', {
+					api: 'labrinth',
+					version: 2,
+					method: 'GET',
+				})
+				.catch((err) => handleError(err, [])),
+			this.client
+				.request<Labrinth.Tags.v2.Loader[]>('/tag/loader', {
+					api: 'labrinth',
+					version: 2,
+					method: 'GET',
+				})
+				.catch((err) => handleError(err, [])),
+			this.client
+				.request<Labrinth.Tags.v2.GameVersion[]>('/tag/game_version', {
+					api: 'labrinth',
+					version: 2,
+					method: 'GET',
+				})
+				.catch((err) => handleError(err, [])),
+			this.client
+				.request<Labrinth.Tags.v2.DonationPlatform[]>('/tag/donation_platform', {
+					api: 'labrinth',
+					version: 2,
+					method: 'GET',
+				})
+				.catch((err) => handleError(err, [])),
+			this.client
+				.request<string[]>('/tag/report_type', { api: 'labrinth', version: 2, method: 'GET' })
+				.catch((err) => handleError(err, [])),
+
+			// Homepage data
+			this.client
+				.request<Labrinth.Projects.v2.Project[]>('/projects_random', {
+					api: 'labrinth',
+					version: 2,
+					method: 'GET',
+					params: { count: '60' },
+				})
+				.catch((err) => handleError(err, [])),
+			this.client
+				.request<Labrinth.Search.v2.SearchResults>('/search', {
+					api: 'labrinth',
+					version: 2,
+					method: 'GET',
+					params: { limit: '3', query: 'leave', index: 'relevance' },
+				})
+				.catch((err) => handleError(err, {} as Labrinth.Search.v2.SearchResults)),
+			this.client
+				.request<Labrinth.Search.v2.SearchResults>('/search', {
+					api: 'labrinth',
+					version: 2,
+					method: 'GET',
+					params: { limit: '3', query: '', index: 'updated' },
+				})
+				.catch((err) => handleError(err, {} as Labrinth.Search.v2.SearchResults)),
+
+			// Internal billing/mural endpoints
+			this.client.labrinth.billing_internal.getProducts().catch((err) => handleError(err, [])),
+			this.client
+				.request<{ bankDetails: Record<string, { bankNames: string[] }> }>('/mural/bank-details', {
+					api: 'labrinth',
+					version: 'internal',
+					method: 'GET',
+				})
+				.catch((err) => handleError(err, null)),
+
+			// ISO3166 country and subdivision data
+			this.client.iso3166.data
+				.build()
+				.catch((err) => handleError(err, { countries: [], subdivisions: {} })),
+		])
+
+		return {
+			categories,
+			loaders,
+			gameVersions,
+			donationPlatforms,
+			reportTypes,
+			homePageProjects,
+			homePageSearch,
+			homePageNotifs,
+			products,
+			muralBankDetails: muralBankDetails?.bankDetails,
+			countries: iso3166Data.countries,
+			subdivisions: iso3166Data.subdivisions,
+			errors,
+		}
+	}
+}
diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
new file mode 100644
index 00000000..f5e64762
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -0,0 +1,453 @@
+import type { ISO3166 } from '../iso3166/types'
+
+export namespace Labrinth {
+	export namespace Billing {
+		export namespace Internal {
+			export type PriceDuration = 'five-days' | 'monthly' | 'quarterly' | 'yearly'
+
+			export type SubscriptionStatus = 'provisioned' | 'unprovisioned'
+
+			export type UserSubscription = {
+				id: string
+				user_id: string
+				price_id: string
+				interval: PriceDuration
+				status: SubscriptionStatus
+				created: string // ISO datetime string
+				metadata?: SubscriptionMetadata
+			}
+
+			export type SubscriptionMetadata =
+				| { type: 'pyro'; id: string; region?: string }
+				| { type: 'medal'; id: string }
+
+			export type ChargeStatus =
+				| 'open'
+				| 'processing'
+				| 'succeeded'
+				| 'failed'
+				| 'cancelled'
+				| 'expiring'
+
+			export type ChargeType = 'one-time' | 'subscription' | 'proration' | 'refund'
+
+			export type PaymentPlatform = 'Stripe' | 'None'
+
+			export type Charge = {
+				id: string
+				user_id: string
+				price_id: string
+				amount: number
+				currency_code: string
+				status: ChargeStatus
+				due: string // ISO datetime string
+				last_attempt: string | null // ISO datetime string
+				type: ChargeType
+				subscription_id: string | null
+				subscription_interval: PriceDuration | null
+				platform: PaymentPlatform
+				parent_charge_id: string | null
+				net: number | null
+			}
+
+			export type ProductMetadata =
+				| { type: 'midas' }
+				| {
+						type: 'pyro'
+						cpu: number
+						ram: number
+						swap: number
+						storage: number
+				  }
+				| {
+						type: 'medal'
+						cpu: number
+						ram: number
+						swap: number
+						storage: number
+						region: string
+				  }
+
+			export type Price =
+				| { type: 'one-time'; price: number }
+				| { type: 'recurring'; intervals: Record<PriceDuration, number> }
+
+			export type ProductPrice = {
+				id: string
+				product_id: string
+				prices: Price
+				currency_code: string
+			}
+
+			export type Product = {
+				id: string
+				metadata: ProductMetadata
+				prices: ProductPrice[]
+				unitary: boolean
+			}
+
+			export type EditSubscriptionRequest = {
+				interval?: PriceDuration
+				payment_method?: string
+				cancelled?: boolean
+				region?: string
+				product?: string
+			}
+
+			export type EditSubscriptionResponse = {
+				payment_intent_id: string
+				client_secret: string
+				tax: number
+				total: number
+			}
+
+			export type AddPaymentMethodFlowResponse = {
+				client_secret: string
+			}
+
+			export type EditPaymentMethodRequest = {
+				primary: boolean
+			}
+
+			export type InitiatePaymentRequest = {
+				type: 'payment_method' | 'confirmation_token'
+				id?: string
+				token?: string
+				charge:
+					| { type: 'existing'; id: string }
+					| { type: 'new'; product_id: string; interval?: PriceDuration }
+				existing_payment_intent?: string
+				metadata?: {
+					type: 'pyro'
+					server_name?: string
+					server_region?: string
+					source: unknown
+				}
+			}
+
+			export type InitiatePaymentResponse = {
+				payment_intent_id?: string
+				client_secret?: string
+				price_id: string
+				tax: number
+				total: number
+				payment_method?: string
+			}
+
+			export type RefundChargeRequest = {
+				type: 'full' | 'partial' | 'none'
+				amount?: number
+				unprovision?: boolean
+			}
+
+			export type CreditRequest =
+				| { subscription_ids: string[]; days: number; send_email: boolean; message: string }
+				| { nodes: string[]; days: number; send_email: boolean; message: string }
+				| { region: string; days: number; send_email: boolean; message: string }
+		}
+	}
+
+	export namespace Projects {
+		export namespace v2 {
+			export type Environment = 'required' | 'optional' | 'unsupported' | 'unknown'
+
+			export type ProjectStatus =
+				| 'approved'
+				| 'archived'
+				| 'rejected'
+				| 'draft'
+				| 'unlisted'
+				| 'processing'
+				| 'withheld'
+				| 'scheduled'
+				| 'private'
+				| 'unknown'
+
+			export type MonetizationStatus = 'monetized' | 'demonetized' | 'force-demonetized'
+
+			export type ProjectType =
+				| 'mod'
+				| 'modpack'
+				| 'resourcepack'
+				| 'shader'
+				| 'plugin'
+				| 'datapack'
+
+			export type GalleryImage = {
+				url: string
+				featured: boolean
+				title?: string
+				description?: string
+				created: string
+				ordering: number
+			}
+
+			export type DonationLink = {
+				id: string
+				platform: string
+				url: string
+			}
+
+			export type Project = {
+				id: string
+				slug: string
+				project_type: ProjectType
+				team: string
+				title: string
+				description: string
+				body: string
+				published: string
+				updated: string
+				approved?: string
+				queued?: string
+				status: ProjectStatus
+				requested_status?: ProjectStatus
+				moderator_message?: {
+					message: string
+					body?: string
+				}
+				license: {
+					id: string
+					name: string
+					url?: string
+				}
+				client_side: Environment
+				server_side: Environment
+				downloads: number
+				followers: number
+				categories: string[]
+				additional_categories: string[]
+				game_versions: string[]
+				loaders: string[]
+				versions: string[]
+				icon_url?: string
+				issues_url?: string
+				source_url?: string
+				wiki_url?: string
+				discord_url?: string
+				donation_urls?: DonationLink[]
+				gallery?: GalleryImage[]
+				color?: number
+				thread_id: string
+				monetization_status: MonetizationStatus
+			}
+
+			export type SearchResultHit = {
+				project_id: string
+				project_type: ProjectType
+				slug: string
+				author: string
+				title: string
+				description: string
+				categories: string[]
+				display_categories: string[]
+				versions: string[]
+				downloads: number
+				follows: number
+				icon_url: string
+				date_created: string
+				date_modified: string
+				latest_version?: string
+				license: string
+				client_side: Environment
+				server_side: Environment
+				gallery: string[]
+				color?: number
+			}
+
+			export type SearchResult = {
+				hits: SearchResultHit[]
+				offset: number
+				limit: number
+				total_hits: number
+			}
+
+			export type ProjectSearchParams = {
+				query?: string
+				facets?: string[][]
+				filters?: string
+				index?: 'relevance' | 'downloads' | 'follows' | 'newest' | 'updated'
+				offset?: number
+				limit?: number
+			}
+		}
+
+		export namespace v3 {
+			export type Environment =
+				| 'client_and_server'
+				| 'client_only'
+				| 'client_only_server_optional'
+				| 'singleplayer_only'
+				| 'server_only'
+				| 'server_only_client_optional'
+				| 'dedicated_server_only'
+				| 'client_or_server'
+				| 'client_or_server_prefers_both'
+				| 'unknown'
+
+			export type GalleryItem = {
+				url: string
+				raw_url: string
+				featured: boolean
+				name?: string
+				description?: string
+				created: string
+				ordering: number
+			}
+
+			export type Link = {
+				platform: string
+				donation: boolean
+				url: string
+			}
+
+			export type Project = {
+				id: string
+				slug?: string
+				project_types: string[]
+				games: string[]
+				team_id: string
+				organization?: string
+				name: string
+				summary: string
+				description: string
+				published: string
+				updated: string
+				approved?: string
+				queued?: string
+				status: v2.ProjectStatus
+				requested_status?: v2.ProjectStatus
+				license: {
+					id: string
+					name: string
+					url?: string
+				}
+				downloads: number
+				followers: number
+				categories: string[]
+				additional_categories: string[]
+				loaders: string[]
+				versions: string[]
+				icon_url?: string
+				link_urls: Record<string, Link>
+				gallery: GalleryItem[]
+				color?: number
+				thread_id: string
+				monetization_status: v2.MonetizationStatus
+				side_types_migration_review_status: 'reviewed' | 'pending'
+				environment?: Environment[]
+				[key: string]: unknown
+			}
+
+			export type EditProjectRequest = {
+				name?: string
+				summary?: string
+				description?: string
+				categories?: string[]
+				additional_categories?: string[]
+				license_url?: string | null
+				link_urls?: Record<string, string | null>
+				license_id?: string
+				slug?: string
+				status?: v2.ProjectStatus
+				requested_status?: v2.ProjectStatus | null
+				moderation_message?: string | null
+				moderation_message_body?: string | null
+				monetization_status?: v2.MonetizationStatus
+				side_types_migration_review_status?: 'reviewed' | 'pending'
+				environment?: Environment
+				[key: string]: unknown
+			}
+		}
+	}
+
+	export namespace Tags {
+		export namespace v2 {
+			export interface Category {
+				icon: string
+				name: string
+				project_type: string
+				header: string
+			}
+
+			export interface Loader {
+				icon: string
+				name: string
+				supported_project_types: string[]
+			}
+
+			export interface GameVersion {
+				version: string
+				version_type: string
+				date: string // RFC 3339 DateTime
+				major: boolean
+			}
+
+			export interface DonationPlatform {
+				short: string
+				name: string
+			}
+		}
+	}
+
+	export namespace Search {
+		export namespace v2 {
+			export interface ResultSearchProject {
+				project_id: string
+				project_type: string
+				slug: string | null
+				author: string
+				title: string
+				description: string
+				categories: string[]
+				display_categories: string[]
+				versions: string[]
+				downloads: number
+				follows: number
+				icon_url: string
+				date_created: string
+				date_modified: string
+				latest_version: string
+				license: string
+				client_side: string
+				server_side: string
+				gallery: string[]
+				featured_gallery: string | null
+				color: number | null
+			}
+
+			export interface SearchResults {
+				hits: ResultSearchProject[]
+				offset: number
+				limit: number
+				total_hits: number
+			}
+		}
+	}
+
+	export namespace State {
+		export interface GeneratedState {
+			categories: Tags.v2.Category[]
+			loaders: Tags.v2.Loader[]
+			gameVersions: Tags.v2.GameVersion[]
+			donationPlatforms: Tags.v2.DonationPlatform[]
+			reportTypes: string[]
+			muralBankDetails?: Record<
+				string,
+				{
+					bankNames: string[]
+				}
+			>
+
+			homePageProjects?: Projects.v2.Project[]
+			homePageSearch?: Search.v2.SearchResults
+			homePageNotifs?: Search.v2.SearchResults
+			products?: Billing.Internal.Product[]
+
+			countries: ISO3166.Country[]
+			subdivisions: Record<string, ISO3166.Subdivision[]>
+
+			errors: unknown[]
+		}
+	}
+}
diff --git a/packages/api-client/src/modules/types.ts b/packages/api-client/src/modules/types.ts
index 6540671e..f0aff3b3 100644
--- a/packages/api-client/src/modules/types.ts
+++ b/packages/api-client/src/modules/types.ts
@@ -1,2 +1,4 @@
-export * from './labrinth/projects/types/v2'
-export * from './labrinth/projects/types/v3'
+export * from './archon/types'
+export * from './iso3166/types'
+export * from './kyros/types'
+export * from './labrinth/types'
diff --git a/packages/api-client/src/types/request.ts b/packages/api-client/src/types/request.ts
index a9383cfb..1d513fcc 100644
--- a/packages/api-client/src/types/request.ts
+++ b/packages/api-client/src/types/request.ts
@@ -20,7 +20,7 @@ export type RequestOptions = {
 	 * - number: version number (e.g., 2 for v2, 3 for v3)
 	 * - 'internal': use internal API
 	 */
-	version: number | 'internal'
+	version: number | 'internal' | string
 
 	/**
 	 * HTTP method to use
diff --git a/packages/api-client/tsconfig.json b/packages/api-client/tsconfig.json
index e8bc1a8a..d44ca476 100644
--- a/packages/api-client/tsconfig.json
+++ b/packages/api-client/tsconfig.json
@@ -1,3 +1,6 @@
 {
-	"extends": "@modrinth/tooling-config/typescript/base.json"
+	"extends": "@modrinth/tooling-config/typescript/base.json",
+	"compilerOptions": {
+		"isolatedModules": false
+	}
 }
diff --git a/apps/frontend/src/assets/images/servers/minecraft_server_icon.png b/packages/assets/external/illustrations/minecraft_server_icon.png
similarity index 100%
rename from apps/frontend/src/assets/images/servers/minecraft_server_icon.png
rename to packages/assets/external/illustrations/minecraft_server_icon.png
diff --git a/packages/assets/index.ts b/packages/assets/index.ts
index 7803c884..b04a369d 100644
--- a/packages/assets/index.ts
+++ b/packages/assets/index.ts
@@ -40,6 +40,7 @@ import _CurseForgeIcon from './external/curseforge.svg?component'
 import _DiscordIcon from './external/discord.svg?component'
 import _FacebookIcon from './external/facebook.svg?component'
 import _GithubIcon from './external/github.svg?component'
+import _MinecraftServerIcon from './external/illustrations/minecraft_server_icon.png?url'
 import _InstagramIcon from './external/instagram.svg?component'
 import _KoFiIcon from './external/kofi.svg?component'
 import _MastodonIcon from './external/mastodon.svg?component'
@@ -113,6 +114,7 @@ export const VenmoIcon = _VenmoIcon
 export const PolygonIcon = _PolygonIcon
 export const USDCColorIcon = _USDCColorIcon
 export const VisaIcon = _VisaIcon
+export const MinecraftServerIcon = _MinecraftServerIcon
 
 export * from './generated-icons'
 export { default as ClassicPlayerModel } from './models/classic-player.gltf?url'
diff --git a/packages/tooling-config/eslint/common.mjs b/packages/tooling-config/eslint/common.mjs
index a9e900de..a32e8299 100644
--- a/packages/tooling-config/eslint/common.mjs
+++ b/packages/tooling-config/eslint/common.mjs
@@ -15,6 +15,8 @@ export default [
 			'@typescript-eslint/no-type-alias': 'off',
 			'@typescript-eslint/ban-ts-comment': 'off',
 			'@typescript-eslint/prefer-literal-enum-member': 'off',
+			'@typescript-eslint/no-namespace': 'off',
+			'@typescript-eslint/no-invalid-void-type': 'off',
 		},
 	},
 ]
diff --git a/packages/ui/index.ts b/packages/ui/index.ts
index a926c4bc..55871f13 100644
--- a/packages/ui/index.ts
+++ b/packages/ui/index.ts
@@ -1,4 +1,5 @@
 export * from './src/components'
 export * from './src/composables'
+export * from './src/pages'
 export * from './src/providers'
 export * from './src/utils'
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 3292aa1d..9c1a2083 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -4,14 +4,25 @@
 	"private": true,
 	"main": "./index.ts",
 	"types": "./index.ts",
+	"exports": {
+		".": {
+			"types": "./index.ts",
+			"default": "./index.ts"
+		},
+		"./pages": {
+			"types": "./src/pages/index.ts",
+			"default": "./src/pages/index.ts"
+		},
+		"./src/*": "./src/*"
+	},
 	"scripts": {
 		"lint": "eslint . && prettier --check .",
 		"fix": "eslint . --fix && prettier --write .",
 		"intl:extract": "formatjs extract \"src/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore \"src/**/*.d.ts\" --out-file src/locales/en-US/index.json --preserve-whitespace"
 	},
 	"devDependencies": {
-		"@modrinth/tooling-config": "workspace:*",
 		"@formatjs/cli": "^6.2.12",
+		"@modrinth/tooling-config": "workspace:*",
 		"@stripe/stripe-js": "^7.3.1",
 		"@vintl/unplugin": "^1.5.1",
 		"@vintl/vintl": "^4.4.1",
@@ -26,8 +37,10 @@
 		"@codemirror/language": "^6.9.3",
 		"@codemirror/state": "^6.3.2",
 		"@codemirror/view": "^6.22.1",
+		"@modrinth/api-client": "workspace:*",
 		"@modrinth/assets": "workspace:*",
 		"@modrinth/utils": "workspace:*",
+		"@tanstack/vue-query": "^5.90.7",
 		"@tresjs/cientos": "^4.3.0",
 		"@tresjs/core": "^4.3.4",
 		"@tresjs/post-processing": "^2.4.0",
@@ -38,6 +51,7 @@
 		"apexcharts": "^3.44.0",
 		"dayjs": "^1.11.10",
 		"floating-vue": "^5.2.2",
+		"fuse.js": "^6.6.2",
 		"highlight.js": "^11.9.0",
 		"markdown-it": "^13.0.2",
 		"postprocessing": "^6.37.6",
diff --git a/packages/ui/src/components/billing/ModalBasedServerPlan.vue b/packages/ui/src/components/billing/ModalBasedServerPlan.vue
index 325eccd0..66248790 100644
--- a/packages/ui/src/components/billing/ModalBasedServerPlan.vue
+++ b/packages/ui/src/components/billing/ModalBasedServerPlan.vue
@@ -1,16 +1,18 @@
 <script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
 import { InfoIcon } from '@modrinth/assets'
 import { formatPrice } from '@modrinth/utils'
 import { type MessageDescriptor, useVIntl } from '@vintl/vintl'
 import { Menu } from 'floating-vue'
 import { computed, inject, type Ref } from 'vue'
 
-import { monthsInInterval, type ServerBillingInterval, type ServerPlan } from '../../utils/billing'
+import { getPriceForInterval, monthsInInterval } from '../../utils/product-utils'
+import type { ServerBillingInterval } from './ModrinthServersPurchaseModal.vue'
 import ServersSpecs from './ServersSpecs.vue'
 
 const props = withDefaults(
 	defineProps<{
-		plan: ServerPlan
+		plan: Labrinth.Billing.Internal.Product
 		title: MessageDescriptor
 		description: MessageDescriptor
 		buttonColor?: 'standard' | 'brand' | 'red' | 'orange' | 'green' | 'blue' | 'purple'
@@ -25,7 +27,7 @@ const props = withDefaults(
 )
 
 const emit = defineEmits<{
-	(e: 'select', plan: ServerPlan): void
+	(e: 'select', plan: Labrinth.Billing.Internal.Product): void
 }>()
 
 const { formatMessage, locale } = useVIntl()
@@ -36,13 +38,23 @@ const currency = inject<string>('currency')
 
 const perMonth = computed(() => {
 	if (!props.plan || !currency || !selectedInterval?.value) return undefined
-	const total = props.plan.prices?.find((x) => x.currency_code === currency)?.prices?.intervals?.[
-		selectedInterval.value
-	]
+	const total = getPriceForInterval(props.plan, currency, selectedInterval.value)
 	if (!total) return undefined
 	return total / monthsInInterval[selectedInterval.value]
 })
 
+const planSpecs = computed(() => {
+	const metadata = props.plan.metadata
+	if (metadata.type === 'pyro' || metadata.type === 'medal') {
+		return {
+			ram: metadata.ram,
+			storage: metadata.storage,
+			cpu: metadata.cpu,
+		}
+	}
+	return null
+})
+
 const mostPopularStyle = computed(() => {
 	if (!props.mostPopular) return undefined
 	const style: Record<string, string> = {
@@ -121,11 +133,11 @@ const mostPopularStyle = computed(() => {
 					</template>
 
 					<template #popper>
-						<div class="w-fit rounded-md border border-contrast/10 p-3 shadow-lg">
+						<div v-if="planSpecs" class="w-fit rounded-md border border-contrast/10 p-3 shadow-lg">
 							<ServersSpecs
-								:ram="plan.metadata.ram!"
-								:storage="plan.metadata.storage!"
-								:cpus="plan.metadata.cpu!"
+								:ram="planSpecs.ram"
+								:storage="planSpecs.storage"
+								:cpus="planSpecs.cpu"
 							/>
 						</div>
 					</template>
diff --git a/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue b/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
index a8f02fd5..26630a8e 100644
--- a/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
+++ b/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { Archon, Labrinth } from '@modrinth/api-client'
 import {
 	CheckCircleIcon,
 	ChevronRightIcon,
@@ -7,23 +8,12 @@ import {
 	SpinnerIcon,
 	XIcon,
 } from '@modrinth/assets'
-import type { UserSubscription } from '@modrinth/utils'
 import { defineMessage, type MessageDescriptor, useVIntl } from '@vintl/vintl'
 import type Stripe from 'stripe'
 import { computed, nextTick, ref, useTemplateRef, watch } from 'vue'
 
 import { useStripe } from '../../composables/stripe'
 import { commonMessages } from '../../utils'
-import type {
-	CreatePaymentIntentRequest,
-	CreatePaymentIntentResponse,
-	ServerBillingInterval,
-	ServerPlan,
-	ServerRegion,
-	ServerStockRequest,
-	UpdatePaymentIntentRequest,
-	UpdatePaymentIntentResponse,
-} from '../../utils/billing'
 import { ButtonStyled } from '../index'
 import ModalLoadingIndicator from '../modal/ModalLoadingIndicator.vue'
 import NewModal from '../modal/NewModal.vue'
@@ -39,6 +29,9 @@ export type RegionPing = {
 	ping: number
 }
 
+// Type alias for billing interval that matches both the local and api-client types
+export type ServerBillingInterval = 'monthly' | 'quarterly' | 'yearly'
+
 const props = defineProps<{
 	publishableKey: string
 	returnUrl: string
@@ -46,23 +39,30 @@ const props = defineProps<{
 	customer: Stripe.Customer
 	currency: string
 	pings: RegionPing[]
-	regions: ServerRegion[]
-	availableProducts: ServerPlan[]
+	regions: Archon.Servers.v1.Region[]
+	availableProducts: Labrinth.Billing.Internal.Product[]
 	planStage?: boolean
-	existingPlan?: ServerPlan
-	existingSubscription?: UserSubscription
+	existingPlan?: Labrinth.Billing.Internal.Product
+	existingSubscription?: Labrinth.Billing.Internal.UserSubscription
 	refreshPaymentMethods: () => Promise<void>
-	fetchStock: (region: ServerRegion, request: ServerStockRequest) => Promise<number>
+	fetchStock: (
+		region: Archon.Servers.v1.Region,
+		request: Archon.Servers.v0.StockRequest,
+	) => Promise<number>
 	initiatePayment: (
-		body: CreatePaymentIntentRequest | UpdatePaymentIntentRequest,
-	) => Promise<UpdatePaymentIntentResponse | CreatePaymentIntentResponse | null>
+		body: Labrinth.Billing.Internal.InitiatePaymentRequest,
+	) => Promise<
+		| Labrinth.Billing.Internal.InitiatePaymentResponse
+		| Labrinth.Billing.Internal.EditSubscriptionResponse
+		| null
+	>
 	onError: (err: Error) => void
 	onFinalizeNoPaymentChange?: () => Promise<void>
 	affiliateCode?: string | null
 }>()
 
 const modal = useTemplateRef<InstanceType<typeof NewModal>>('modal')
-const selectedPlan = ref<ServerPlan>()
+const selectedPlan = ref<Labrinth.Billing.Internal.Product>()
 const selectedInterval = ref<ServerBillingInterval>('quarterly')
 const loading = ref(false)
 const selectedRegion = ref<string>()
@@ -237,7 +237,7 @@ watch(selectedPlan, () => {
 	}
 })
 
-const defaultPlan = computed<ServerPlan | undefined>(() => {
+const defaultPlan = computed<Labrinth.Billing.Internal.Product | undefined>(() => {
 	return (
 		props.availableProducts.find((p) => p?.metadata?.type === 'pyro' && p.metadata.ram === 6144) ??
 		props.availableProducts.find((p) => p?.metadata?.type === 'pyro') ??
@@ -245,7 +245,11 @@ const defaultPlan = computed<ServerPlan | undefined>(() => {
 	)
 })
 
-function begin(interval: ServerBillingInterval, plan?: ServerPlan, project?: string) {
+function begin(
+	interval: ServerBillingInterval,
+	plan?: Labrinth.Billing.Internal.Product | null,
+	project?: string,
+) {
 	loading.value = false
 
 	if (plan === null) {
diff --git a/packages/ui/src/components/billing/PurchaseModal.vue b/packages/ui/src/components/billing/PurchaseModal.vue
index 28c7bc50..c1001680 100644
--- a/packages/ui/src/components/billing/PurchaseModal.vue
+++ b/packages/ui/src/components/billing/PurchaseModal.vue
@@ -552,7 +552,7 @@ import Checkbox from '../base/Checkbox.vue'
 import Slider from '../base/Slider.vue'
 import AnimatedLogo from '../brand/AnimatedLogo.vue'
 import NewModal from '../modal/NewModal.vue'
-import LoaderIcon from '../servers/LoaderIcon.vue'
+import LoaderIcon from '../servers/icons/LoaderIcon.vue'
 
 const { locale, formatMessage } = useVIntl()
 
diff --git a/packages/ui/src/components/billing/ServersPurchase0Plan.vue b/packages/ui/src/components/billing/ServersPurchase0Plan.vue
index 1b4269f9..26ce79bf 100644
--- a/packages/ui/src/components/billing/ServersPurchase0Plan.vue
+++ b/packages/ui/src/components/billing/ServersPurchase0Plan.vue
@@ -1,23 +1,25 @@
 <script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
 import { formatPrice } from '@modrinth/utils'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import { computed, provide } from 'vue'
 
-import { monthsInInterval, type ServerBillingInterval, type ServerPlan } from '../../utils/billing'
+import { getPriceForInterval, monthsInInterval } from '../../utils/product-utils'
 import OptionGroup from '../base/OptionGroup.vue'
 import ModalBasedServerPlan from './ModalBasedServerPlan.vue'
+import type { ServerBillingInterval } from './ModrinthServersPurchaseModal.vue'
 
 const { formatMessage, locale } = useVIntl()
 
 const props = defineProps<{
-	availableProducts: ServerPlan[]
+	availableProducts: Labrinth.Billing.Internal.Product[]
 	currency: string
-	existingPlan?: ServerPlan
+	existingPlan?: Labrinth.Billing.Internal.Product
 }>()
 
 const availableBillingIntervals = ['monthly', 'quarterly']
 
-const selectedPlan = defineModel<ServerPlan>('plan')
+const selectedPlan = defineModel<Labrinth.Billing.Internal.Product>('plan')
 const selectedInterval = defineModel<ServerBillingInterval>('interval')
 const emit = defineEmits<{
 	(e: 'choose-custom'): void
@@ -75,7 +77,10 @@ const isSameAsExistingPlan = computed(() => {
 })
 
 const plansByRam = computed(() => {
-	const byName: Record<'small' | 'medium' | 'large', ServerPlan | undefined> = {
+	const byName: Record<
+		'small' | 'medium' | 'large',
+		Labrinth.Billing.Internal.Product | undefined
+	> = {
 		small: undefined,
 		medium: undefined,
 		large: undefined,
@@ -93,13 +98,11 @@ function handleCustomPlan() {
 	emit('choose-custom')
 }
 
-function pricePerMonth(plan?: ServerPlan) {
-	if (!plan) return undefined
-	const total = plan.prices?.find((x) => x.currency_code === props.currency)?.prices?.intervals?.[
-		selectedInterval.value!
-	]
+function pricePerMonth(plan?: Labrinth.Billing.Internal.Product) {
+	if (!plan || !selectedInterval.value) return undefined
+	const total = getPriceForInterval(plan, props.currency, selectedInterval.value)
 	if (!total) return undefined
-	return total / monthsInInterval[selectedInterval.value!]
+	return total / monthsInInterval[selectedInterval.value]
 }
 
 const customPricePerGb = computed(() => {
@@ -107,7 +110,9 @@ const customPricePerGb = computed(() => {
 	let min: number | undefined
 	for (const p of props.availableProducts) {
 		const perMonth = pricePerMonth(p)
-		const ramGb = (p?.metadata?.ram ?? 0) / 1024
+		const metadata = p?.metadata
+		if (!metadata || (metadata.type !== 'pyro' && metadata.type !== 'medal')) continue
+		const ramGb = metadata.ram / 1024
 		if (perMonth && ramGb > 0) {
 			const perGb = perMonth / ramGb
 			if (min === undefined || perGb < min) min = perGb
diff --git a/packages/ui/src/components/billing/ServersPurchase1Region.vue b/packages/ui/src/components/billing/ServersPurchase1Region.vue
index 83cf750f..68d55e92 100644
--- a/packages/ui/src/components/billing/ServersPurchase1Region.vue
+++ b/packages/ui/src/components/billing/ServersPurchase1Region.vue
@@ -1,44 +1,42 @@
 <script setup lang="ts">
+import type { Archon, Labrinth } from '@modrinth/api-client'
 import { InfoIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import { IntlFormatted } from '@vintl/vintl/components'
 import { computed, onMounted, ref, watch } from 'vue'
 
 import { formatPrice } from '../../../../utils'
-import {
-	monthsInInterval,
-	type ServerBillingInterval,
-	type ServerPlan,
-	type ServerRegion,
-	type ServerStockRequest,
-} from '../../utils/billing'
+import { getPriceForInterval, monthsInInterval } from '../../utils/product-utils.ts'
 import { regionOverrides } from '../../utils/regions.ts'
 import Slider from '../base/Slider.vue'
 import ModalLoadingIndicator from '../modal/ModalLoadingIndicator.vue'
-import type { RegionPing } from './ModrinthServersPurchaseModal.vue'
+import type { RegionPing, ServerBillingInterval } from './ModrinthServersPurchaseModal.vue'
 import ServersRegionButton from './ServersRegionButton.vue'
 import ServersSpecs from './ServersSpecs.vue'
 
 const { formatMessage, locale } = useVIntl()
 
 const props = defineProps<{
-	regions: ServerRegion[]
+	regions: Archon.Servers.v1.Region[]
 	pings: RegionPing[]
-	fetchStock: (region: ServerRegion, request: ServerStockRequest) => Promise<number>
+	fetchStock: (
+		region: Archon.Servers.v1.Region,
+		request: Archon.Servers.v0.StockRequest,
+	) => Promise<number>
 	custom: boolean
 	currency: string
 	interval: ServerBillingInterval
-	availableProducts: ServerPlan[]
+	availableProducts: Labrinth.Billing.Internal.Product[]
 }>()
 
 const loading = ref(true)
 const checkingCustomStock = ref(false)
-const selectedPlan = defineModel<ServerPlan>('plan')
+const selectedPlan = defineModel<Labrinth.Billing.Internal.Product>('plan')
 const selectedRegion = defineModel<string>('region')
 
 const selectedPrice = computed(() => {
-	const amount = selectedPlan.value?.prices?.find((price) => price.currency_code === props.currency)
-		?.prices?.intervals?.[props.interval]
+	if (!selectedPlan.value) return undefined
+	const amount = getPriceForInterval(selectedPlan.value, props.currency, props.interval)
 	return amount ? amount / monthsInInterval[props.interval] : undefined
 })
 
@@ -67,7 +65,13 @@ const selectedRam = ref<number>(-1)
 
 const ramOptions = computed(() => {
 	return props.availableProducts
-		.map((product) => (product.metadata.ram ?? 0) / 1024)
+		.map((product) => {
+			const metadata = product.metadata
+			if (metadata.type === 'pyro' || metadata.type === 'medal') {
+				return metadata.ram / 1024
+			}
+			return 0
+		})
 		.filter((x) => x > 0)
 })
 
@@ -80,38 +84,63 @@ const maxRam = computed(() => {
 
 const lowestProduct = computed(() => {
 	return (
-		props.availableProducts.find(
-			(product) => (product.metadata.ram ?? 0) / 1024 === minRam.value,
-		) ?? props.availableProducts[0]
+		props.availableProducts.find((product) => {
+			const metadata = product.metadata
+			return (
+				(metadata.type === 'pyro' || metadata.type === 'medal') &&
+				metadata.ram / 1024 === minRam.value
+			)
+		}) ?? props.availableProducts[0]
 	)
 })
 
+const selectedPlanSpecs = computed(() => {
+	if (!selectedPlan.value) return null
+	const metadata = selectedPlan.value.metadata
+	if (metadata.type === 'pyro' || metadata.type === 'medal') {
+		return {
+			ram: metadata.ram,
+			storage: metadata.storage,
+			cpu: metadata.cpu,
+		}
+	}
+	return null
+})
+
 function updateRamStock(regionToCheck: string, newRam: number) {
 	if (newRam > 0) {
 		checkingCustomStock.value = true
-		const plan = props.availableProducts.find(
-			(product) => (product.metadata.ram ?? 0) / 1024 === newRam,
-		)
+		const plan = props.availableProducts.find((product) => {
+			const metadata = product.metadata
+			return (
+				(metadata.type === 'pyro' || metadata.type === 'medal') && metadata.ram / 1024 === newRam
+			)
+		})
 		if (plan) {
 			const region = sortedRegions.value.find((region) => region.shortcode === regionToCheck)
 			if (region) {
-				props
-					.fetchStock(region, {
-						cpu: plan.metadata.cpu ?? 0,
-						memory_mb: plan.metadata.ram ?? 0,
-						swap_mb: plan.metadata.swap ?? 0,
-						storage_mb: plan.metadata.storage ?? 0,
-					})
-					.then((stock: number) => {
-						if (stock > 0) {
-							selectedPlan.value = plan
-						} else {
-							selectedPlan.value = undefined
-						}
-					})
-					.finally(() => {
-						checkingCustomStock.value = false
-					})
+				const metadata = plan.metadata
+				if (metadata.type === 'pyro' || metadata.type === 'medal') {
+					props
+						.fetchStock(region, {
+							cpu: metadata.cpu,
+							memory_mb: metadata.ram,
+							swap_mb: metadata.swap,
+							storage_mb: metadata.storage,
+						})
+						.then((stock: number) => {
+							if (stock > 0) {
+								selectedPlan.value = plan
+							} else {
+								selectedPlan.value = undefined
+							}
+						})
+						.finally(() => {
+							checkingCustomStock.value = false
+						})
+				} else {
+					checkingCustomStock.value = false
+				}
 			} else {
 				checkingCustomStock.value = false
 			}
@@ -151,22 +180,28 @@ const messages = defineMessages({
 
 async function updateStock() {
 	currentStock.value = {}
+
+	const getStockRequest = (
+		product: Labrinth.Billing.Internal.Product,
+	): Archon.Servers.v0.StockRequest => {
+		const metadata = product.metadata
+		if (metadata.type === 'pyro' || metadata.type === 'medal') {
+			return {
+				cpu: metadata.cpu,
+				memory_mb: metadata.ram,
+				swap_mb: metadata.swap,
+				storage_mb: metadata.storage,
+			}
+		}
+		return { cpu: 0, memory_mb: 0, swap_mb: 0, storage_mb: 0 }
+	}
+
 	const capacityChecks = sortedRegions.value.map((region) =>
 		props.fetchStock(
 			region,
 			selectedPlan.value
-				? {
-						cpu: selectedPlan.value?.metadata.cpu ?? 0,
-						memory_mb: selectedPlan.value?.metadata.ram ?? 0,
-						swap_mb: selectedPlan.value?.metadata.swap ?? 0,
-						storage_mb: selectedPlan.value?.metadata.storage ?? 0,
-					}
-				: {
-						cpu: lowestProduct.value.metadata.cpu ?? 0,
-						memory_mb: lowestProduct.value.metadata.ram ?? 0,
-						swap_mb: lowestProduct.value.metadata.swap ?? 0,
-						storage_mb: lowestProduct.value.metadata.storage ?? 0,
-					},
+				? getStockRequest(selectedPlan.value)
+				: getStockRequest(lowestProduct.value),
 		),
 	)
 	const results = await Promise.all(capacityChecks)
@@ -255,12 +290,12 @@ onMounted(() => {
 					<div v-if="checkingCustomStock" class="flex gap-2 items-center">
 						<SpinnerIcon class="size-5 shrink-0 animate-spin" /> Checking availability...
 					</div>
-					<div v-else-if="selectedPlan">
+					<div v-else-if="selectedPlanSpecs">
 						<ServersSpecs
 							class="!flex-row justify-between"
-							:ram="selectedPlan.metadata.ram ?? 0"
-							:storage="selectedPlan.metadata.storage ?? 0"
-							:cpus="selectedPlan.metadata.cpu ?? 0"
+							:ram="selectedPlanSpecs.ram"
+							:storage="selectedPlanSpecs.storage"
+							:cpus="selectedPlanSpecs.cpu"
 						/>
 					</div>
 					<div v-else class="flex gap-2 items-center">
diff --git a/packages/ui/src/components/billing/ServersPurchase3Review.vue b/packages/ui/src/components/billing/ServersPurchase3Review.vue
index 4548d7d7..544ce3b2 100644
--- a/packages/ui/src/components/billing/ServersPurchase3Review.vue
+++ b/packages/ui/src/components/billing/ServersPurchase3Review.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { Archon, Labrinth } from '@modrinth/api-client'
 import {
 	EditIcon,
 	ExternalIcon,
@@ -9,18 +10,13 @@ import {
 	SpinnerIcon,
 	XIcon,
 } from '@modrinth/assets'
-import { formatPrice, getPingLevel, type UserSubscription } from '@modrinth/utils'
+import { formatPrice, getPingLevel } from '@modrinth/utils'
 import { useVIntl } from '@vintl/vintl'
 import dayjs from 'dayjs'
 import type Stripe from 'stripe'
 import { computed } from 'vue'
 
-import {
-	monthsInInterval,
-	type ServerBillingInterval,
-	type ServerPlan,
-	type ServerRegion,
-} from '../../utils/billing'
+import { getPriceForInterval, monthsInInterval } from '../../utils/product-utils'
 import { regionOverrides } from '../../utils/regions'
 import ButtonStyled from '../base/ButtonStyled.vue'
 import Checkbox from '../base/Checkbox.vue'
@@ -28,6 +24,7 @@ import TagItem from '../base/TagItem.vue'
 import ModrinthServersIcon from '../servers/ModrinthServersIcon.vue'
 import ExpandableInvoiceTotal from './ExpandableInvoiceTotal.vue'
 import FormattedPaymentMethod from './FormattedPaymentMethod.vue'
+import type { ServerBillingInterval } from './ModrinthServersPurchaseModal.vue'
 import ServersSpecs from './ServersSpecs.vue'
 
 const vintl = useVIntl()
@@ -38,8 +35,8 @@ const emit = defineEmits<{
 }>()
 
 const props = defineProps<{
-	plan: ServerPlan
-	region: ServerRegion
+	plan: Labrinth.Billing.Internal.Product
+	region: Archon.Servers.v1.Region
 	tax?: number
 	total?: number
 	currency: string
@@ -48,25 +45,28 @@ const props = defineProps<{
 	selectedPaymentMethod: Stripe.PaymentMethod | undefined
 	hasPaymentMethod?: boolean
 	noPaymentRequired?: boolean
-	existingPlan?: ServerPlan
-	existingSubscription?: UserSubscription
+	existingPlan?: Labrinth.Billing.Internal.Product
+	existingSubscription?: Labrinth.Billing.Internal.UserSubscription
 }>()
 
 const interval = defineModel<ServerBillingInterval>('interval', { required: true })
 const acceptedEula = defineModel<boolean>('acceptedEula', { required: true })
 
-const prices = computed(() => {
-	return props.plan.prices.find((x) => x.currency_code === props.currency)
-})
-
 const selectedPlanPriceForInterval = computed<number | undefined>(() => {
-	return prices.value?.prices?.intervals?.[interval.value as keyof typeof monthsInInterval]
+	return getPriceForInterval(props.plan, props.currency, interval.value)
 })
 
 const existingPlanPriceForInterval = computed<number | undefined>(() => {
 	if (!props.existingPlan) return undefined
-	const p = props.existingPlan.prices.find((x) => x.currency_code === props.currency)
-	return p?.prices?.intervals?.[interval.value as keyof typeof monthsInInterval]
+	return getPriceForInterval(props.existingPlan, props.currency, interval.value)
+})
+
+const monthlyPrice = computed<number | undefined>(() => {
+	return getPriceForInterval(props.plan, props.currency, 'monthly')
+})
+
+const quarterlyPrice = computed<number | undefined>(() => {
+	return getPriceForInterval(props.plan, props.currency, 'quarterly')
 })
 
 const upgradeDeltaPrice = computed<number | undefined>(() => {
@@ -137,6 +137,18 @@ const planName = computed(() => {
 	return 'Custom'
 })
 
+const planSpecs = computed(() => {
+	const metadata = props.plan.metadata
+	if (metadata.type === 'pyro' || metadata.type === 'medal') {
+		return {
+			ram: metadata.ram,
+			storage: metadata.storage,
+			cpu: metadata.cpu,
+		}
+	}
+	return null
+})
+
 const flag = computed(
 	() =>
 		regionOverrides[props.region.shortcode]?.flag ??
@@ -173,11 +185,11 @@ function setInterval(newInterval: ServerBillingInterval) {
 			</div>
 			<div>
 				<ServersSpecs
-					v-if="plan.metadata && plan.metadata.ram && plan.metadata.storage && plan.metadata.cpu"
+					v-if="planSpecs"
 					class="!grid sm:grid-cols-2"
-					:ram="plan.metadata.ram"
-					:storage="plan.metadata.storage"
-					:cpus="plan.metadata.cpu"
+					:ram="planSpecs.ram"
+					:storage="planSpecs.storage"
+					:cpus="planSpecs.cpu"
 				/>
 			</div>
 		</div>
@@ -234,8 +246,7 @@ function setInterval(newInterval: ServerBillingInterval) {
 					>Pay monthly</span
 				>
 				<span class="text-sm text-secondary flex items-center gap-1"
-					>{{ formatPrice(locale, prices?.prices.intervals['monthly'], currency, true) }} /
-					month</span
+					>{{ formatPrice(locale, monthlyPrice, currency, true) }} / month</span
 				>
 			</div>
 		</button>
@@ -261,7 +272,7 @@ function setInterval(newInterval: ServerBillingInterval) {
 					>{{
 						formatPrice(
 							locale,
-							(prices?.prices?.intervals?.['quarterly'] ?? 0) / monthsInInterval['quarterly'],
+							(quarterlyPrice ?? 0) / monthsInInterval['quarterly'],
 							currency,
 							true,
 						)
diff --git a/packages/ui/src/components/billing/ServersRegionButton.vue b/packages/ui/src/components/billing/ServersRegionButton.vue
index 2b517d50..23f8516d 100644
--- a/packages/ui/src/components/billing/ServersRegionButton.vue
+++ b/packages/ui/src/components/billing/ServersRegionButton.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
+import type { Archon } from '@modrinth/api-client'
 import { SignalIcon, SpinnerIcon } from '@modrinth/assets'
 import { getPingLevel } from '@modrinth/utils'
 import { useVIntl } from '@vintl/vintl'
 import { computed } from 'vue'
 
-import type { ServerRegion } from '../../utils/billing'
 import { regionOverrides } from '../../utils/regions'
 
 const { formatMessage } = useVIntl()
@@ -12,7 +12,7 @@ const { formatMessage } = useVIntl()
 const currentRegion = defineModel<string | undefined>({ required: true })
 
 const props = defineProps<{
-	region: ServerRegion
+	region: Archon.Servers.v1.Region
 	ping?: number
 	bestPing?: boolean
 	outOfStock?: boolean
diff --git a/packages/ui/src/components/billing/ServersUpgradeModalWrapper.vue b/packages/ui/src/components/billing/ServersUpgradeModalWrapper.vue
new file mode 100644
index 00000000..39f0dff6
--- /dev/null
+++ b/packages/ui/src/components/billing/ServersUpgradeModalWrapper.vue
@@ -0,0 +1,341 @@
+<template>
+	<ModrinthServersPurchaseModal
+		v-if="customer && regionsData"
+		ref="purchaseModal"
+		:publishable-key="props.stripePublishableKey"
+		:initiate-payment="async (body) => await initiatePayment(body)"
+		:available-products="pyroProducts"
+		:on-error="handleError"
+		:customer="customer"
+		:payment-methods="paymentMethods"
+		:currency="selectedCurrency"
+		:return-url="`${props.siteUrl}/servers/manage`"
+		:pings="regionPings"
+		:regions="regionsData"
+		:refresh-payment-methods="fetchPaymentData"
+		:fetch-stock="fetchStock"
+		:plan-stage="true"
+		:existing-plan="currentPlanFromSubscription"
+		:existing-subscription="subscription || undefined"
+		:on-finalize-no-payment-change="finalizeDowngrade"
+		@hide="
+			() => {
+				debug('modal hidden, resetting subscription')
+				subscription = null
+			}
+		"
+	/>
+</template>
+
+<script setup lang="ts">
+import type { Archon, Labrinth } from '@modrinth/api-client'
+import {
+	injectModrinthClient,
+	injectNotificationManager,
+	ModrinthServersPurchaseModal,
+	useDebugLogger,
+} from '@modrinth/ui'
+import { useMutation, useQuery } from '@tanstack/vue-query'
+import { computed, ref, watch } from 'vue'
+
+const props = defineProps<{
+	stripePublishableKey: string
+	siteUrl: string
+	products: Labrinth.Billing.Internal.Product[]
+}>()
+
+const { addNotification } = injectNotificationManager()
+const { labrinth, archon } = injectModrinthClient()
+const debug = useDebugLogger('ServersUpgradeModalWrapper')
+const purchaseModal = ref<InstanceType<typeof ModrinthServersPurchaseModal> | null>(null)
+
+// stripe type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const customer = ref<any>(null)
+
+// stripe type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const paymentMethods = ref<any[]>([])
+const selectedCurrency = ref<string>('USD')
+
+const regionPings = ref<
+	{
+		region: string
+		ping: number
+	}[]
+>([])
+
+const pyroProducts = (props.products as Labrinth.Billing.Internal.Product[])
+	.filter((p) => p?.metadata?.type === 'pyro' || p?.metadata?.type === 'medal')
+	.sort((a, b) => {
+		const aRam = a?.metadata?.type === 'pyro' || a?.metadata?.type === 'medal' ? a.metadata.ram : 0
+		const bRam = b?.metadata?.type === 'pyro' || b?.metadata?.type === 'medal' ? b.metadata.ram : 0
+		return aRam - bRam
+	})
+
+function handleError(err: unknown) {
+	debug('Purchase modal error:', err)
+}
+
+const { data: customerData } = useQuery({
+	queryKey: ['billing', 'customer'],
+	queryFn: () => labrinth.billing_internal.getCustomer(),
+})
+
+const { data: paymentMethodsData, refetch: refetchPaymentMethods } = useQuery({
+	queryKey: ['billing', 'payment-methods'],
+	queryFn: () => labrinth.billing_internal.getPaymentMethods(),
+})
+
+const { data: regionsData } = useQuery({
+	queryKey: ['servers', 'regions'],
+	queryFn: () => archon.servers_v1.getRegions(),
+})
+
+watch(customerData, (newCustomer) => {
+	if (newCustomer) customer.value = newCustomer
+})
+
+watch(paymentMethodsData, (newMethods) => {
+	if (newMethods) paymentMethods.value = newMethods
+})
+
+watch(regionsData, (newRegions) => {
+	if (newRegions) {
+		newRegions.forEach((region) => {
+			runPingTest(region)
+		})
+	}
+})
+
+async function fetchPaymentData() {
+	await refetchPaymentMethods()
+}
+
+async function fetchStock(
+	region: Archon.Servers.v1.Region,
+	request: Archon.Servers.v0.StockRequest,
+): Promise<number> {
+	const result = await archon.servers_v0.checkStock(region.shortcode, request)
+	return result.available
+}
+
+const PING_COUNT = 20
+const PING_INTERVAL = 200
+const MAX_PING_TIME = 1000
+
+function runPingTest(region: Archon.Servers.v1.Region, index = 1) {
+	if (index > 10) {
+		regionPings.value.push({
+			region: region.shortcode,
+			ping: -1,
+		})
+		return
+	}
+
+	const wsUrl = `wss://${region.shortcode}${index}.${region.zone}/pingtest`
+	try {
+		const socket = new WebSocket(wsUrl)
+		const pings: number[] = []
+
+		socket.onopen = () => {
+			for (let i = 0; i < PING_COUNT; i++) {
+				setTimeout(() => {
+					socket.send(String(performance.now()))
+				}, i * PING_INTERVAL)
+			}
+			setTimeout(
+				() => {
+					socket.close()
+					const median = Math.round([...pings].sort((a, b) => a - b)[Math.floor(pings.length / 2)])
+					if (median) {
+						regionPings.value.push({
+							region: region.shortcode,
+							ping: median,
+						})
+					}
+				},
+				PING_COUNT * PING_INTERVAL + MAX_PING_TIME,
+			)
+		}
+
+		socket.onmessage = (event) => {
+			const start = Number(event.data)
+			pings.push(performance.now() - start)
+		}
+
+		socket.onerror = () => {
+			runPingTest(region, index + 1)
+		}
+	} catch {
+		// ignore
+	}
+}
+
+const subscription = ref<Labrinth.Billing.Internal.UserSubscription | null>(null)
+// Dry run state
+const dryRunResponse = ref<{
+	requires_payment: boolean
+	required_payment_is_proration: boolean
+} | null>(null)
+const pendingDowngradeBody = ref<Labrinth.Billing.Internal.EditSubscriptionRequest | null>(null)
+const currentPlanFromSubscription = computed<Labrinth.Billing.Internal.Product | undefined>(() => {
+	return subscription.value
+		? pyroProducts.find((p) =>
+				p.prices.some((price) => price.id === subscription.value?.price_id),
+			) ?? undefined
+		: undefined
+})
+
+const currentInterval = computed<'monthly' | 'quarterly'>(() => {
+	const interval = subscription.value?.interval
+
+	if (interval === 'monthly' || interval === 'quarterly') {
+		return interval
+	}
+
+	return 'monthly'
+})
+
+const editSubscriptionMutation = useMutation({
+	mutationFn: async ({
+		id,
+		body,
+		dry,
+	}: {
+		id: string
+		body: Labrinth.Billing.Internal.EditSubscriptionRequest
+		dry: boolean
+	}) => {
+		return await labrinth.billing_internal.editSubscription(id, body, dry)
+	},
+})
+
+async function initiatePayment(
+	body: Labrinth.Billing.Internal.InitiatePaymentRequest,
+): Promise<Labrinth.Billing.Internal.EditSubscriptionResponse | null> {
+	debug('initiatePayment called', {
+		hasSubscription: !!subscription.value,
+		subscriptionId: subscription.value?.id,
+		body,
+	})
+	if (subscription.value) {
+		const transformedBody: Labrinth.Billing.Internal.EditSubscriptionRequest = {
+			interval: body.charge.type === 'new' ? body.charge.interval : undefined,
+			payment_method: body.type === 'confirmation_token' ? body.token : body.id,
+			product: body.charge.type === 'new' ? body.charge.product_id : undefined,
+			region: body.metadata?.server_region,
+		}
+
+		try {
+			const dry = await editSubscriptionMutation.mutateAsync({
+				id: subscription.value.id,
+				body: transformedBody,
+				dry: true,
+			})
+
+			if (dry && typeof dry === 'object' && 'payment_intent_id' in dry) {
+				dryRunResponse.value = {
+					requires_payment: !!dry.payment_intent_id,
+					required_payment_is_proration: true,
+				}
+				pendingDowngradeBody.value = transformedBody
+				if (dry.payment_intent_id) {
+					return await finalizeImmediate(transformedBody)
+				} else {
+					return null
+				}
+			} else {
+				// Fallback if dry run not supported
+				return await finalizeImmediate(transformedBody)
+			}
+		} catch (e) {
+			debug('Dry run failed, attempting immediate patch', e)
+			return await finalizeImmediate(transformedBody)
+		}
+	} else {
+		debug('subscription.value is null/undefined', {
+			subscriptionValue: subscription.value,
+		})
+		addNotification({
+			title: 'Unable to determine subscription ID.',
+			text: 'Please contact support.',
+			type: 'error',
+		})
+		return Promise.reject(new Error('Unable to determine subscription ID.'))
+	}
+}
+
+async function finalizeImmediate(body: Labrinth.Billing.Internal.EditSubscriptionRequest) {
+	if (!subscription.value) return null
+
+	const result = await editSubscriptionMutation.mutateAsync({
+		id: subscription.value.id,
+		body,
+		dry: false,
+	})
+
+	return result ?? null
+}
+
+async function finalizeDowngrade() {
+	if (!subscription.value || !pendingDowngradeBody.value) return
+	try {
+		await finalizeImmediate(pendingDowngradeBody.value)
+		addNotification({
+			title: 'Subscription updated',
+			text: 'Your plan has been downgraded and will take effect next billing cycle.',
+			type: 'success',
+		})
+	} catch (e) {
+		addNotification({
+			title: 'Failed to apply subscription changes',
+			text: 'Please try again or contact support.',
+			type: 'error',
+		})
+		throw e
+	} finally {
+		dryRunResponse.value = null
+		pendingDowngradeBody.value = null
+	}
+}
+
+async function open(id?: string) {
+	debug('open called', { id })
+	if (id) {
+		const subscriptions = await labrinth.billing_internal.getSubscriptions()
+		debug('fetched subscriptions', {
+			count: subscriptions.length,
+			subscriptions: subscriptions.map((s) => ({
+				id: s.id,
+				metadataType: s.metadata?.type,
+				metadataId: s.metadata?.id,
+			})),
+		})
+		for (const sub of subscriptions) {
+			if (
+				(sub?.metadata?.type === 'pyro' || sub?.metadata?.type === 'medal') &&
+				sub.metadata.id === id
+			) {
+				subscription.value = sub
+				debug('found matching subscription', {
+					subscriptionId: sub.id,
+				})
+				break
+			}
+		}
+		if (!subscription.value) {
+			debug('no matching subscription found for id', id)
+		}
+	} else {
+		debug('no id provided, resetting subscription')
+		subscription.value = null
+	}
+
+	purchaseModal.value?.show(currentInterval.value)
+}
+
+defineExpose({
+	open,
+})
+</script>
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index c26f8ece..2db7b7c2 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -108,6 +108,7 @@ export { default as AffiliateLinkCreateModal } from './affiliate/AffiliateLinkCr
 export { default as AddPaymentMethodModal } from './billing/AddPaymentMethodModal.vue'
 export { default as ModrinthServersPurchaseModal } from './billing/ModrinthServersPurchaseModal.vue'
 export { default as PurchaseModal } from './billing/PurchaseModal.vue'
+export { default as ServersUpgradeModalWrapper } from './billing/ServersUpgradeModalWrapper.vue'
 
 // Skins
 export { default as CapeButton } from './skin/CapeButton.vue'
@@ -127,4 +128,11 @@ export { default as ThemeSelector } from './settings/ThemeSelector.vue'
 // Servers
 export { default as ServersSpecs } from './billing/ServersSpecs.vue'
 export { default as BackupWarning } from './servers/backups/BackupWarning.vue'
+export { default as LoaderIcon } from './servers/icons/LoaderIcon.vue'
+export { default as ServerIcon } from './servers/icons/ServerIcon.vue'
+export { default as ServerInfoLabels } from './servers/labels/ServerInfoLabels.vue'
+export { default as MedalBackgroundImage } from './servers/marketing/MedalBackgroundImage.vue'
+export { default as MedalServerListing } from './servers/marketing/MedalServerListing.vue'
+export type { PendingChange } from './servers/ServerListing.vue'
+export { default as ServerListing } from './servers/ServerListing.vue'
 export { default as ServersPromo } from './servers/ServersPromo.vue'
diff --git a/packages/ui/src/components/project/settings/environment/ProjectSettingsEnvSelector.vue b/packages/ui/src/components/project/settings/environment/ProjectSettingsEnvSelector.vue
index 070fcb3c..2cddf204 100644
--- a/packages/ui/src/components/project/settings/environment/ProjectSettingsEnvSelector.vue
+++ b/packages/ui/src/components/project/settings/environment/ProjectSettingsEnvSelector.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { EnvironmentV3 } from '@modrinth/utils'
 import { defineMessage, type MessageDescriptor, useVIntl } from '@vintl/vintl'
 import { computed, ref, watch } from 'vue'
 
@@ -8,7 +7,7 @@ import LargeRadioButton from '../../../base/LargeRadioButton.vue'
 
 const { formatMessage } = useVIntl()
 
-const value = defineModel<EnvironmentV3 | undefined>({ required: true })
+const value = defineModel<string | undefined>({ required: true })
 
 withDefaults(
 	defineProps<{
@@ -135,7 +134,7 @@ type SubOptionKey = ValidKeys<(typeof OUTER_OPTIONS)[keyof typeof OUTER_OPTIONS]
 const currentOuterOption = ref<OuterOptionKey>()
 const currentSubOption = ref<SubOptionKey>()
 
-const computedOption = computed<EnvironmentV3>(() => {
+const computedOption = computed<string>(() => {
 	switch (currentOuterOption.value) {
 		case 'client':
 			return 'client_only'
diff --git a/apps/frontend/src/components/ui/servers/ServerListing.vue b/packages/ui/src/components/servers/ServerListing.vue
similarity index 56%
rename from apps/frontend/src/components/ui/servers/ServerListing.vue
rename to packages/ui/src/components/servers/ServerListing.vue
index 937371a2..cf028372 100644
--- a/apps/frontend/src/components/ui/servers/ServerListing.vue
+++ b/packages/ui/src/components/servers/ServerListing.vue
@@ -58,7 +58,7 @@
 			v-if="status === 'suspended' && suspension_reason === 'upgrading'"
 			class="relative flex w-full flex-row items-center gap-2 rounded-b-2xl border-[1px] border-t-0 border-solid border-bg-blue bg-bg-blue p-4 text-sm font-bold text-contrast"
 		>
-			<PanelSpinner />
+			<LoaderCircleIcon class="size-5 animate-spin" />
 			Your server's hardware is currently being upgraded and will be back online shortly.
 		</div>
 		<div
@@ -66,7 +66,7 @@
 			class="relative flex w-full flex-col gap-2 rounded-b-2xl border-[1px] border-t-0 border-solid border-bg-red bg-bg-red p-4 text-sm font-bold text-contrast"
 		>
 			<div class="flex flex-row gap-2">
-				<PanelErrorIcon class="!size-5" /> Your server has been cancelled. Please update your
+				<TriangleAlertIcon class="!size-5" /> Your server has been cancelled. Please update your
 				billing information or contact Modrinth Support for more information.
 			</div>
 			<CopyCode :text="`${props.server_id}`" class="ml-auto" />
@@ -76,8 +76,9 @@
 			class="relative flex w-full flex-col gap-2 rounded-b-2xl border-[1px] border-t-0 border-solid border-bg-red bg-bg-red p-4 text-sm font-bold text-contrast"
 		>
 			<div class="flex flex-row gap-2">
-				<PanelErrorIcon class="!size-5" /> Your server has been suspended: {{ suspension_reason }}.
-				Please update your billing information or contact Modrinth Support for more information.
+				<TriangleAlertIcon class="!size-5" /> Your server has been suspended:
+				{{ suspension_reason }}. Please update your billing information or contact Modrinth Support
+				for more information.
 			</div>
 			<CopyCode :text="`${props.server_id}`" class="ml-auto" />
 		</div>
@@ -86,7 +87,7 @@
 			class="relative flex w-full flex-col gap-2 rounded-b-2xl border-[1px] border-t-0 border-solid border-bg-red bg-bg-red p-4 text-sm font-bold text-contrast"
 		>
 			<div class="flex flex-row gap-2">
-				<PanelErrorIcon class="!size-5" /> Your server has been suspended. Please update your
+				<TriangleAlertIcon class="!size-5" /> Your server has been suspended. Please update your
 				billing information or contact Modrinth Support for more information.
 			</div>
 			<CopyCode :text="`${props.server_id}`" class="ml-auto" />
@@ -112,19 +113,26 @@
 </template>
 
 <script setup lang="ts">
-import { ChevronRightIcon, LockIcon, SparklesIcon } from '@modrinth/assets'
-import { Avatar, CopyCode, ServersSpecs } from '@modrinth/ui'
-import type { Project, Server } from '@modrinth/utils'
+import type { Archon, ProjectV2 } from '@modrinth/api-client'
+import {
+	ChevronRightIcon,
+	LoaderCircleIcon,
+	LockIcon,
+	SparklesIcon,
+	TriangleAlertIcon,
+} from '@modrinth/assets'
+import { useQuery } from '@tanstack/vue-query'
 import dayjs from 'dayjs'
+import { computed } from 'vue'
 
-import { useModrinthServers } from '~/composables/servers/modrinth-servers.ts'
+import { injectModrinthClient } from '../../providers/api-client'
+import Avatar from '../base/Avatar.vue'
+import CopyCode from '../base/CopyCode.vue'
+import ServersSpecs from '../billing/ServersSpecs.vue'
+import ServerIcon from './icons/ServerIcon.vue'
+import ServerInfoLabels from './labels/ServerInfoLabels.vue'
 
-import PanelErrorIcon from './icons/PanelErrorIcon.vue'
-import PanelSpinner from './PanelSpinner.vue'
-import ServerIcon from './ServerIcon.vue'
-import ServerInfoLabels from './ServerInfoLabels.vue'
-
-type PendingChange = {
+export type PendingChange = {
 	planSize: string
 	cpu: number
 	cpuBurst: number
@@ -136,37 +144,100 @@ type PendingChange = {
 	verb: string
 }
 
-const props = defineProps<Partial<Server> & { pendingChange?: PendingChange }>()
+const props = defineProps<Partial<Archon.Servers.v0.Server> & { pendingChange?: PendingChange }>()
 
-if (props.server_id && props.status === 'available') {
-	// Necessary only to get server icon
-	await useModrinthServers(props.server_id, ['general'])
-}
+const { archon, kyros, labrinth } = injectModrinthClient()
 
 const showGameLabel = computed(() => !!props.game)
 const showLoaderLabel = computed(() => !!props.loader)
 
-let projectData: Ref<Project | null>
-if (props.upstream) {
-	const { data } = await useAsyncData<Project>(
-		`server-project-${props.server_id}`,
-		async (): Promise<Project> => {
-			const result = await useBaseFetch(`project/${props.upstream?.project_id}`)
-			return result as Project
-		},
-	)
-	projectData = data
-} else {
-	projectData = ref(null)
+const { data: projectData } = useQuery({
+	queryKey: ['project', props.upstream?.project_id] as const,
+	queryFn: async (): Promise<ProjectV2 | null> => {
+		if (!props.upstream?.project_id) return null
+		return await labrinth.projects_v2.get(props.upstream.project_id)
+	},
+	enabled: computed(() => !!props.upstream?.project_id),
+})
+
+const iconUrl = computed(() => projectData.value?.icon_url)
+
+async function processImageBlob(blob: Blob, size: number): Promise<string> {
+	return new Promise((resolve) => {
+		const canvas = document.createElement('canvas')
+		const ctx = canvas.getContext('2d')!
+		const img = new Image()
+		img.onload = () => {
+			canvas.width = size
+			canvas.height = size
+			ctx.drawImage(img, 0, 0, size, size)
+			const dataURL = canvas.toDataURL('image/png')
+			URL.revokeObjectURL(img.src)
+			resolve(dataURL)
+		}
+		img.src = URL.createObjectURL(blob)
+	})
 }
 
-const image = useState<string | undefined>(`server-icon-${props.server_id}`, () => undefined)
-const iconUrl = computed(() => projectData.value?.icon_url || undefined)
+async function dataURLToBlob(dataURL: string): Promise<Blob> {
+	const res = await fetch(dataURL)
+	return res.blob()
+}
+
+const { data: image } = useQuery({
+	queryKey: ['server-icon', props.server_id] as const,
+	queryFn: async (): Promise<string | undefined> => {
+		if (!props.server_id || props.status !== 'available') return undefined
+
+		try {
+			const auth = await archon.servers_v0.getFilesystemAuth(props.server_id)
+
+			try {
+				const blob = await kyros.files_v0.downloadFile(
+					auth.url,
+					auth.token,
+					'/server-icon-original.png',
+				)
+
+				return await processImageBlob(blob, 512)
+			} catch {
+				const projectIcon = iconUrl.value
+				if (projectIcon) {
+					const response = await fetch(projectIcon)
+					const blob = await response.blob()
+
+					const scaledDataUrl = await processImageBlob(blob, 64)
+					const scaledBlob = await dataURLToBlob(scaledDataUrl)
+					const scaledFile = new File([scaledBlob], 'server-icon.png', { type: 'image/png' })
+
+					await kyros.files_v0.uploadFile(auth.url, auth.token, '/server-icon.png', scaledFile)
+
+					const originalFile = new File([blob], 'server-icon-original.png', {
+						type: 'image/png',
+					})
+					await kyros.files_v0.uploadFile(
+						auth.url,
+						auth.token,
+						'/server-icon-original.png',
+						originalFile,
+					)
+
+					return scaledDataUrl
+				}
+			}
+		} catch (error) {
+			console.debug('Icon processing failed:', error)
+			return undefined
+		}
+	},
+	enabled: computed(() => !!props.server_id && props.status === 'available'),
+})
+
 const isConfiguring = computed(() => props.flows?.intro)
 
 const formatDate = (d: unknown) => {
 	try {
-		return dayjs(d as any).format('MMMM D, YYYY')
+		return dayjs(d as string).format('MMMM D, YYYY')
 	} catch {
 		return ''
 	}
diff --git a/packages/ui/src/components/servers/LoaderIcon.vue b/packages/ui/src/components/servers/icons/LoaderIcon.vue
similarity index 100%
rename from packages/ui/src/components/servers/LoaderIcon.vue
rename to packages/ui/src/components/servers/icons/LoaderIcon.vue
diff --git a/apps/frontend/src/components/ui/servers/ServerIcon.vue b/packages/ui/src/components/servers/icons/ServerIcon.vue
similarity index 85%
rename from apps/frontend/src/components/ui/servers/ServerIcon.vue
rename to packages/ui/src/components/servers/icons/ServerIcon.vue
index c0eae785..58d7cb3a 100644
--- a/apps/frontend/src/components/ui/servers/ServerIcon.vue
+++ b/packages/ui/src/components/servers/icons/ServerIcon.vue
@@ -13,13 +13,15 @@
 				v-else
 				class="h-full w-full select-none object-fill"
 				alt="Server Icon"
-				src="~/assets/images/servers/minecraft_server_icon.png"
+				:src="MinecraftServerIcon"
 			/>
 		</client-only>
 	</div>
 </template>
 
 <script setup lang="ts">
+import { MinecraftServerIcon } from '@modrinth/assets'
+
 defineProps<{
 	image: string | undefined
 }>()
diff --git a/apps/frontend/src/components/ui/servers/ServerGameLabel.vue b/packages/ui/src/components/servers/labels/ServerGameLabel.vue
similarity index 89%
rename from apps/frontend/src/components/ui/servers/ServerGameLabel.vue
rename to packages/ui/src/components/servers/labels/ServerGameLabel.vue
index 1ad02268..9c2a3922 100644
--- a/apps/frontend/src/components/ui/servers/ServerGameLabel.vue
+++ b/packages/ui/src/components/servers/labels/ServerGameLabel.vue
@@ -5,7 +5,7 @@
 		class="min-w-0 flex-none flex-row items-center gap-2 first:!flex"
 	>
 		<GameIcon aria-hidden="true" class="size-5 shrink-0" />
-		<NuxtLink
+		<AutoLink
 			v-if="isLink"
 			:to="serverId ? `/servers/manage/${serverId}/options/loader` : ''"
 			class="flex min-w-0 items-center truncate text-sm font-semibold"
@@ -16,7 +16,7 @@
 				<span v-if="mcVersion">{{ mcVersion }}</span>
 				<span v-else class="inline-block h-3 w-12 animate-pulse rounded bg-button-border"></span>
 			</div>
-		</NuxtLink>
+		</AutoLink>
 		<div v-else class="flex min-w-0 flex-row items-center gap-1 truncate text-sm font-semibold">
 			{{ game[0].toUpperCase() + game.slice(1) }}
 			<span v-if="mcVersion">{{ mcVersion }}</span>
@@ -27,6 +27,9 @@
 
 <script setup lang="ts">
 import { GameIcon } from '@modrinth/assets'
+import { useRoute } from 'vue-router'
+
+import AutoLink from '../../base/AutoLink.vue'
 
 defineProps<{
 	game: string
@@ -34,6 +37,6 @@ defineProps<{
 	isLink?: boolean
 }>()
 
-const route = useNativeRoute()
+const route = useRoute()
 const serverId = route.params.id as string
 </script>
diff --git a/apps/frontend/src/components/ui/servers/ServerInfoLabels.vue b/packages/ui/src/components/servers/labels/ServerInfoLabels.vue
similarity index 94%
rename from apps/frontend/src/components/ui/servers/ServerInfoLabels.vue
rename to packages/ui/src/components/servers/labels/ServerInfoLabels.vue
index 7fe01acd..aaf5e001 100644
--- a/apps/frontend/src/components/ui/servers/ServerInfoLabels.vue
+++ b/packages/ui/src/components/servers/labels/ServerInfoLabels.vue
@@ -33,6 +33,7 @@ import ServerSubdomainLabel from './ServerSubdomainLabel.vue'
 import ServerUptimeLabel from './ServerUptimeLabel.vue'
 
 interface ServerInfoLabelsProps {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	serverData: Record<string, any>
 	showGameLabel: boolean
 	showLoaderLabel: boolean
diff --git a/apps/frontend/src/components/ui/servers/ServerLoaderLabel.vue b/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
similarity index 89%
rename from apps/frontend/src/components/ui/servers/ServerLoaderLabel.vue
rename to packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
index c90267e4..aeff6fd0 100644
--- a/apps/frontend/src/components/ui/servers/ServerLoaderLabel.vue
+++ b/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
@@ -4,7 +4,7 @@
 		<div class="flex flex-row items-center gap-2">
 			<LoaderIcon v-if="loader" :loader="loader" class="flex shrink-0 [&&]:size-5" />
 			<div v-else class="size-5 shrink-0 animate-pulse rounded-full bg-button-border"></div>
-			<NuxtLink
+			<AutoLink
 				v-if="isLink"
 				:to="serverId ? `/servers/manage/${serverId}/options/loader` : ''"
 				class="flex min-w-0 items-center text-sm font-semibold"
@@ -18,7 +18,7 @@
 					<span class="inline-block h-4 w-12 animate-pulse rounded bg-button-border"></span>
 					<span class="inline-block h-4 w-12 animate-pulse rounded bg-button-border"></span>
 				</span>
-			</NuxtLink>
+			</AutoLink>
 			<div v-else class="min-w-0 text-sm font-semibold">
 				<span v-if="loader">
 					{{ loader }}
@@ -34,7 +34,11 @@
 </template>
 
 <script setup lang="ts">
-import LoaderIcon from './icons/LoaderIcon.vue'
+import { useRoute } from 'vue-router'
+
+import AutoLink from '../../base/AutoLink.vue'
+import LoaderIcon from '../icons/LoaderIcon.vue'
+
 defineProps<{
 	noSeparator?: boolean
 	loader?: 'Fabric' | 'Quilt' | 'Forge' | 'NeoForge' | 'Paper' | 'Spigot' | 'Bukkit' | 'Vanilla'
@@ -42,6 +46,6 @@ defineProps<{
 	isLink?: boolean
 }>()
 
-const route = useNativeRoute()
+const route = useRoute()
 const serverId = route.params.id as string
 </script>
diff --git a/apps/frontend/src/components/ui/servers/ServerSubdomainLabel.vue b/packages/ui/src/components/servers/labels/ServerSubdomainLabel.vue
similarity index 93%
rename from apps/frontend/src/components/ui/servers/ServerSubdomainLabel.vue
rename to packages/ui/src/components/servers/labels/ServerSubdomainLabel.vue
index 2a0ca5d3..2b528ce8 100644
--- a/apps/frontend/src/components/ui/servers/ServerSubdomainLabel.vue
+++ b/packages/ui/src/components/servers/labels/ServerSubdomainLabel.vue
@@ -22,6 +22,8 @@
 import { LinkIcon } from '@modrinth/assets'
 import { injectNotificationManager } from '@modrinth/ui'
 import { useStorage } from '@vueuse/core'
+import { computed } from 'vue'
+import { useRoute } from 'vue-router'
 
 const { addNotification } = injectNotificationManager()
 
@@ -39,7 +41,7 @@ const copySubdomain = () => {
 	})
 }
 
-const route = useNativeRoute()
+const route = useRoute()
 const serverId = computed(() => route.params.id as string)
 
 const userPreferences = useStorage(`pyro-server-${serverId.value}-preferences`, {
diff --git a/apps/frontend/src/components/ui/servers/ServerUptimeLabel.vue b/packages/ui/src/components/servers/labels/ServerUptimeLabel.vue
similarity index 94%
rename from apps/frontend/src/components/ui/servers/ServerUptimeLabel.vue
rename to packages/ui/src/components/servers/labels/ServerUptimeLabel.vue
index ab735b99..9b067513 100644
--- a/apps/frontend/src/components/ui/servers/ServerUptimeLabel.vue
+++ b/packages/ui/src/components/servers/labels/ServerUptimeLabel.vue
@@ -8,7 +8,7 @@
 		<div v-if="!noSeparator" class="experimental-styles-within h-6 w-0.5 bg-button-border"></div>
 
 		<div class="flex gap-2">
-			<Timer class="flex size-5 shrink-0" />
+			<TimerIcon class="flex size-5 shrink-0" />
 			<time class="truncate text-sm font-semibold" :aria-label="verboseUptime">
 				{{ formattedUptime }}
 			</time>
@@ -17,10 +17,9 @@
 </template>
 
 <script setup lang="ts">
+import { TimerIcon } from '@modrinth/assets'
 import { computed } from 'vue'
 
-import Timer from './icons/Timer.vue'
-
 const props = defineProps<{
 	uptimeSeconds: number
 	noSeparator?: boolean
diff --git a/apps/frontend/src/components/ui/servers/marketing/MedalBackgroundImage.vue b/packages/ui/src/components/servers/marketing/MedalBackgroundImage.vue
similarity index 96%
rename from apps/frontend/src/components/ui/servers/marketing/MedalBackgroundImage.vue
rename to packages/ui/src/components/servers/marketing/MedalBackgroundImage.vue
index 866449a9..4a5e699c 100644
--- a/apps/frontend/src/components/ui/servers/marketing/MedalBackgroundImage.vue
+++ b/packages/ui/src/components/servers/marketing/MedalBackgroundImage.vue
@@ -12,7 +12,6 @@
 	/>
 </template>
 
-<script setup lang="ts"></script>
 <style scoped lang="scss">
 .overlay {
 	position: absolute;
diff --git a/apps/frontend/src/components/ui/servers/marketing/MedalServerListing.vue b/packages/ui/src/components/servers/marketing/MedalServerListing.vue
similarity index 78%
rename from apps/frontend/src/components/ui/servers/marketing/MedalServerListing.vue
rename to packages/ui/src/components/servers/marketing/MedalServerListing.vue
index a11d49e9..297676b6 100644
--- a/apps/frontend/src/components/ui/servers/marketing/MedalServerListing.vue
+++ b/packages/ui/src/components/servers/marketing/MedalServerListing.vue
@@ -80,7 +80,7 @@
 				</div>
 			</AutoLink>
 
-			<div class="z-10 ml-auto">
+			<div v-if="isNuxt" class="z-10 ml-auto">
 				<ButtonStyled color="medal-promo" type="outlined" size="large">
 					<button class="my-auto" @click="handleUpgrade"><RocketIcon /> Upgrade</button>
 				</ButtonStyled>
@@ -91,7 +91,7 @@
 			v-if="status === 'suspended' && suspension_reason === 'upgrading'"
 			class="relative flex w-full flex-row items-center gap-2 rounded-b-2xl border-[1px] border-t-0 border-solid border-bg-blue bg-bg-blue p-4 text-sm font-bold text-contrast"
 		>
-			<PanelSpinner />
+			<LoaderCircleIcon class="size-5 animate-spin" />
 			Your server's hardware is currently being upgraded and will be back online shortly.
 		</div>
 		<div
@@ -99,7 +99,7 @@
 			class="relative flex w-full flex-col gap-2 rounded-b-2xl border-[1px] border-t-0 border-solid border-bg-red bg-bg-red p-4 text-sm font-bold text-contrast"
 		>
 			<div class="flex flex-row gap-2">
-				<PanelErrorIcon class="!size-5" /> Your Medal server trial has ended and your server has
+				<TriangleAlertIcon class="!size-5" /> Your Medal server trial has ended and your server has
 				been suspended. Please upgrade to continue to use your server.
 			</div>
 		</div>
@@ -108,8 +108,9 @@
 			class="relative flex w-full flex-col gap-2 rounded-b-2xl border-[1px] border-t-0 border-solid border-bg-red bg-bg-red p-4 text-sm font-bold text-contrast"
 		>
 			<div class="flex flex-row gap-2">
-				<PanelErrorIcon class="!size-5" /> Your server has been suspended: {{ suspension_reason }}.
-				Please update your billing information or contact Modrinth Support for more information.
+				<TriangleAlertIcon class="!size-5" /> Your server has been suspended:
+				{{ suspension_reason }}. Please update your billing information or contact Modrinth Support
+				for more information.
 			</div>
 			<CopyCode :text="`${props.server_id}`" class="ml-auto" />
 		</div>
@@ -118,7 +119,7 @@
 			class="relative flex w-full flex-col gap-2 rounded-b-2xl border-[1px] border-t-0 border-solid border-bg-red bg-bg-red p-4 text-sm font-bold text-contrast"
 		>
 			<div class="flex flex-row gap-2">
-				<PanelErrorIcon class="!size-5" /> Your server has been suspended. Please update your
+				<TriangleAlertIcon class="!size-5" /> Your server has been suspended. Please update your
 				billing information or contact Modrinth Support for more information.
 			</div>
 			<CopyCode :text="`${props.server_id}`" class="ml-auto" />
@@ -127,39 +128,48 @@
 </template>
 
 <script setup lang="ts">
-import { ChevronRightIcon, LockIcon, RocketIcon, SparklesIcon } from '@modrinth/assets'
-import { AutoLink, Avatar, ButtonStyled, CopyCode } from '@modrinth/ui'
-import type { Project, Server } from '@modrinth/utils'
+import { type Archon, NuxtModrinthClient } from '@modrinth/api-client'
+import {
+	ChevronRightIcon,
+	LoaderCircleIcon,
+	LockIcon,
+	RocketIcon,
+	SparklesIcon,
+	TriangleAlertIcon,
+} from '@modrinth/assets'
+import { useQuery } from '@tanstack/vue-query'
 import dayjs from 'dayjs'
 import dayjsDuration from 'dayjs/plugin/duration'
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 
-import MedalBackgroundImage from '~/components/ui/servers/marketing/MedalBackgroundImage.vue'
-
-import PanelErrorIcon from '../icons/PanelErrorIcon.vue'
-import PanelSpinner from '../PanelSpinner.vue'
-import ServerInfoLabels from '../ServerInfoLabels.vue'
+import { injectModrinthClient } from '../../../providers/api-client'
+import AutoLink from '../../base/AutoLink.vue'
+import Avatar from '../../base/Avatar.vue'
+import ButtonStyled from '../../base/ButtonStyled.vue'
+import CopyCode from '../../base/CopyCode.vue'
+import ServerInfoLabels from '../labels/ServerInfoLabels.vue'
+import MedalBackgroundImage from './MedalBackgroundImage.vue'
 
 dayjs.extend(dayjsDuration)
 
-const props = defineProps<Partial<Server>>()
+const props = defineProps<Partial<Archon.Servers.v0.Server>>()
 const emit = defineEmits<{ (e: 'upgrade'): void }>()
 
+const client = injectModrinthClient()
+
+const isNuxt = computed(() => client instanceof NuxtModrinthClient)
+
 const showGameLabel = computed(() => !!props.game)
 const showLoaderLabel = computed(() => !!props.loader)
 
-let projectData: Ref<Project | null>
-if (props.upstream) {
-	const { data } = await useAsyncData<Project>(
-		`server-project-${props.server_id}`,
-		async (): Promise<Project> => {
-			const result = await useBaseFetch(`project/${props.upstream?.project_id}`)
-			return result as Project
-		},
-	)
-	projectData = data
-} else {
-	projectData = ref(null)
-}
+const { data: projectData } = useQuery({
+	queryKey: ['server-project', props.server_id, props.upstream?.project_id],
+	queryFn: async () => {
+		if (!props.upstream?.project_id) return null
+		return await client.labrinth.projects_v2.get(props.upstream.project_id)
+	},
+	enabled: !!props.upstream?.project_id,
+})
 
 const iconUrl = computed(() => projectData.value?.icon_url || undefined)
 const isConfiguring = computed(() => props.flows?.intro)
diff --git a/packages/ui/src/composables/stripe.ts b/packages/ui/src/composables/stripe.ts
index 44172514..a072fa96 100644
--- a/packages/ui/src/composables/stripe.ts
+++ b/packages/ui/src/composables/stripe.ts
@@ -1,19 +1,11 @@
+import type { Labrinth } from '@modrinth/api-client'
 import { loadStripe, type Stripe as StripeJs, type StripeElements } from '@stripe/stripe-js'
 import type { ContactOption } from '@stripe/stripe-js/dist/stripe-js/elements/address'
 import type Stripe from 'stripe'
 import { computed, type Ref, ref } from 'vue'
 
-import type {
-	BasePaymentIntentResponse,
-	ChargeRequestType,
-	CreatePaymentIntentRequest,
-	CreatePaymentIntentResponse,
-	PaymentRequestType,
-	ServerBillingInterval,
-	ServerPlan,
-	UpdatePaymentIntentRequest,
-	UpdatePaymentIntentResponse,
-} from '../utils/billing.ts'
+import type { ServerBillingInterval } from '../components/billing/ModrinthServersPurchaseModal.vue'
+import { getPriceForInterval } from '../utils/product-utils'
 
 // export type CreateElements = (
 //   paymentMethods: Stripe.PaymentMethod[],
@@ -29,13 +21,17 @@ export const useStripe = (
 	customer: Stripe.Customer,
 	paymentMethods: Stripe.PaymentMethod[],
 	currency: string,
-	product: Ref<ServerPlan | undefined>,
+	product: Ref<Labrinth.Billing.Internal.Product | undefined>,
 	interval: Ref<ServerBillingInterval>,
 	region: Ref<string | undefined>,
 	project: Ref<string | undefined>,
 	initiatePayment: (
-		body: CreatePaymentIntentRequest | UpdatePaymentIntentRequest,
-	) => Promise<CreatePaymentIntentResponse | UpdatePaymentIntentResponse | null>,
+		body: Labrinth.Billing.Internal.InitiatePaymentRequest,
+	) => Promise<
+		| Labrinth.Billing.Internal.InitiatePaymentResponse
+		| Labrinth.Billing.Internal.EditSubscriptionResponse
+		| null
+	>,
 	onError: (err: Error) => void,
 	affiliateCode?: Ref<string | null>,
 ) => {
@@ -62,18 +58,6 @@ export const useStripe = (
 		stripe.value = await loadStripe(publishableKey)
 	}
 
-	function createIntent(
-		body: CreatePaymentIntentRequest,
-	): Promise<CreatePaymentIntentResponse | null> {
-		return initiatePayment(body) as Promise<CreatePaymentIntentResponse | null>
-	}
-
-	function updateIntent(
-		body: UpdatePaymentIntentRequest,
-	): Promise<UpdatePaymentIntentResponse | null> {
-		return initiatePayment(body) as Promise<UpdatePaymentIntentResponse | null>
-	}
-
 	const planPrices = computed(() => {
 		return product.value?.prices.find((x) => x.currency_code === currency)
 	})
@@ -180,9 +164,9 @@ export const useStripe = (
 				} = createElements({
 					mode: 'payment',
 					currency: currency.toLowerCase(),
-					amount: product.value?.prices.find((x) => x.currency_code === currency)?.prices.intervals[
-						interval.value
-					],
+					amount: product.value
+						? getPriceForInterval(product.value, currency, interval.value)
+						: undefined,
 					paymentMethodCreation: 'manual',
 					setupFutureUsage: 'off_session',
 				})
@@ -208,82 +192,61 @@ export const useStripe = (
 				selectedPaymentMethod.value = paymentMethods.find((x) => x.id === id)
 			}
 
-			const requestType: PaymentRequestType = confirmation
-				? {
-						type: 'confirmation_token',
-						token: id,
-					}
-				: {
-						type: 'payment_method',
-						id: id,
-					}
-
 			if (!product.value) {
 				return handlePaymentError('No product selected')
 			}
 
-			const charge: ChargeRequestType = {
-				type: 'new',
-				product_id: product.value?.id,
-				interval: interval.value,
+			const request: Labrinth.Billing.Internal.InitiatePaymentRequest = {
+				type: confirmation ? 'confirmation_token' : 'payment_method',
+				...(confirmation ? { token: id } : { id }),
+				charge: {
+					type: 'new',
+					product_id: product.value.id,
+					interval: interval.value as Labrinth.Billing.Internal.PriceDuration,
+				},
+				...(paymentIntentId.value ? { existing_payment_intent: paymentIntentId.value } : {}),
+				metadata: {
+					type: 'pyro',
+					server_region: region.value,
+					source: project.value
+						? {
+								project_id: project.value,
+							}
+						: {},
+					...(affiliateCode?.value ? { affiliate_code: affiliateCode.value } : {}),
+				},
 			}
 
-			let result: BasePaymentIntentResponse | null = null
-
-			const affiliateMetadata =
-				affiliateCode && affiliateCode.value
-					? {
-							affiliate_code: affiliateCode.value,
-						}
-					: {}
-
-			const metadata: CreatePaymentIntentRequest['metadata'] = {
-				type: 'pyro',
-				server_region: region.value,
-				source: project.value
-					? {
-							project_id: project.value,
-						}
-					: {},
-				...affiliateMetadata,
-			}
-
-			if (paymentIntentId.value) {
-				result = await updateIntent({
-					...requestType,
-					charge,
-					existing_payment_intent: paymentIntentId.value,
-					metadata,
-				})
-				if (result) console.log(`Updated payment intent: ${interval.value} for ${result.total}`)
-			} else {
-				const created = await createIntent({
-					...requestType,
-					charge,
-					metadata: metadata,
-				})
-				if (created) {
-					paymentIntentId.value = created.payment_intent_id
-					clientSecret.value = created.client_secret
-					result = created
-					console.log(`Created payment intent: ${interval.value} for ${created.total}`)
-				}
-			}
+			const result = await initiatePayment(request)
 
 			if (!result) {
 				tax.value = 0
 				total.value = 0
 				noPaymentRequired.value = true
 			} else {
+				if (result.payment_intent_id) {
+					paymentIntentId.value = result.payment_intent_id
+				}
+				if (result.client_secret) {
+					clientSecret.value = result.client_secret
+				}
 				tax.value = result.tax
 				total.value = result.total
 				noPaymentRequired.value = false
+
+				console.log(
+					`${paymentIntentId.value ? 'Updated' : 'Created'} payment intent: ${interval.value} for ${result.total}`,
+				)
 			}
 
 			if (confirmation) {
 				confirmationToken.value = id
-				if (result && result.payment_method) {
-					inputtedPaymentMethod.value = result.payment_method
+				if (result && 'payment_method' in result && result.payment_method) {
+					// payment_method is a string ID from the API, need to find the full object
+					const method = paymentMethods.find((x) => x.id === result.payment_method)
+					if (method) {
+						inputtedPaymentMethod.value = method
+					}
 				}
 			}
 		} catch (err) {
@@ -384,11 +347,12 @@ export const useStripe = (
 		}
 
 		submittingPayment.value = true
+		const productPrice = product.value?.prices.find((x) => x.currency_code === currency)
 		const { error } = await stripe.value.confirmPayment({
 			clientSecret: secert,
 			confirmParams: {
 				confirmation_token: confirmationToken.value,
-				return_url: `${returnUrl}?priceId=${product.value?.prices.find((x) => x.currency_code === currency)?.id}&plan=${interval.value}`,
+				return_url: `${returnUrl}?priceId=${productPrice?.id}&plan=${interval.value}`,
 			},
 		})
 
diff --git a/packages/ui/src/pages/index.ts b/packages/ui/src/pages/index.ts
new file mode 100644
index 00000000..c7c34bf8
--- /dev/null
+++ b/packages/ui/src/pages/index.ts
@@ -0,0 +1 @@
+export { default as ServersManagePageIndex } from './servers/manage/index.vue'
diff --git a/packages/ui/src/pages/servers/manage/index.vue b/packages/ui/src/pages/servers/manage/index.vue
new file mode 100644
index 00000000..41548075
--- /dev/null
+++ b/packages/ui/src/pages/servers/manage/index.vue
@@ -0,0 +1,339 @@
+<template>
+	<div
+		data-pyro-server-list-root
+		class="experimental-styles-within relative mx-auto mb-6 flex min-h-screen w-full max-w-[1280px] flex-col px-6"
+	>
+		<ServersUpgradeModalWrapper
+			v-if="isNuxt"
+			ref="upgradeModal"
+			:stripe-publishable-key
+			:site-url
+			:products
+		/>
+
+		<div
+			v-if="hasError || fetchError"
+			class="mx-auto flex h-full min-h-[calc(100vh-4rem)] flex-col items-center justify-center gap-4 text-left"
+		>
+			<div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
+				<div class="flex flex-col items-center text-center">
+					<div class="flex flex-col items-center gap-4">
+						<div class="grid place-content-center rounded-full bg-bg-blue p-4">
+							<HammerIcon class="size-12 text-blue" />
+						</div>
+						<h1 class="m-0 w-fit text-3xl font-bold">Servers could not be loaded</h1>
+					</div>
+					<p class="text-lg text-secondary">We may have temporary issues with our servers.</p>
+					<ul class="m-0 list-disc space-y-4 p-0 pl-4 text-left text-sm leading-[170%]">
+						<li>
+							Our systems automatically alert our team when there's an issue. We are already working
+							on getting them back online.
+						</li>
+						<li>
+							If you recently purchased your Modrinth Server, it is currently in a queue and will
+							appear here as soon as it's ready. <br />
+							<span class="font-medium text-contrast"
+								>Do not attempt to purchase a new server.</span
+							>
+						</li>
+						<li>
+							If you require personalized support regarding the status of your server, please
+							contact Modrinth Support.
+						</li>
+
+						<li v-if="fetchError" class="text-red">
+							<p>Error details:</p>
+							<CopyCode
+								:text="(fetchError as ModrinthServersFetchError).message || 'Unknown error'"
+								:copyable="false"
+								:selectable="false"
+								:language="'json'"
+							/>
+						</li>
+					</ul>
+				</div>
+				<ButtonStyled size="large" type="standard" color="brand">
+					<AutoLink class="mt-6 !w-full" to="https://support.modrinth.com"
+						>Contact Modrinth Support</AutoLink
+					>
+				</ButtonStyled>
+				<ButtonStyled size="large" @click="() => router.go(0)">
+					<button class="mt-3 !w-full">Reload</button>
+				</ButtonStyled>
+			</div>
+		</div>
+
+		<Transition v-else name="fade" mode="out-in">
+			<div v-if="isLoading && !serverResponse" key="loading" class="flex flex-col gap-4 py-8">
+				<div class="mb-4 text-center">
+					<LoaderCircleIcon class="mx-auto size-8 animate-spin text-contrast" />
+					<p class="m-0 mt-2 text-secondary">Loading your servers...</p>
+				</div>
+				<div
+					v-for="i in 3"
+					:key="i"
+					class="flex animate-pulse flex-row items-center gap-4 overflow-x-hidden rounded-2xl border-[1px] border-solid border-button-bg bg-bg-raised p-4"
+				>
+					<div class="size-16 rounded-xl bg-button-bg"></div>
+					<div class="flex flex-1 flex-col gap-2">
+						<div class="h-6 w-48 rounded bg-button-bg"></div>
+						<div class="h-4 w-64 rounded bg-button-bg opacity-75"></div>
+					</div>
+				</div>
+			</div>
+
+			<div
+				v-else-if="serverList.length === 0 && !isPollingForNewServers"
+				key="empty"
+				class="flex h-full flex-col items-center justify-center gap-8"
+			>
+				<img
+					src="https://cdn.modrinth.com/servers/excitement.webp"
+					alt=""
+					class="max-w-[360px]"
+					style="
+						mask-image: radial-gradient(97% 77% at 50% 25%, #d9d9d9 0, hsla(0, 0%, 45%, 0) 100%);
+					"
+				/>
+				<h1 class="m-0 text-contrast">You don't have any servers yet!</h1>
+				<p class="m-0">Modrinth Servers is a new way to play modded Minecraft with your friends.</p>
+				<ButtonStyled size="large" type="standard" color="brand">
+					<AutoLink to="/servers#plan">Create a Server</AutoLink>
+				</ButtonStyled>
+			</div>
+
+			<div v-else key="list">
+				<div class="relative flex h-fit w-full flex-col items-center justify-between md:flex-row">
+					<h1 class="w-full text-4xl font-bold text-contrast">Servers</h1>
+					<div class="mb-4 flex w-full flex-row items-center justify-end gap-2 md:mb-0 md:gap-4">
+						<div class="iconified-input w-full md:w-72">
+							<label class="sr-only" for="search">Search</label>
+							<SearchIcon />
+							<input
+								id="search"
+								v-model="searchInput"
+								class="input-text-inherit"
+								type="search"
+								name="search"
+								autocomplete="off"
+								placeholder="Search servers..."
+							/>
+						</div>
+						<ButtonStyled v-if="isNuxt" type="standard">
+							<AutoLink :to="{ path: '/servers', hash: '#plan' }">
+								<PlusIcon />
+								New server
+							</AutoLink>
+						</ButtonStyled>
+					</div>
+				</div>
+
+				<Transition
+					enter-active-class="transition-all duration-300 ease-out"
+					enter-from-class="opacity-0 max-h-0"
+					enter-to-class="opacity-100 max-h-20"
+					leave-active-class="transition-all duration-200 ease-in"
+					leave-from-class="opacity-100 max-h-20"
+					leave-to-class="opacity-0 max-h-0"
+				>
+					<div
+						v-if="isPollingForNewServers"
+						class="bg-brand/10 my-4 flex items-center justify-center gap-2 rounded-full px-4 py-2 text-sm text-brand"
+					>
+						<LoaderCircleIcon class="size-4 animate-spin" />
+						<span>Checking for new servers...</span>
+					</div>
+				</Transition>
+
+				<TransitionGroup
+					v-if="filteredData.length > 0 || isPollingForNewServers"
+					name="list"
+					tag="ul"
+					class="m-0 flex flex-col gap-4 p-0"
+				>
+					<MedalServerListing
+						v-for="server in filteredData.filter((s) => s.is_medal)"
+						:key="server.server_id"
+						v-bind="server"
+						@upgrade="openUpgradeModal(server.server_id)"
+					/>
+					<ServerListing
+						v-for="server in filteredData.filter((s) => !s.is_medal)"
+						:key="server.server_id"
+						v-bind="server"
+					/>
+				</TransitionGroup>
+				<div v-else class="flex h-full items-center justify-center">
+					<p class="text-contrast"><LoaderCircleIcon class="size-5 animate-spin" /></p>
+				</div>
+			</div>
+		</Transition>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { type Archon, type Labrinth, NuxtModrinthClient } from '@modrinth/api-client'
+import { HammerIcon, LoaderCircleIcon, PlusIcon, SearchIcon } from '@modrinth/assets'
+import { AutoLink, ButtonStyled, CopyCode, injectModrinthClient } from '@modrinth/ui'
+import type { ModrinthServersFetchError } from '@modrinth/utils'
+import { useQuery } from '@tanstack/vue-query'
+import dayjs from 'dayjs'
+import Fuse from 'fuse.js'
+import type { ComponentPublicInstance } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+import ServersUpgradeModalWrapper from '../../../components/billing/ServersUpgradeModalWrapper.vue'
+import MedalServerListing from '../../../components/servers/marketing/MedalServerListing.vue'
+import ServerListing from '../../../components/servers/ServerListing.vue'
+
+defineProps<{
+	stripePublishableKey?: string
+	siteUrl?: string
+	products?: Labrinth.Billing.Internal.Product[]
+}>()
+
+const router = useRouter()
+const route = useRoute()
+const client = injectModrinthClient()
+
+const isNuxt = computed(() => client instanceof NuxtModrinthClient)
+
+const hasError = ref(false)
+const isPollingForNewServers = ref(false)
+const pollingState = ref({
+	enabled: false,
+	count: 0,
+	initialServers: [] as Archon.Servers.v0.Server[],
+})
+
+const {
+	data: serverResponse,
+	error: fetchError,
+	isLoading,
+} = useQuery({
+	queryKey: ['servers'],
+	queryFn: async () => {
+		const response = await client.archon.servers_v0.list()
+
+		// Fetch subscriptions for medal servers
+		const hasMedalServers = response.servers.some((s) => s.is_medal)
+		if (hasMedalServers) {
+			const subscriptions = await client.labrinth.billing_internal.getSubscriptions()
+
+			// Inject medal_expires into servers
+			for (const server of response.servers) {
+				if (server.is_medal) {
+					const sub = subscriptions.find((s) => s.metadata?.id === server.server_id)
+					if (sub) {
+						server.medal_expires = dayjs(sub.created).add(5, 'days').toISOString()
+					}
+				}
+			}
+		}
+
+		// Check if new servers appeared (stop polling)
+		if (pollingState.value.enabled) {
+			pollingState.value.count++
+			if (response.servers.length !== pollingState.value.initialServers.length) {
+				pollingState.value.enabled = false
+				router.replace({ query: {} })
+			} else if (pollingState.value.count >= 5) {
+				pollingState.value.enabled = false
+			}
+		}
+
+		return response
+	},
+	refetchInterval: () => (pollingState.value.enabled ? 5000 : false),
+})
+
+watch([fetchError, serverResponse], ([error, response]) => {
+	hasError.value = !!error || !response
+})
+
+const serverList = computed<Archon.Servers.v0.Server[]>(() => {
+	if (!serverResponse.value) return []
+	return serverResponse.value.servers
+})
+
+const searchInput = ref('')
+
+const fuse = computed(() => {
+	if (serverList.value.length === 0) return null
+	return new Fuse(serverList.value, {
+		keys: ['name', 'loader', 'mc_version', 'game', 'state'],
+		includeScore: true,
+		threshold: 0.4,
+	})
+})
+
+function introToTop(array: Archon.Servers.v0.Server[]): Archon.Servers.v0.Server[] {
+	return array.slice().sort((a, b) => {
+		return Number(b.flows?.intro) - Number(a.flows?.intro)
+	})
+}
+
+const filteredData = computed<Archon.Servers.v0.Server[]>(() => {
+	if (!searchInput.value.trim()) {
+		return introToTop(serverList.value)
+	}
+	return fuse.value
+		? introToTop(fuse.value.search(searchInput.value).map((result) => result.item))
+		: []
+})
+
+onMounted(() => {
+	if (route.query.redirect_status === 'succeeded') {
+		isPollingForNewServers.value = true
+		pollingState.value = {
+			enabled: true,
+			count: 0,
+			initialServers: [...(serverResponse.value?.servers ?? [])],
+		}
+	}
+})
+
+type ServersUpgradeModalWrapperRef = ComponentPublicInstance<{
+	open: (id: string) => void | Promise<void>
+}>
+
+const upgradeModal = ref<ServersUpgradeModalWrapperRef | null>(null)
+function openUpgradeModal(serverId: string) {
+	upgradeModal.value?.open(serverId)
+}
+</script>
+
+<style scoped>
+.fade-enter-active,
+.fade-leave-active {
+	transition:
+		opacity 300ms ease-in-out,
+		transform 300ms ease-in-out;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+	opacity: 0;
+	transform: scale(0.98);
+}
+
+.list-enter-active,
+.list-leave-active {
+	transition: all 200ms ease-in-out;
+}
+
+.list-enter-from {
+	opacity: 0;
+	transform: translateY(-10px);
+}
+
+.list-leave-to {
+	opacity: 0;
+	transform: translateY(10px);
+}
+
+.list-move {
+	transition: transform 200ms ease-in-out;
+}
+</style>
diff --git a/packages/ui/src/providers/api-client.ts b/packages/ui/src/providers/api-client.ts
new file mode 100644
index 00000000..fcb9068f
--- /dev/null
+++ b/packages/ui/src/providers/api-client.ts
@@ -0,0 +1,8 @@
+import type { AbstractModrinthClient } from '@modrinth/api-client'
+
+import { createContext } from './index'
+
+export const [injectModrinthClient, provideModrinthClient] = createContext<AbstractModrinthClient>(
+	'root',
+	'modrinthClient',
+)
diff --git a/packages/ui/src/providers/index.ts b/packages/ui/src/providers/index.ts
index 646841b9..214a0f05 100644
--- a/packages/ui/src/providers/index.ts
+++ b/packages/ui/src/providers/index.ts
@@ -78,5 +78,6 @@ export function createContext<ContextValue>(
 	return [injectContext, provideContext] as const
 }
 
+export * from './api-client'
 export * from './project-page'
 export * from './web-notifications'
diff --git a/packages/ui/src/providers/project-page.ts b/packages/ui/src/providers/project-page.ts
index 2f7183b5..cc9cbed4 100644
--- a/packages/ui/src/providers/project-page.ts
+++ b/packages/ui/src/providers/project-page.ts
@@ -1,11 +1,13 @@
-import type { Project, ProjectV3Partial, TeamMember } from '@modrinth/utils'
+import type { Labrinth } from '@modrinth/api-client/src/modules/types'
+// TODO: api client this shit
+import type { TeamMember } from '@modrinth/utils'
 import type { Ref } from 'vue'
 
 import { createContext } from '.'
 
 export interface ProjectPageContext {
-	projectV2: Ref<Project>
-	projectV3: Ref<ProjectV3Partial>
+	projectV2: Ref<Labrinth.Projects.v2.Project>
+	projectV3: Ref<Labrinth.Projects.v3.Project>
 	refreshProject: () => Promise<void>
 	currentMember: Ref<TeamMember>
 }
diff --git a/packages/ui/src/utils/product-utils.ts b/packages/ui/src/utils/product-utils.ts
new file mode 100644
index 00000000..21fdfb5d
--- /dev/null
+++ b/packages/ui/src/utils/product-utils.ts
@@ -0,0 +1,54 @@
+import type { Labrinth } from '@modrinth/api-client'
+
+export function getProductDisplayName(product: Labrinth.Billing.Internal.Product): string {
+	const { metadata } = product
+
+	if (metadata.type === 'pyro') {
+		const ramGB = metadata.ram / 1024
+		return `${ramGB}GB Server`
+	}
+
+	if (metadata.type === 'medal') {
+		const ramGB = metadata.ram / 1024
+		return `${ramGB}GB Medal Server (${metadata.region})`
+	}
+
+	return 'Unknown Product'
+}
+
+export function getProductDescription(product: Labrinth.Billing.Internal.Product): string {
+	const { metadata } = product
+
+	if (metadata.type === 'pyro') {
+		return `${metadata.cpu} vCPU, ${metadata.ram}MB RAM, ${metadata.storage}MB Storage`
+	}
+
+	if (metadata.type === 'medal') {
+		return `${metadata.cpu} vCPU, ${metadata.ram}MB RAM, ${metadata.storage}MB Storage`
+	}
+
+	return ''
+}
+
+export function getPriceForInterval(
+	product: Labrinth.Billing.Internal.Product,
+	currency: string,
+	interval: Labrinth.Billing.Internal.PriceDuration,
+): number | undefined {
+	const productPrice = product.prices.find((x) => x.currency_code === currency)
+	if (!productPrice) return undefined
+
+	const { prices } = productPrice
+
+	if (prices.type === 'recurring') {
+		return prices.intervals[interval]
+	}
+
+	return undefined
+}
+
+export const monthsInInterval: Record<'monthly' | 'quarterly' | 'yearly', number> = {
+	monthly: 1,
+	quarterly: 3,
+	yearly: 12,
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1e114697..d73e11cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -47,6 +47,9 @@ importers:
 
   apps/app-frontend:
     dependencies:
+      '@modrinth/api-client':
+        specifier: workspace:^
+        version: link:../../packages/api-client
       '@modrinth/assets':
         specifier: workspace:*
         version: link:../../packages/assets
@@ -62,6 +65,9 @@ importers:
       '@sfirew/minecraft-motd-parser':
         specifier: ^1.1.6
         version: 1.1.6
+      '@tanstack/vue-query':
+        specifier: ^5.90.7
+        version: 5.90.7(vue@3.5.13(typescript@5.5.4))
       '@tauri-apps/api':
         specifier: ^2.5.0
         version: 2.5.0
@@ -239,6 +245,9 @@ importers:
       '@pinia/nuxt':
         specifier: ^0.5.1
         version: 0.5.1(magicast@0.3.5)(rollup@4.28.1)(typescript@5.5.4)(vue@3.5.13(typescript@5.5.4))
+      '@tanstack/vue-query':
+        specifier: ^5.90.7
+        version: 5.90.7(vue@3.5.13(typescript@5.5.4))
       '@types/three':
         specifier: ^0.172.0
         version: 0.172.0
@@ -287,9 +296,6 @@ importers:
       markdown-it:
         specifier: 14.1.0
         version: 14.1.0
-      papaparse:
-        specifier: ^5.4.1
-        version: 5.5.3
       pathe:
         specifier: ^1.1.2
         version: 1.1.2
@@ -342,9 +348,6 @@ importers:
       '@types/node':
         specifier: ^20.1.0
         version: 20.14.11
-      '@types/papaparse':
-        specifier: ^5.3.15
-        version: 5.3.16
       '@vintl/compact-number':
         specifier: ^2.0.5
         version: 2.0.7(@formatjs/intl@2.10.4(typescript@5.5.4))
@@ -544,12 +547,18 @@ importers:
       '@codemirror/view':
         specifier: ^6.22.1
         version: 6.28.4
+      '@modrinth/api-client':
+        specifier: workspace:*
+        version: link:../api-client
       '@modrinth/assets':
         specifier: workspace:*
         version: link:../assets
       '@modrinth/utils':
         specifier: workspace:*
         version: link:../utils
+      '@tanstack/vue-query':
+        specifier: ^5.90.7
+        version: 5.90.7(vue@3.5.13(typescript@5.5.4))
       '@tresjs/cientos':
         specifier: ^4.3.0
         version: 4.3.1(@tresjs/core@4.3.6(three@0.172.0)(typescript@5.5.4)(vue@3.5.13(typescript@5.5.4)))(@types/three@0.172.0)(react@19.1.1)(three@0.172.0)(typescript@5.5.4)(vue@3.5.13(typescript@5.5.4))
@@ -580,6 +589,9 @@ importers:
       floating-vue:
         specifier: ^5.2.2
         version: 5.2.2(@nuxt/kit@3.17.5(magicast@0.3.5))(vue@3.5.13(typescript@5.5.4))
+      fuse.js:
+        specifier: ^6.6.2
+        version: 6.6.2
       highlight.js:
         specifier: ^11.9.0
         version: 11.9.0
@@ -670,7 +682,7 @@ importers:
         version: 11.9.0
       highlightjs-mcfunction:
         specifier: github:modrinth/better-highlightjs-mcfunction
-        version: https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/68a27ae888cfc0e8737f4f2cf1abb67e82078166
+        version: https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/aa999b763fd792ffb950d28347eeb6811c83ea8e
       markdown-it:
         specifier: ^14.1.0
         version: 14.1.0
@@ -2587,6 +2599,22 @@ packages:
     peerDependencies:
       vue: ^3.0.0
 
+  '@tanstack/match-sorter-utils@8.19.4':
+    resolution: {integrity: sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==}
+    engines: {node: '>=12'}
+
+  '@tanstack/query-core@5.90.7':
+    resolution: {integrity: sha512-6PN65csiuTNfBMXqQUxQhCNdtm1rV+9kC9YwWAIKcaxAauq3Wu7p18j3gQY3YIBJU70jT/wzCCZ2uqto/vQgiQ==}
+
+  '@tanstack/vue-query@5.90.7':
+    resolution: {integrity: sha512-2h0esebc2qVRVDge3gFArhss5+qn/Wb4abXuaEliSy+/xPWQMrEX7Ny0UKkCy1HcMZZjvfTtNRUfpYrx+vpipw==}
+    peerDependencies:
+      '@vue/composition-api': ^1.1.2
+      vue: ^2.6.0 || ^3.3.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+
   '@taplo/core@0.2.0':
     resolution: {integrity: sha512-r8bl54Zj1In3QLkiW/ex694bVzpPJ9EhwqT9xkcUVODnVUGirdB1JTsmiIv0o1uwqZiwhi8xNnTOQBRQCpizrQ==}
 
@@ -2806,9 +2834,6 @@ packages:
   '@types/offscreencanvas@2019.7.3':
     resolution: {integrity: sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==}
 
-  '@types/papaparse@5.3.16':
-    resolution: {integrity: sha512-T3VuKMC2H0lgsjI9buTB3uuKj3EMD2eap1MOuEQuBQ44EnDx/IkGhU6EwiTf9zG3za4SKlmwKAImdDKdNnCsXg==}
-
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
@@ -5041,8 +5066,8 @@ packages:
     resolution: {integrity: sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==}
     engines: {node: '>=12.0.0'}
 
-  highlightjs-mcfunction@https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/68a27ae888cfc0e8737f4f2cf1abb67e82078166:
-    resolution: {tarball: https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/68a27ae888cfc0e8737f4f2cf1abb67e82078166}
+  highlightjs-mcfunction@https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/aa999b763fd792ffb950d28347eeb6811c83ea8e:
+    resolution: {tarball: https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/aa999b763fd792ffb950d28347eeb6811c83ea8e}
     version: 1.0.0
 
   hookable@5.5.3:
@@ -6184,9 +6209,6 @@ packages:
   pako@1.0.11:
     resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
 
-  papaparse@5.5.3:
-    resolution: {integrity: sha512-5QvjGxYVjxO59MGU2lHVYpRWBBtKHnlIAcSe1uNFCkkptUh63NFRj0FJQm7nR67puEruUci/ZkjmEFrjCAyP4A==}
-
   param-case@3.0.4:
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
 
@@ -6887,6 +6909,9 @@ packages:
   remark-stringify@11.0.0:
     resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==}
 
+  remove-accents@0.5.0:
+    resolution: {integrity: sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==}
+
   request-light@0.5.8:
     resolution: {integrity: sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==}
 
@@ -10522,6 +10547,20 @@ snapshots:
     dependencies:
       vue: 3.5.13(typescript@5.5.4)
 
+  '@tanstack/match-sorter-utils@8.19.4':
+    dependencies:
+      remove-accents: 0.5.0
+
+  '@tanstack/query-core@5.90.7': {}
+
+  '@tanstack/vue-query@5.90.7(vue@3.5.13(typescript@5.5.4))':
+    dependencies:
+      '@tanstack/match-sorter-utils': 8.19.4
+      '@tanstack/query-core': 5.90.7
+      '@vue/devtools-api': 6.6.4
+      vue: 3.5.13(typescript@5.5.4)
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.5.4))
+
   '@taplo/core@0.2.0': {}
 
   '@taplo/lib@0.5.0':
@@ -10740,10 +10779,6 @@ snapshots:
 
   '@types/offscreencanvas@2019.7.3': {}
 
-  '@types/papaparse@5.3.16':
-    dependencies:
-      '@types/node': 20.14.11
-
   '@types/resolve@1.20.2': {}
 
   '@types/rss@0.0.32': {}
@@ -13731,7 +13766,7 @@ snapshots:
 
   highlight.js@11.9.0: {}
 
-  highlightjs-mcfunction@https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/68a27ae888cfc0e8737f4f2cf1abb67e82078166: {}
+  highlightjs-mcfunction@https://codeload.github.com/modrinth/better-highlightjs-mcfunction/tar.gz/aa999b763fd792ffb950d28347eeb6811c83ea8e: {}
 
   hookable@5.5.3: {}
 
@@ -15299,8 +15334,6 @@ snapshots:
 
   pako@1.0.11: {}
 
-  papaparse@5.5.3: {}
-
   param-case@3.0.4:
     dependencies:
       dot-case: 3.0.4
@@ -16033,6 +16066,8 @@ snapshots:
       mdast-util-to-markdown: 2.1.0
       unified: 11.0.5
 
+  remove-accents@0.5.0: {}
+
   request-light@0.5.8: {}
 
   request-light@0.7.0: {}

From 763a38812f1bf6e050f9713bff1f85bf394cae17 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 14 Nov 2025 11:58:48 -0800
Subject: [PATCH 57/64] changelog

---
 packages/utils/changelog.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 6e948c05..15551a15 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,22 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2025-11-14T12:15:00-07:00`,
+		product: 'servers',
+		body: `## Improvements
+- Improved the performance of the servers list.
+- Fixed startup commands not being updated properly.
+- Fixed autocomplete on pardon-ip and ban-ip commands.`,
+	},
+	{
+		date: `2025-11-14T12:15:00-07:00`,
+		product: 'web',
+		body: `## Improvements
+- Improved contrast, visibility, and consistency of UI elements, especially in light mode.
+- Fixed the chargest page not working properly.
+- Fixed certain icons showing above the mobile navbar.`,
+	},
 	{
 		date: `2025-11-11T12:50:00-07:00`,
 		product: 'app',

From 20484ed7aa87fcaa66be492e4c63802f4e259eaa Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 14 Nov 2025 12:10:58 -0800
Subject: [PATCH 58/64] fix timezone

---
 packages/utils/changelog.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 15551a15..44e0b5e4 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -11,7 +11,7 @@ export type VersionEntry = {
 
 const VERSIONS: VersionEntry[] = [
 	{
-		date: `2025-11-14T12:15:00-07:00`,
+		date: `2025-11-14T12:15:00-08:00`,
 		product: 'servers',
 		body: `## Improvements
 - Improved the performance of the servers list.
@@ -19,7 +19,7 @@ const VERSIONS: VersionEntry[] = [
 - Fixed autocomplete on pardon-ip and ban-ip commands.`,
 	},
 	{
-		date: `2025-11-14T12:15:00-07:00`,
+		date: `2025-11-14T12:15:00-08:00`,
 		product: 'web',
 		body: `## Improvements
 - Improved contrast, visibility, and consistency of UI elements, especially in light mode.
@@ -27,32 +27,32 @@ const VERSIONS: VersionEntry[] = [
 - Fixed certain icons showing above the mobile navbar.`,
 	},
 	{
-		date: `2025-11-11T12:50:00-07:00`,
+		date: `2025-11-11T12:50:00-08:00`,
 		product: 'app',
 		version: '0.10.19',
 		body: `## Improvements
 - Fixed automatic dependency resolution ignoring the selected mod loader.`,
 	},
 	{
-		date: `2025-11-10T11:20:00-07:00`,
+		date: `2025-11-10T11:20:00-08:00`,
 		product: 'app',
 		version: '0.10.18',
 		body: `No changes.`,
 	},
 	{
-		date: `2025-11-07T21:10:00-07:00`,
+		date: `2025-11-07T21:10:00-08:00`,
 		product: 'web',
 		body: `## Improvements
 - Enhanced syntax highlighting support for skript, mcfunction, and kubejs code blocks in Markdown descriptions.`,
 	},
 	{
-		date: `2025-11-07T15:45:00-07:00`,
+		date: `2025-11-07T15:45:00-08:00`,
 		product: 'web',
 		body: `## Improvements
 - Fixed download button pop-up on Resource Pack projects.`,
 	},
 	{
-		date: `2025-11-07T09:30:00-07:00`,
+		date: `2025-11-07T09:30:00-08:00`,
 		product: 'app',
 		version: '0.10.17',
 		body: `## Improvements
@@ -63,31 +63,31 @@ const VERSIONS: VersionEntry[] = [
 - Fixed glitchy text selection in Logs page.`,
 	},
 	{
-		date: `2025-11-07T09:30:00-07:00`,
+		date: `2025-11-07T09:30:00-08:00`,
 		product: 'web',
 		body: `## Improvements
 - Fixed 'Advanced rendering' toggle not working properly on many popups.`,
 	},
 	{
-		date: `2025-11-07T08:05:00-07:00`,
+		date: `2025-11-07T08:05:00-08:00`,
 		product: 'web',
 		body: `## Improvements
 - Fixed some further issues with the new withdrawal experience.`,
 	},
 	{
-		date: `2025-11-04T18:20:00-07:00`,
+		date: `2025-11-04T18:20:00-08:00`,
 		product: 'web',
 		body: `## Improvements
 - Fixed an issue with PayPal International fees.`,
 	},
 	{
-		date: `2025-11-04T16:20:00-07:00`,
+		date: `2025-11-04T16:20:00-08:00`,
 		product: 'web',
 		body: `## Improvements
 - Some bugfixes to the new withdrawal experience.`,
 	},
 	{
-		date: `2025-11-03T15:30:00-07:00`,
+		date: `2025-11-03T15:30:00-08:00`,
 		product: 'web',
 		body: `## Improvements
 - Revamped creator revenue page and withdrawal experience.`,

From 089cca60ce17faced5e1a5ff9ea39092bc3b2f2b Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Sun, 16 Nov 2025 21:49:48 +0000
Subject: [PATCH 59/64] Fix PayPal SSO OAuth callback (#4758)

* Maybe fix PayPal SSO

* cargo sqlx prepare

* maybe works

* Attempt 2 of fixing

* Fix vue

* Try adding more logging to flow
---
 .../LegacyPaypalDetailsStage.vue              |   3 +-
 ...2c47b7a0d23ca747c753a5710b3eb3cf7c621.json |  17 --
 ...13edaed963e65d9e8fb9c58c116bba24fe2ac.json |  17 ++
 apps/labrinth/src/auth/mod.rs                 |   6 +
 .../labrinth/src/database/models/flow_item.rs |   1 +
 apps/labrinth/src/routes/internal/flows.rs    | 281 ++++++++++++------
 6 files changed, 219 insertions(+), 106 deletions(-)
 delete mode 100644 apps/labrinth/.sqlx/query-0d23c47e3f6803078016c4ae5d52c47b7a0d23ca747c753a5710b3eb3cf7c621.json
 create mode 100644 apps/labrinth/.sqlx/query-77d39c54d5ca1622b53f029cb4c13edaed963e65d9e8fb9c58c116bba24fe2ac.json

diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue
index 5f4d3838..ccc451b9 100644
--- a/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue
@@ -140,9 +140,10 @@ const paypalEmail = computed(() => {
 
 const paypalAuthUrl = computed(() => {
 	const route = useRoute()
+	const authToken = useCookie('auth-token')
 	const separator = route.fullPath.includes('?') ? '&' : '?'
 	const returnUrl = `${route.fullPath}${separator}paypal_auth_return=true`
-	return getAuthUrl('paypal', returnUrl)
+	return `${getAuthUrl('paypal', returnUrl)}&auth_token=${authToken.value}`
 })
 
 function handlePayPalAuth() {
diff --git a/apps/labrinth/.sqlx/query-0d23c47e3f6803078016c4ae5d52c47b7a0d23ca747c753a5710b3eb3cf7c621.json b/apps/labrinth/.sqlx/query-0d23c47e3f6803078016c4ae5d52c47b7a0d23ca747c753a5710b3eb3cf7c621.json
deleted file mode 100644
index 1b911274..00000000
--- a/apps/labrinth/.sqlx/query-0d23c47e3f6803078016c4ae5d52c47b7a0d23ca747c753a5710b3eb3cf7c621.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        UPDATE users\n                        SET paypal_country = $1, paypal_email = $2, paypal_id = $3\n                        WHERE (id = $4)\n                        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Text",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "0d23c47e3f6803078016c4ae5d52c47b7a0d23ca747c753a5710b3eb3cf7c621"
-}
diff --git a/apps/labrinth/.sqlx/query-77d39c54d5ca1622b53f029cb4c13edaed963e65d9e8fb9c58c116bba24fe2ac.json b/apps/labrinth/.sqlx/query-77d39c54d5ca1622b53f029cb4c13edaed963e65d9e8fb9c58c116bba24fe2ac.json
new file mode 100644
index 00000000..acc7285b
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-77d39c54d5ca1622b53f029cb4c13edaed963e65d9e8fb9c58c116bba24fe2ac.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                UPDATE users\n                SET paypal_country = $1, paypal_email = $2, paypal_id = $3\n                WHERE id = $4\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "77d39c54d5ca1622b53f029cb4c13edaed963e65d9e8fb9c58c116bba24fe2ac"
+}
diff --git a/apps/labrinth/src/auth/mod.rs b/apps/labrinth/src/auth/mod.rs
index 2dc9311d..953d978c 100644
--- a/apps/labrinth/src/auth/mod.rs
+++ b/apps/labrinth/src/auth/mod.rs
@@ -18,6 +18,8 @@ use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum AuthenticationError {
+    #[error(transparent)]
+    Internal(#[from] eyre::Report),
     #[error("Environment Error")]
     Env(#[from] dotenvy::Error),
     #[error("An unknown database error occurred: {0}")]
@@ -53,6 +55,9 @@ pub enum AuthenticationError {
 impl actix_web::ResponseError for AuthenticationError {
     fn status_code(&self) -> StatusCode {
         match self {
+            AuthenticationError::Internal(..) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            }
             AuthenticationError::Env(..) => StatusCode::INTERNAL_SERVER_ERROR,
             AuthenticationError::Sqlx(..) => StatusCode::INTERNAL_SERVER_ERROR,
             AuthenticationError::Database(..) => {
@@ -87,6 +92,7 @@ impl actix_web::ResponseError for AuthenticationError {
 impl AuthenticationError {
     pub fn error_name(&self) -> &'static str {
         match self {
+            AuthenticationError::Internal(..) => "internal_error",
             AuthenticationError::Env(..) => "environment_error",
             AuthenticationError::Sqlx(..) => "database_error",
             AuthenticationError::Database(..) => "database_error",
diff --git a/apps/labrinth/src/database/models/flow_item.rs b/apps/labrinth/src/database/models/flow_item.rs
index 192823d8..b7b853d9 100644
--- a/apps/labrinth/src/database/models/flow_item.rs
+++ b/apps/labrinth/src/database/models/flow_item.rs
@@ -20,6 +20,7 @@ pub enum DBFlow {
         user_id: Option<DBUserId>,
         url: String,
         provider: AuthProvider,
+        existing_user_id: Option<DBUserId>,
     },
     Login2FA {
         user_id: DBUserId,
diff --git a/apps/labrinth/src/routes/internal/flows.rs b/apps/labrinth/src/routes/internal/flows.rs
index 246f0534..bc02b05f 100644
--- a/apps/labrinth/src/routes/internal/flows.rs
+++ b/apps/labrinth/src/routes/internal/flows.rs
@@ -2,9 +2,9 @@ use crate::auth::validate::{
     get_full_user_from_headers, get_user_record_from_bearer_token,
 };
 use crate::auth::{AuthProvider, AuthenticationError, get_user_from_headers};
-use crate::database::models::DBUser;
 use crate::database::models::flow_item::DBFlow;
 use crate::database::models::notification_item::NotificationBuilder;
+use crate::database::models::{DBUser, DBUserId};
 use crate::database::redis::RedisPool;
 use crate::file_hosting::{FileHost, FileHostPublicity};
 use crate::models::notifications::NotificationBody;
@@ -16,6 +16,7 @@ use crate::routes::ApiError;
 use crate::routes::internal::session::issue_session;
 use crate::util::captcha::check_hcaptcha;
 use crate::util::env::parse_strings_from_var;
+use crate::util::error::Context;
 use crate::util::ext::get_image_ext;
 use crate::util::img::upload_image_optimized;
 use crate::util::validate::validation_errors_to_string;
@@ -27,6 +28,7 @@ use ariadne::ids::base62_impl::{parse_base62, to_base62};
 use ariadne::ids::random_base62_rng;
 use base64::Engine;
 use chrono::{Duration, Utc};
+use eyre::eyre;
 use lettre::message::Mailbox;
 use rand_chacha::ChaCha20Rng;
 use rand_chacha::rand_core::SeedableRng;
@@ -36,6 +38,7 @@ use sqlx::postgres::PgPool;
 use std::collections::HashMap;
 use std::str::FromStr;
 use std::sync::Arc;
+use tracing::info;
 use validator::Validate;
 use zxcvbn::Score;
 
@@ -1046,6 +1049,9 @@ pub struct AuthorizationInit {
     #[serde(default)]
     pub provider: AuthProvider,
     pub token: Option<String>,
+    /// If the user is already logged in, and is linking a PayPal account,
+    /// this will be set to the user's auth token from the frontend.
+    pub auth_token: Option<String>,
 }
 #[derive(Serialize, Deserialize)]
 pub struct Authorization {
@@ -1063,6 +1069,33 @@ pub async fn init(
     redis: Data<RedisPool>,
     session_queue: Data<AuthQueue>,
 ) -> Result<HttpResponse, AuthenticationError> {
+    // If a user is logging into an OAuth method while already logged in,
+    // this may be present.
+    //
+    // This can happen when linking to a PayPal account (logging in) when already
+    // logged in.
+    let existing_user_id = if let Some(auth_token) = &info.auth_token {
+        get_user_record_from_bearer_token(
+            &req,
+            Some(auth_token),
+            &**client,
+            &redis,
+            &session_queue,
+        )
+        .await
+        .ok()
+        .flatten()
+        .map(|(_scopes, user)| user.id)
+    } else {
+        None
+    };
+
+    info!(
+        ?existing_user_id,
+        auth_token_present = %info.auth_token.is_some(),
+        "Starting authentication flow"
+    );
+
     let url =
         url::Url::parse(&info.url).map_err(|_| AuthenticationError::Url)?;
 
@@ -1095,6 +1128,7 @@ pub async fn init(
         user_id,
         url: info.url,
         provider: info.provider,
+        existing_user_id,
     }
     .insert(Duration::minutes(30), &redis)
     .await?;
@@ -1120,111 +1154,182 @@ pub async fn auth_callback(
 
     let state = state_string.clone();
     let res: Result<HttpResponse, AuthenticationError> = async move {
-        let flow = DBFlow::get(&state, &redis).await?;
+        let flow = DBFlow::get(&state, &redis)
+            .await
+            .wrap_err("failed to fetch flow state")?
+            .wrap_err("no flow for state")?;
 
         // Extract cookie header from request
-        if let Some(DBFlow::OAuth {
-                        user_id,
-                        provider,
-                        url,
-                    }) = flow
-        {
-            DBFlow::remove(&state, &redis).await?;
+        let DBFlow::OAuth {
+            user_id,
+            provider,
+            url,
+            existing_user_id,
+        } = flow
+        else {
+            return Err(AuthenticationError::Internal(eyre!(
+                "invalid flow kind"
+            )));
+        };
 
-            let token = provider.get_token(query).await?;
-            let oauth_user = provider.get_user(&token).await?;
+        DBFlow::remove(&state, &redis)
+            .await
+            .wrap_err("failed to remove flow")?;
 
-            let user_id_opt = provider.get_user_id(&oauth_user.id, &**client).await?;
+        let token = provider
+            .get_token(query)
+            .await
+            .wrap_err("failed to get token from provider")?;
+        let oauth_user = provider
+            .get_user(&token)
+            .await
+            .wrap_err("failed to get user from provider")?;
 
-            let mut transaction = client.begin().await?;
-            if let Some(id) = user_id {
-                if user_id_opt.is_some() {
-                    return Err(AuthenticationError::DuplicateUser);
-                }
+        let user_id_opt = provider
+            .get_user_id(&oauth_user.id, &**client)
+            .await
+            .wrap_err("failed to get user ID from provider")?;
 
-                provider
-                    .update_user_id(id, Some(&oauth_user.id), &mut transaction)
+        let mut transaction = client
+            .begin()
+            .await
+            .wrap_err("failed to begin transaction")?;
+
+        // PayPal isn't actually an SSO method; we allow users to link their PayPal
+        // account to their Modrinth account via this OAuth flow. However, we MUST
+        // NOT actually create an account with their username.
+        //
+        // Instead, we check who they're already logged in as, and just update
+        // the PayPal info for that account.
+        if provider == AuthProvider::PayPal {
+            let existing_user_id = existing_user_id.wrap_err(
+                "attempting to link a PayPal account without being logged in",
+            )?;
+
+            sqlx::query!(
+                "
+                UPDATE users
+                SET paypal_country = $1, paypal_email = $2, paypal_id = $3
+                WHERE id = $4
+                ",
+                oauth_user.country,
+                oauth_user.email,
+                oauth_user.id,
+                existing_user_id as DBUserId,
+            )
+            .execute(&mut *transaction)
+            .await
+            .wrap_err("failed to update user PayPal info")?;
+
+            transaction
+                .commit()
+                .await
+                .wrap_err("failed to commit transaction")?;
+            crate::database::models::DBUser::clear_caches(
+                &[(existing_user_id, None)],
+                &redis,
+            )
+            .await
+            .wrap_err("failed to clear user caches")?;
+
+            return Ok(HttpResponse::TemporaryRedirect()
+                .append_header(("Location", &*url))
+                .json(serde_json::json!({ "url": url })));
+        }
+
+        if let Some(id) = user_id {
+            if user_id_opt.is_some() {
+                return Err(AuthenticationError::DuplicateUser);
+            }
+
+            provider
+                .update_user_id(id, Some(&oauth_user.id), &mut transaction)
+                .await?;
+
+            let user =
+                crate::database::models::DBUser::get_id(id, &**client, &redis)
                     .await?;
 
-                let user = crate::database::models::DBUser::get_id(id, &**client, &redis).await?;
+            if let Some(user) = user {
+                NotificationBuilder {
+                    body: NotificationBody::AuthProviderAdded {
+                        provider: provider.as_str().to_string(),
+                    },
+                }
+                .insert(user.id, &mut transaction, &redis)
+                .await?;
+            }
 
-                if provider == AuthProvider::PayPal  {
-                    sqlx::query!(
-                        "
-                        UPDATE users
-                        SET paypal_country = $1, paypal_email = $2, paypal_id = $3
-                        WHERE (id = $4)
-                        ",
-                        oauth_user.country,
-                        oauth_user.email,
-                        oauth_user.id,
-                        id as crate::database::models::ids::DBUserId,
-                    )
-                        .execute(&mut *transaction)
-                        .await?;
-                } else if let Some(user) = user {
-                    NotificationBuilder { body: NotificationBody::AuthProviderAdded { provider: provider.as_str().to_string() } }
-                        .insert(user.id, &mut transaction, &redis)
+            transaction.commit().await?;
+            crate::database::models::DBUser::clear_caches(
+                &[(id, None)],
+                &redis,
+            )
+            .await?;
+
+            Ok(HttpResponse::TemporaryRedirect()
+                .append_header(("Location", &*url))
+                .json(serde_json::json!({ "url": url })))
+        } else {
+            let user_id = if let Some(user_id) = user_id_opt {
+                let user = crate::database::models::DBUser::get_id(
+                    user_id, &**client, &redis,
+                )
+                .await?
+                .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+
+                if user.totp_secret.is_some() {
+                    let flow = DBFlow::Login2FA { user_id: user.id }
+                        .insert(Duration::minutes(30), &redis)
                         .await?;
+
+                    let redirect_url = format!(
+                        "{}{}error=2fa_required&flow={}",
+                        url,
+                        if url.contains('?') { "&" } else { "?" },
+                        flow
+                    );
+
+                    return Ok(HttpResponse::TemporaryRedirect()
+                        .append_header(("Location", &*redirect_url))
+                        .json(serde_json::json!({ "url": redirect_url })));
                 }
 
-                transaction.commit().await?;
-                crate::database::models::DBUser::clear_caches(&[(id, None)], &redis).await?;
-
-                Ok(HttpResponse::TemporaryRedirect()
-                    .append_header(("Location", &*url))
-                    .json(serde_json::json!({ "url": url })))
+                user_id
             } else {
-                let user_id = if let Some(user_id) = user_id_opt {
-                    let user = crate::database::models::DBUser::get_id(user_id, &**client, &redis)
-                        .await?
-                        .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+                oauth_user
+                    .create_account(
+                        provider,
+                        &mut transaction,
+                        &client,
+                        &file_host,
+                        &redis,
+                    )
+                    .await?
+            };
 
-                    if user.totp_secret.is_some() {
-                        let flow = DBFlow::Login2FA { user_id: user.id }
-                            .insert(Duration::minutes(30), &redis)
-                            .await?;
+            let session =
+                issue_session(req, user_id, &mut transaction, &redis).await?;
+            transaction.commit().await?;
 
-                        let redirect_url = format!(
-                            "{}{}error=2fa_required&flow={}",
-                            url,
-                            if url.contains('?') { "&" } else { "?" },
-                            flow
-                        );
-
-                        return Ok(HttpResponse::TemporaryRedirect()
-                            .append_header(("Location", &*redirect_url))
-                            .json(serde_json::json!({ "url": redirect_url })));
-                    }
-
-                    user_id
+            let redirect_url = format!(
+                "{}{}code={}{}",
+                url,
+                if url.contains('?') { '&' } else { '?' },
+                session.session,
+                if user_id_opt.is_none() {
+                    "&new_account=true"
                 } else {
-                    oauth_user.create_account(provider, &mut transaction, &client, &file_host, &redis).await?
-                };
+                    ""
+                }
+            );
 
-                let session = issue_session(req, user_id, &mut transaction, &redis).await?;
-                transaction.commit().await?;
-
-                let redirect_url = format!(
-                    "{}{}code={}{}",
-                    url,
-                    if url.contains('?') { '&' } else { '?' },
-                    session.session,
-                    if user_id_opt.is_none() {
-                        "&new_account=true"
-                    } else {
-                        ""
-                    }
-                );
-
-                Ok(HttpResponse::TemporaryRedirect()
-                    .append_header(("Location", &*redirect_url))
-                    .json(serde_json::json!({ "url": redirect_url })))
-            }
-        } else {
-            Err::<HttpResponse, AuthenticationError>(AuthenticationError::InvalidCredentials)
+            Ok(HttpResponse::TemporaryRedirect()
+                .append_header(("Location", &*redirect_url))
+                .json(serde_json::json!({ "url": redirect_url })))
         }
-    }.await;
+    }
+    .await;
 
     Ok(res?)
 }

From 134a621d0d8c6aea4315e41e6156b7b98d3cbc14 Mon Sep 17 00:00:00 2001
From: "Calum H." <contact@cal.engineer>
Date: Sun, 16 Nov 2025 22:36:11 +0000
Subject: [PATCH 60/64] fix: use ref rather than direct val (#4785)

---
 apps/frontend/src/app.vue        | 2 +-
 apps/frontend/src/helpers/api.ts | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/frontend/src/app.vue b/apps/frontend/src/app.vue
index d37d0e71..5af1c1be 100644
--- a/apps/frontend/src/app.vue
+++ b/apps/frontend/src/app.vue
@@ -17,7 +17,7 @@ const config = useRuntimeConfig()
 
 provideNotificationManager(new FrontendNotificationManager())
 
-const client = createModrinthClient(auth.value, {
+const client = createModrinthClient(auth, {
 	apiBaseUrl: config.public.apiBaseUrl.replace('/v2/', '/'),
 	archonBaseUrl: config.public.pyroBaseUrl.replace('/v2/', '/'),
 	rateLimitKey: config.rateLimitKey,
diff --git a/apps/frontend/src/helpers/api.ts b/apps/frontend/src/helpers/api.ts
index 4cee73fa..02e8ee39 100644
--- a/apps/frontend/src/helpers/api.ts
+++ b/apps/frontend/src/helpers/api.ts
@@ -8,9 +8,10 @@ import {
 	NuxtModrinthClient,
 	VerboseLoggingFeature,
 } from '@modrinth/api-client'
+import type { Ref } from 'vue'
 
 export function createModrinthClient(
-	auth: { token: string | undefined },
+	auth: Ref<{ token: string | undefined }>,
 	config: { apiBaseUrl: string; archonBaseUrl: string; rateLimitKey?: string },
 ): NuxtModrinthClient {
 	const optionalFeatures = [
@@ -23,7 +24,7 @@ export function createModrinthClient(
 		rateLimitKey: config.rateLimitKey,
 		features: [
 			new AuthFeature({
-				token: async () => auth.token,
+				token: async () => auth.value.token,
 			} as AuthConfig),
 			new CircuitBreakerFeature({
 				storage: new NuxtCircuitBreakerStorage(),

From 4becb2a82248ac5c34a910557ee36c055226e7d8 Mon Sep 17 00:00:00 2001
From: Modrinth Bot <106493074+modrinth-bot@users.noreply.github.com>
Date: Sun, 16 Nov 2025 23:45:40 -0800
Subject: [PATCH 61/64] New translations from Crowdin (main) (#4787)

---
 .../src/locales/ceb-PH/index.json             |  12 +
 .../app-frontend/src/locales/da-DK/index.json |  96 +++
 .../app-frontend/src/locales/de-DE/index.json |  70 +-
 .../src/locales/fil-PH/index.json             |  12 +
 .../app-frontend/src/locales/ja-JP/index.json |   6 +-
 .../app-frontend/src/locales/th-TH/index.json |   3 +
 .../app-frontend/src/locales/tl-PH/index.json |  24 +-
 apps/frontend/src/locales/ar-SA/index.json    |   3 +
 apps/frontend/src/locales/da-DK/index.json    |  24 +
 apps/frontend/src/locales/de-CH/index.json    |   8 +-
 apps/frontend/src/locales/de-DE/index.json    | 400 ++++++------
 .../frontend/src/locales/de-DE/languages.json |   6 +-
 apps/frontend/src/locales/el-GR/index.json    |  36 ++
 .../frontend/src/locales/el-GR/languages.json |   2 +
 apps/frontend/src/locales/es-ES/index.json    |   3 +
 apps/frontend/src/locales/hu-HU/index.json    |  60 ++
 apps/frontend/src/locales/id-ID/index.json    |  57 ++
 apps/frontend/src/locales/ja-JP/index.json    |  83 ++-
 apps/frontend/src/locales/pl-PL/index.json    |  26 +-
 apps/frontend/src/locales/pt-BR/index.json    | 609 ++++++++++++++++++
 apps/frontend/src/locales/pt-PT/index.json    |  96 +++
 apps/frontend/src/locales/zh-CN/index.json    |  77 ++-
 apps/frontend/src/locales/zh-TW/index.json    |   3 +
 .../moderation/src/locales/de-DE/index.json   |  80 +--
 .../moderation/src/locales/ja-JP/index.json   |   3 +
 .../moderation/src/locales/nl-NL/index.json   |   3 +
 .../moderation/src/locales/pt-BR/index.json   |  33 +
 packages/ui/src/locales/da-DK/index.json      | 204 ++++++
 packages/ui/src/locales/de-CH/index.json      |   4 +-
 packages/ui/src/locales/de-DE/index.json      |  92 +--
 packages/ui/src/locales/hu-HU/index.json      |  51 ++
 packages/ui/src/locales/ja-JP/index.json      | 140 +++-
 packages/ui/src/locales/pl-PL/index.json      |  14 +-
 packages/ui/src/locales/pt-BR/index.json      | 125 +++-
 packages/ui/src/locales/tl-PH/index.json      |  16 +-
 35 files changed, 2110 insertions(+), 371 deletions(-)

diff --git a/apps/app-frontend/src/locales/ceb-PH/index.json b/apps/app-frontend/src/locales/ceb-PH/index.json
index 60809bc0..1e7ea72d 100644
--- a/apps/app-frontend/src/locales/ceb-PH/index.json
+++ b/apps/app-frontend/src/locales/ceb-PH/index.json
@@ -125,6 +125,9 @@
   "friends.section.heading": {
     "message": "{title} - {count}"
   },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Pag-sign-in sa Modrinth account</link> aron makadugang og mga higala ug mahibal-an ang ginadula nila!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Idugang ug dulaa"
   },
@@ -308,6 +311,9 @@
   "instance.settings.tabs.installation.install": {
     "message": "Itaud"
   },
+  "instance.settings.tabs.installation.install.in-progress": {
+    "message": "Nagtaud karon"
+  },
   "instance.settings.tabs.installation.loader-version": {
     "message": "Bersiyon sa {loader}"
   },
@@ -323,6 +329,9 @@
   "instance.settings.tabs.installation.reinstall.button": {
     "message": "Itaud pag-usab ang putos sa kausaban"
   },
+  "instance.settings.tabs.installation.reinstall.button.reinstalling": {
+    "message": "Nagtaud pag-usab sa putos sa kusaban"
+  },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
     "message": "Mahimo nga mobalik sa sinugdan ang tanang gitaod o giusab nga sulod sa unsay ihatag sa putos sa kausaban, tangtangon ang mga kausaban o sulod nga imong gidugang apil na ang lintunganay nga putos sa kausaban. Mahimo nga maayo ang mga tuhaw nga batasan kon naay pagbag-o sa pananglitan, apan kon gasalig na ang imong kalibutan sa dinugang nga sulod, mahimo nga madaut ani ang daan nga mga kalibutan."
   },
@@ -386,6 +395,9 @@
   "instance.settings.tabs.installation.unlink.description": {
     "message": "Nakakatay kining pananglitan sa usa ka putos sa kausaban, pasabot ani nga dili mapasibo ang mga kausaban og dili nimo mausab ang tigkarga sa kausaban o ang bersiyon sa Minecraft. Kanunay nga mabugto kining pananglitan og putos sa kausabon kun tangtangon ang katay."
   },
+  "instance.settings.tabs.installation.unlink.title": {
+    "message": "Pagbugto sa putos sa kausaban"
+  },
   "instance.settings.tabs.java": {
     "message": "Java at memorya"
   },
diff --git a/apps/app-frontend/src/locales/da-DK/index.json b/apps/app-frontend/src/locales/da-DK/index.json
index c1dfe6b1..c5c17533 100644
--- a/apps/app-frontend/src/locales/da-DK/index.json
+++ b/apps/app-frontend/src/locales/da-DK/index.json
@@ -32,6 +32,102 @@
   "app.update-toast.body.metered": {
     "message": "Modrinth App v{version} er nu tilgængelig! Siden du er på et begrænset netværk, vi downloadede den ikke automatisk."
   },
+  "app.update-toast.changelog": {
+    "message": "Ændringslog"
+  },
+  "app.update-toast.download": {
+    "message": "Download ({size})"
+  },
+  "app.update-toast.downloading": {
+    "message": "Downloader..."
+  },
+  "app.update-toast.reload": {
+    "message": "Geninlæs"
+  },
+  "app.update-toast.title": {
+    "message": "Opdatering tilgængelig"
+  },
+  "app.update-toast.title.download-complete": {
+    "message": "Download færdiggjort"
+  },
+  "app.update.complete-toast.text": {
+    "message": "Klik her for at vise ændringslog."
+  },
+  "app.update.complete-toast.title": {
+    "message": "Version {version} var installeret med succes!"
+  },
+  "app.update.download-update": {
+    "message": "Download opdatering"
+  },
+  "app.update.downloading-update": {
+    "message": "Downloader opdatering ({percent}%)"
+  },
+  "app.update.reload-to-update": {
+    "message": "Genindlæs for at installere opdatering"
+  },
+  "friends.action.add-friend": {
+    "message": "Tilføj en ven"
+  },
+  "friends.action.view-friend-requests": {
+    "message": "{count} venne{count, plural, one {anmodning} other {anmodninger}}"
+  },
+  "friends.add-friend.submit": {
+    "message": "Send en venneanmodning"
+  },
+  "friends.add-friend.title": {
+    "message": "Tilføjer en ven"
+  },
+  "friends.add-friend.username.description": {
+    "message": "Det er muligvis anderledes end deres Minecraft brugernavn!"
+  },
+  "friends.add-friend.username.placeholder": {
+    "message": "Indskriv Modrinth brugernavn..."
+  },
+  "friends.add-friend.username.title": {
+    "message": "Hvad er din vens Modrinth brugernavn?"
+  },
+  "friends.add-friends-to-share": {
+    "message": "<link>Tilføj venner</link> for at se hvad de spiller!"
+  },
+  "friends.friend.cancel-request": {
+    "message": "Annuller anmodning"
+  },
+  "friends.friend.remove-friend": {
+    "message": "Fjern ven"
+  },
+  "friends.friend.request-sent": {
+    "message": "Venneanmodning sendt"
+  },
+  "friends.friend.view-profile": {
+    "message": "Vis profil"
+  },
+  "friends.heading": {
+    "message": "Venner"
+  },
+  "friends.heading.active": {
+    "message": "Aktiv"
+  },
+  "friends.heading.offline": {
+    "message": "Offline"
+  },
+  "friends.heading.online": {
+    "message": "Online"
+  },
+  "friends.heading.pending": {
+    "message": "Afventer"
+  },
+  "friends.no-friends-match": {
+    "message": "Ingen venner som matcher \"{query}\""
+  },
+  "friends.search-friends-placeholder": {
+    "message": "Søg venner..."
+  },
+  "friends.section.heading": {
+    "message": "{title} - {count}"
+  },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Log ind på en Modrinth konto</link> for at tilføje venner og se hvad de spiller!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Tilføj og spil"
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index cd9b383e..1c6e74ee 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -15,7 +15,7 @@
     "message": "Funktionsflaggen"
   },
   "app.settings.tabs.java-installations": {
-    "message": "Java Installationen"
+    "message": "Java-Installationen"
   },
   "app.settings.tabs.privacy": {
     "message": "Datenschutz"
@@ -24,13 +24,13 @@
     "message": "Ressourcenmanagement"
   },
   "app.update-toast.body": {
-    "message": "Modrinth App v{version} ist bereit zum Installieren! Lade neu um es jetzt zu updaten, oder automatisch wenn du die Modrinth App schließt."
+    "message": "Modrinth App v{version} ist bereit zur Installation! Neu laden, um jetzt zu aktualisieren, oder automatisch, wenn du die Modrinth App schließt."
   },
   "app.update-toast.body.download-complete": {
-    "message": "Modrinth App v{version} ist heruntergeladen. Lade neu um es jetzt zu updaten, oder wenn du die Modrinth App schließt."
+    "message": "Modrinth App v{version} wurde heruntergeladen. Neu laden, um jetzt zu aktualisieren, oder automatisch, wenn du die Modrinth App schließt."
   },
   "app.update-toast.body.metered": {
-    "message": "Die Modrinth App v{version} ist jetzt verfügbar! Da Sie sich in einem getakteten Netzwerk befinden, haben wir es nicht automatisch heruntergeladen."
+    "message": "Modrinth App v{version} ist jetzt verfügbar! Da du ein getaktetes Netzwerk nutzt, haben wir den Download nicht automatisch gestartet."
   },
   "app.update-toast.changelog": {
     "message": "Änderungsverlauf"
@@ -51,16 +51,16 @@
     "message": "Download abgeschlossen"
   },
   "app.update.complete-toast.text": {
-    "message": "Drücke hier, um den Änderungsverlauf zu sehen."
+    "message": "Hier klicken, um das Änderungsprotokoll anzuzeigen."
   },
   "app.update.complete-toast.title": {
     "message": "Version {version} wurde erfolgreich installiert!"
   },
   "app.update.download-update": {
-    "message": "Lade Update herunter"
+    "message": "Update herunterladen"
   },
   "app.update.downloading-update": {
-    "message": "Lade Update Herunter ({percent}%)"
+    "message": "Update wird heruntergeladen ({percent}%)"
   },
   "app.update.reload-to-update": {
     "message": "Neu laden um Update zu installieren"
@@ -72,19 +72,19 @@
     "message": "{count} {count, plural, one {Freundesanfrage} other {Freundesanfragen}}"
   },
   "friends.add-friend.submit": {
-    "message": "Sende Freundesanfrage"
+    "message": "Freundesanfrage senden"
   },
   "friends.add-friend.title": {
     "message": "Einen Freund hinzufügen"
   },
   "friends.add-friend.username.description": {
-    "message": "Es kann vom Minecraft Nutzernamen abweichen!"
+    "message": "Er kann vom Minecraft-Nutzernamen abweichen!"
   },
   "friends.add-friend.username.placeholder": {
-    "message": "Gebe den Modrinth Nutzername ein..."
+    "message": "Modrinth-Benutzernamen eingeben..."
   },
   "friends.add-friend.username.title": {
-    "message": "Was ist der Modrinth Nutzername deines Freundes?"
+    "message": "Wie lautet der Modrinth-Benutzername deines Freundes?"
   },
   "friends.add-friends-to-share": {
     "message": "<link>Freunde hinzufügen</link>, um zu sehen, was sie spielen!"
@@ -120,13 +120,13 @@
     "message": "Keine Freunde die \"{query}\" entsprechen"
   },
   "friends.search-friends-placeholder": {
-    "message": "Suche nach Freunden..."
+    "message": "Freunde durchsuchen..."
   },
   "friends.section.heading": {
     "message": "{title} - {count}"
   },
   "friends.sign-in-to-add-friends": {
-    "message": "<link>Melden Sie sich bei einem Modrinth Konto an</link>, um Freunde hinzuzufügen und zu sehen, was sie gerade spielen!"
+    "message": "<link>Melde dich bei einem Modrinth-Konto an</link>, um Freunde hinzuzufügen und zu sehen, was sie gerade spielen!"
   },
   "instance.add-server.add-and-play": {
     "message": "Hinzufügen und spielen"
@@ -156,7 +156,7 @@
     "message": "Name"
   },
   "instance.edit-world.placeholder-name": {
-    "message": "Minecraft Welt"
+    "message": "Minecraft-Welt"
   },
   "instance.edit-world.reset-icon": {
     "message": "Icon zurücksetzen"
@@ -177,7 +177,7 @@
     "message": "Name"
   },
   "instance.server-modal.placeholder-name": {
-    "message": "Minecraft Server"
+    "message": "Minecraft-Server"
   },
   "instance.server-modal.resource-pack": {
     "message": "Ressourcenpaket"
@@ -192,16 +192,16 @@
     "message": "Instanz löschen"
   },
   "instance.settings.tabs.general.delete.description": {
-    "message": "Löscht eine Instanz dauerhaft von deinem Gerät, einschließlich deiner Welten, Einstellungen und aller installierten Inhalte. Sei vorsichtig, eine gelöschte Instanz ist nicht wiederherstellbar."
+    "message": "Löscht eine Instanz dauerhaft von deinem Gerät, einschließlich deiner Welten, Einstellungen und aller installierten Inhalte. Sei vorsichtig, da eine gelöschte Instanz nicht wiederhergestellt werden kann."
   },
   "instance.settings.tabs.general.deleting.button": {
     "message": "Wird gelöscht..."
   },
   "instance.settings.tabs.general.duplicate-button": {
-    "message": "Duplizieren"
+    "message": "Kopieren"
   },
   "instance.settings.tabs.general.duplicate-button.tooltip.installing": {
-    "message": "Kann während der Installation nicht dupliziert werden."
+    "message": "Kann während der Installation nicht kopiert werden."
   },
   "instance.settings.tabs.general.duplicate-instance": {
     "message": "Instanz duplizieren"
@@ -228,7 +228,7 @@
     "message": "Neue Gruppe erstellen"
   },
   "instance.settings.tabs.general.library-groups.description": {
-    "message": "Bibliotheksgruppen ermöglichen es dir, deine Instanzen in verschiedene Abteile deiner Bibliothek einzuteilen."
+    "message": "Bibliotheksgruppen ermöglichen es dir, deine Instanzen in verschiedene Abschnitte deiner Bibliothek zu organisieren."
   },
   "instance.settings.tabs.general.library-groups.enter-name": {
     "message": "Gruppenname eingeben"
@@ -246,25 +246,25 @@
     "message": "Hooks ermöglichen es fortgeschrittenen Benutzern, bestimmte Systembefehle vor und nach dem Spielstart auszuführen."
   },
   "instance.settings.tabs.hooks.post-exit": {
-    "message": "Nach dem Schließen des Spiels"
+    "message": "Nach dem Beenden"
   },
   "instance.settings.tabs.hooks.post-exit.description": {
-    "message": "Wird ausgeführt nach dem Beenden des Spiels."
+    "message": "Wird nach dem Beenden des Spiels ausgeführt."
   },
   "instance.settings.tabs.hooks.post-exit.enter": {
     "message": "Nach Spielbeendigung auszuführender Befehl eingeben..."
   },
   "instance.settings.tabs.hooks.pre-launch": {
-    "message": "Vor dem Starten des Spiels"
+    "message": "Vor dem Start"
   },
   "instance.settings.tabs.hooks.pre-launch.description": {
-    "message": "Wird vor dem Starten des Spiels ausgeführt."
+    "message": "Wird vor dem Starten der Instanz ausgeführt."
   },
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Vor Spielstart auszuführender Befehl eingeben..."
   },
   "instance.settings.tabs.hooks.title": {
-    "message": "Start Hooks"
+    "message": "Start-Hooks"
   },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Wrapper"
@@ -315,7 +315,7 @@
     "message": "Installieren"
   },
   "instance.settings.tabs.installation.install.in-progress": {
-    "message": "Wird installiert"
+    "message": "Installation im Gange"
   },
   "instance.settings.tabs.installation.loader-version": {
     "message": "{loader} Version"
@@ -342,13 +342,13 @@
     "message": "Modpack wird neu installiert"
   },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
-    "message": "Durch die Neuinstallation werden alle installierten oder geänderten Inhalte auf die vom Modpack bereitgestellten Inhalte zurückgesetzt, wobei alle Mods oder Inhalte entfernt werden, die zusätzlich zur ursprünglichen Installation hinzugefügt wurden. Dies kann unerwartetes Verhalten beheben, wenn Änderungen an der Instanz vorgenommen wurden. Wenn Ihre Welten jedoch von zusätzlich installierten Inhalten abhängig sind, kann dies zu Fehlern in bestehenden Welten führen."
+    "message": "Eine Neuinstallation setzt alle installierten oder geänderten Inhalte auf den Zustand zurück, der vom Modpack bereitgestellt wird, und entfernt alle Mods oder Inhalte, die du zusätzlich zur ursprünglichen Installation hinzugefügt hast.\nDies kann unerwartetes Verhalten beheben, falls Änderungen an der Instanz vorgenommen wurden. Wenn deine Welten jedoch von zusätzlich installierten Inhalten abhängen, kann dies bestehende Welten beschädigen."
   },
   "instance.settings.tabs.installation.reinstall.confirm.title": {
     "message": "Bist du dir sicher, dass du diese Instanz neu installieren willst?"
   },
   "instance.settings.tabs.installation.reinstall.description": {
-    "message": "Setzt den Inhalt der Instanz auf seinen ursprünglichen Zustand zurück und entfernt alle Mods oder Inhalte, die zusätzlich zum ursprünglichen Modpack hinzugefügt wurden."
+    "message": "Setzt den Inhalt der Instanz auf den ursprünglichen Zustand zurück und entfernt alle Mods oder Inhalte, die du zusätzlich zum ursprünglichen Modpack hinzugefügt hast."
   },
   "instance.settings.tabs.installation.reinstall.title": {
     "message": "Modpack neu installieren"
@@ -369,7 +369,7 @@
     "message": "Reparatur im Gange"
   },
   "instance.settings.tabs.installation.reset-selections": {
-    "message": "Auf aktuellen Wert zurücksetzen"
+    "message": "Auf aktuellen Stand zurücksetzen"
   },
   "instance.settings.tabs.installation.show-all-versions": {
     "message": "Alle Versionen anzeigen"
@@ -402,7 +402,7 @@
     "message": "Verknüpfung der Instanz trennen"
   },
   "instance.settings.tabs.installation.unlink.confirm.description": {
-    "message": "Wenn du fortfährst, kann die Instanz nicht erneut verknüpft werden, ohne eine völlig neue Instanz zu erstellen. Du erhältst keine Modpack-Updates mehr und es wird zu einer normalen Instanz."
+    "message": "Wenn du fortfährst, kannst du sie nicht erneut verknüpfen, ohne eine völlig neue Instanz zu erstellen. Du wirst keine Modpack-Updates mehr erhalten, und sie wird zu einer normalen Instanz."
   },
   "instance.settings.tabs.installation.unlink.confirm.title": {
     "message": "Möchtest du die Verknüpfungen dieser Instanz wirklich trennen?"
@@ -432,10 +432,10 @@
     "message": "Zugewiesener Arbeitsspeicher"
   },
   "instance.settings.tabs.window": {
-    "message": "Spielfenster"
+    "message": "Fenster"
   },
   "instance.settings.tabs.window.custom-window-settings": {
-    "message": "Benutzerdefinierte Spielfenstereinstellungen"
+    "message": "Benutzerdefinierte Fenstereinstellungen"
   },
   "instance.settings.tabs.window.fullscreen": {
     "message": "Vollbild"
@@ -507,19 +507,19 @@
     "message": "Einzelspieler"
   },
   "instance.worlds.view_instance": {
-    "message": "Instanzen anzeigen"
+    "message": "Instanz anzeigen"
   },
   "instance.worlds.world_in_use": {
-    "message": "Welt ist aktuell in Benutzung"
+    "message": "Welt wird aktuell benutzt"
   },
   "search.filter.locked.instance": {
-    "message": "Von der Instanz bereitgestellt"
+    "message": "Von der Instanz vorgegeben"
   },
   "search.filter.locked.instance-game-version.title": {
     "message": "Spielversion ist von der Instanz vorgegeben"
   },
   "search.filter.locked.instance-loader.title": {
-    "message": "Der Loader wird von der Instanz bereitgestellt"
+    "message": "Der Loader ist von der Instanz vorgegeben"
   },
   "search.filter.locked.instance.sync": {
     "message": "Mit Instanz synchronisieren"
diff --git a/apps/app-frontend/src/locales/fil-PH/index.json b/apps/app-frontend/src/locales/fil-PH/index.json
index 88292468..261609d7 100644
--- a/apps/app-frontend/src/locales/fil-PH/index.json
+++ b/apps/app-frontend/src/locales/fil-PH/index.json
@@ -125,6 +125,9 @@
   "friends.section.heading": {
     "message": "{title} - {count}"
   },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Mag-sign-in sa Modrinth account</link> upang maidagdag ang mga kaibigan at malaman ang kanilang nilalaro!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Idagdag at laruin"
   },
@@ -308,6 +311,9 @@
   "instance.settings.tabs.installation.install": {
     "message": "I-install"
   },
+  "instance.settings.tabs.installation.install.in-progress": {
+    "message": "Nag-i-install ngayon"
+  },
   "instance.settings.tabs.installation.loader-version": {
     "message": "Bersiyon ng {loader}"
   },
@@ -323,6 +329,9 @@
   "instance.settings.tabs.installation.reinstall.button": {
     "message": "I-reinstall ang modpack"
   },
+  "instance.settings.tabs.installation.reinstall.button.reinstalling": {
+    "message": "Ini-re-reinstall ang modpack"
+  },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
     "message": "Ang pagrere-install ay maaaring mare-reset ang lahat ng na-install o binago na kontento sa kung anong ibibigay ng modpack, tatanggalin ang mga mods o kontentong idinagdag mo lalo na ang mga orihinal na modpack. Maaari nitong masiayos ang mga hindi inaasahang pag-uugali kung may pagbabagong naganap sa instansiya, ngunit kung dumedepende na ang iyong mundo sa karagdagang kontento, maaari nitong masira ang mga umiiral na mundo."
   },
@@ -386,6 +395,9 @@
   "instance.settings.tabs.installation.unlink.description": {
     "message": "Ang instansiyang ito ay naka-link sa isang modpack, ibig sabihin ang mga mod ay hindi mai-update at hindi mo mapapalitan ang mod loader o ang bersiyon ng Minecraft."
   },
+  "instance.settings.tabs.installation.unlink.title": {
+    "message": "I-unlink sa modpack"
+  },
   "instance.settings.tabs.java": {
     "message": "Java at memorya"
   },
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index 2711a4f8..2a19a644 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -6,7 +6,7 @@
     "message": "v{version}をダウンロード中"
   },
   "app.settings.tabs.appearance": {
-    "message": "表示設定"
+    "message": "外観"
   },
   "app.settings.tabs.default-instance-options": {
     "message": "インスタンスの基本設定"
@@ -15,10 +15,10 @@
     "message": "機能設定"
   },
   "app.settings.tabs.java-installations": {
-    "message": "Javaのインストール設定"
+    "message": "Javaのインストール"
   },
   "app.settings.tabs.privacy": {
-    "message": "プライバシー設定"
+    "message": "プライバシー"
   },
   "app.settings.tabs.resource-management": {
     "message": "リソース管理"
diff --git a/apps/app-frontend/src/locales/th-TH/index.json b/apps/app-frontend/src/locales/th-TH/index.json
index 45316ede..2560335e 100644
--- a/apps/app-frontend/src/locales/th-TH/index.json
+++ b/apps/app-frontend/src/locales/th-TH/index.json
@@ -65,6 +65,9 @@
   "app.update.reload-to-update": {
     "message": "รีโหลดเพื่อติดตั้งอัพเดต"
   },
+  "friends.heading": {
+    "message": "เพื่อน"
+  },
   "instance.add-server.add-and-play": {
     "message": "เพิ่มและเล่นทันที"
   },
diff --git a/apps/app-frontend/src/locales/tl-PH/index.json b/apps/app-frontend/src/locales/tl-PH/index.json
index b339d89e..f4bc7d24 100644
--- a/apps/app-frontend/src/locales/tl-PH/index.json
+++ b/apps/app-frontend/src/locales/tl-PH/index.json
@@ -125,11 +125,14 @@
   "friends.section.heading": {
     "message": "{title} - {count}"
   },
+  "friends.sign-in-to-add-friends": {
+    "message": "<link>Mag-sign-in sa Modrinth account</link> upang maidagdag ang mga kaibigan at malaman ang kanilang nilalaro!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Idagdag at laruin"
   },
   "instance.add-server.add-server": {
-    "message": "Idagdag ang tagapagsilbi"
+    "message": "Idagdag ang pansilbi"
   },
   "instance.add-server.resource-pack.disabled": {
     "message": "Hindi pinahihintulotan"
@@ -141,10 +144,10 @@
     "message": "Magpahintulot"
   },
   "instance.add-server.title": {
-    "message": "Magdagdag ng tagapagsilbi"
+    "message": "Magdagdag ng pansilbi"
   },
   "instance.edit-server.title": {
-    "message": "Baguhin ang tagapagsilbi"
+    "message": "Baguhin ang pansilbi"
   },
   "instance.edit-world.hide-from-home": {
     "message": "Huwag ipakita sa panig ng Bahay"
@@ -174,7 +177,7 @@
     "message": "Pangalan"
   },
   "instance.server-modal.placeholder-name": {
-    "message": "Minecraft na Tagapagsilbi"
+    "message": "Minecraft na Pansilbi"
   },
   "instance.server-modal.resource-pack": {
     "message": "Balot ng mapagkukunan"
@@ -308,6 +311,9 @@
   "instance.settings.tabs.installation.install": {
     "message": "Ikabit"
   },
+  "instance.settings.tabs.installation.install.in-progress": {
+    "message": "Nagkakabit ngayon"
+  },
   "instance.settings.tabs.installation.loader-version": {
     "message": "Bersiyon ng {loader}"
   },
@@ -323,6 +329,9 @@
   "instance.settings.tabs.installation.reinstall.button": {
     "message": "Ikabit muli ang balot ng pambago"
   },
+  "instance.settings.tabs.installation.reinstall.button.reinstalling": {
+    "message": "Kinakabit muli ang balot ng pambago"
+  },
   "instance.settings.tabs.installation.reinstall.confirm.description": {
     "message": "Maaaring mababalik sa dati ang lahat ng kinabit o binago na nilalaman sa kung anong ibibigay ng balot ng pambago, tatanggalin ang mga pambago o nilalamang idinagdag mo lalo na ang nangunang balot ng pambago. Maaari nitong masiayos ang mga hindi inaasahang pag-uugali kung may pagbabagong naganap sa tularan, ngunit kung nakabatay na ang iyong daigdig sa karagdagang nilalaman, maaari nitong masira ang mga umiiral na daigdig."
   },
@@ -386,6 +395,9 @@
   "instance.settings.tabs.installation.unlink.description": {
     "message": "Nakakawing ang tularang ito sa isang pambalot ng pambago, ibig sabihin hindi maisapanahon ang mga pambago at hindi mo mapapalitan ang tagapagdala ng pambago o ang bersiyon ng Minecraft."
   },
+  "instance.settings.tabs.installation.unlink.title": {
+    "message": "Paghiwalayin sa balot ng pambago"
+  },
   "instance.settings.tabs.java": {
     "message": "Java at memorya"
   },
@@ -426,7 +438,7 @@
     "message": "Mga Kagustuhan"
   },
   "instance.worlds.a_minecraft_server": {
-    "message": "Isang Minecraft na Tagapagsilbi"
+    "message": "Isang Minecraft na Pansilbi"
   },
   "instance.worlds.copy_address": {
     "message": "Sipiin ang tinitirhan"
@@ -444,7 +456,7 @@
     "message": "Laruin ang tularan"
   },
   "instance.worlds.type.server": {
-    "message": "Tagapagsilbi"
+    "message": "Pansilbi"
   },
   "instance.worlds.type.singleplayer": {
     "message": "Pang-isahang laro"
diff --git a/apps/frontend/src/locales/ar-SA/index.json b/apps/frontend/src/locales/ar-SA/index.json
index cf95829b..ab055243 100644
--- a/apps/frontend/src/locales/ar-SA/index.json
+++ b/apps/frontend/src/locales/ar-SA/index.json
@@ -497,6 +497,9 @@
   "create.organization.error-title": {
     "message": "حدث خطأ"
   },
+  "create.organization.name-label": {
+    "message": ""
+  },
   "error.collection.404.list_item.3": {
     "message": "قد تكون هذه المجموعة قد أزالها فريق مراقبة مودرنث لانتهاك <tou-link>شروط الاستخدام</tou-link> الخاصة بنا."
   },
diff --git a/apps/frontend/src/locales/da-DK/index.json b/apps/frontend/src/locales/da-DK/index.json
index cb97ad58..50c6c5b4 100644
--- a/apps/frontend/src/locales/da-DK/index.json
+++ b/apps/frontend/src/locales/da-DK/index.json
@@ -1,4 +1,10 @@
 {
+  "action.cancel": {
+    "message": "Annuller"
+  },
+  "action.continue": {
+    "message": "Forsæt"
+  },
   "admin.billing.error.not-found": {
     "message": "Bruger ikke fundet"
   },
@@ -65,6 +71,24 @@
   "app-marketing.features.mod-management.byAuthor": {
     "message": "af {author}"
   },
+  "app-marketing.features.mod-management.description": {
+    "message": "Modrinth gør det nemt at håndtere alle dine mods i et sted. Du kan installere, afinstallere, og opdatere mods med et enkelt klik."
+  },
+  "app-marketing.features.mod-management.installed-mods": {
+    "message": "Installerede mods"
+  },
+  "app-marketing.features.mod-management.name": {
+    "message": "Navn"
+  },
+  "app-marketing.features.mod-management.search-mods": {
+    "message": "Søg mods"
+  },
+  "app-marketing.features.mod-management.title": {
+    "message": "Mod håndtering"
+  },
+  "app-marketing.features.mod-management.version": {
+    "message": "Version"
+  },
   "app-marketing.features.performance.cpu-percent": {
     "message": "% CPU"
   },
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index 980b180c..a6756c32 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -1410,7 +1410,7 @@
     "message": "Aktive Meldungen"
   },
   "layout.nav.analytics": {
-    "message": "Analytik"
+    "message": "Analysen"
   },
   "layout.nav.discover": {
     "message": "Entdecken"
@@ -1812,7 +1812,7 @@
     "message": "Details"
   },
   "profile.label.downloads": {
-    "message": "{count} {count, plural, one {Projekt} other {Projekte}}"
+    "message": "{count} {count, plural, one {Download} other {Downloads}}"
   },
   "profile.label.joined": {
     "message": "Beigetreten"
@@ -1899,7 +1899,7 @@
     "message": "Erneut zur Überprüfung einreichen"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Dein Projekt wurde vom Modrinth-Team {status, select, rejected {abgelehnt} withheld {zurückgehalten} other {{status}}}."
+    "message": "Dein Projekt wurde vom Modrinth-Team {status, select, rejected {abgelehnt} withheld {zurückgehalten} other {{status}}}. In der Regel hast du die Möglichkeit, es nach Umsetzung der Anmerkungen erneut einzureichen."
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Du musst die benötigten Schritte in der Veröffentlichungsliste abschliessen!"
@@ -2310,7 +2310,7 @@
     "message": "Zugriff auf Analysedaten"
   },
   "scopes.analytics.label": {
-    "message": "Lesezugriff Analytiks"
+    "message": "Lesezugriff Analysen"
   },
   "scopes.collectionCreate.description": {
     "message": "Kollektionen erstellen"
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index 0abd51aa..704f6920 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -27,13 +27,13 @@
     "message": "Linux"
   },
   "app-marketing.download.linux-disclaimer": {
-    "message": "Die Linux Versionen der Modrinth App <issues-link>haben auf bestimmten Systemen und Konfigurationen bekannte Probleme</issues-link>. Wenn die Modrinth App auf deinem System instabil läuft, empfehlen wir, andere Apps wie <prism-link>Prism Launcher</prism-link> auszuprobieren, um Modrinth Inhalte einfach zu installieren."
+    "message": "Die Linuxversionen der Modrinth App <issues-link>haben auf bestimmten Systemen und Konfigurationen bekannte Probleme</issues-link>. Wenn die Modrinth App auf deinem System instabil läuft, empfehlen wir, andere Apps wie <prism-link>Prism Launcher</prism-link> auszuprobieren, um Modrinth-Inhalte einfach zu installieren."
   },
   "app-marketing.download.mac": {
     "message": "Mac"
   },
   "app-marketing.download.options-title": {
-    "message": "Download-Optionen"
+    "message": "Downloadoptionen"
   },
   "app-marketing.download.terms": {
     "message": "Mit dem Herunterladen der Modrinth App stimmst du unseren <terms-link>Nutzungsbedingungen</terms-link> und der <privacy-link>Datenschutzrichtlinie</privacy-link> zu."
@@ -51,7 +51,7 @@
     "message": "Speichere deine Lieblingsinhalte und erhalte Updates mit nur einem Klick."
   },
   "app-marketing.features.follow.title": {
-    "message": "Projekten folgen"
+    "message": "Folge Projekten"
   },
   "app-marketing.features.importing.description": {
     "message": "Importiere alle deine Lieblingsprofile aus dem Launcher, den du bisher verwendet hast, und starte in Sekundenschnelle mit der Modrinth App!"
@@ -84,13 +84,13 @@
     "message": "Mods suchen"
   },
   "app-marketing.features.mod-management.title": {
-    "message": "Mod-Verwaltung"
+    "message": "Modverwaltung"
   },
   "app-marketing.features.mod-management.version": {
     "message": "Version"
   },
   "app-marketing.features.offline.description": {
-    "message": "Spiele mit deinen Mods, egal, ob du mit dem Internet verbunden bist oder nicht."
+    "message": "Spiele mit deinen Mods, ganz egal, ob du mit dem Internet verbunden bist oder nicht."
   },
   "app-marketing.features.offline.title": {
     "message": "Offline-Modus"
@@ -102,7 +102,7 @@
     "message": "Open Source"
   },
   "app-marketing.features.performance.activity-monitor": {
-    "message": "Aktivitätsmonitoring"
+    "message": "Aktivitätsmonitor"
   },
   "app-marketing.features.performance.cpu-percent": {
     "message": "% CPU"
@@ -147,7 +147,7 @@
     "message": "Performant"
   },
   "app-marketing.features.play.description": {
-    "message": "Nutze die Modrinth App, um die Mods und Modpacks herunterzuladen und zu spielen, die du liebst."
+    "message": "Nutze die Modrinth-App, um mit deinen Lieblings-Mods und Modpacks zu spielen."
   },
   "app-marketing.features.play.title": {
     "message": "Spiele mit den Mods, die du liebst"
@@ -177,7 +177,7 @@
     "message": "den du zuvor verwendet hast"
   },
   "app-marketing.hero.app-screenshot-alt": {
-    "message": "Screenshot der Modrinth App mit einer geöffneten Cobblemon Instanz auf der „Inhalte“-Seite."
+    "message": "Screenshot der Modrinth App mit einer geöffneten Cobblemon-Instanz auf der „Inhalte“-Seite."
   },
   "app-marketing.hero.description": {
     "message": "Die Modrinth App ist ein einzigartiger, quelloffener Launcher, mit dem du deine Lieblingsmods spielen und stets aktuell halten kannst. Alles in einem praktischen Paket."
@@ -204,13 +204,13 @@
     "message": "Ablehnen"
   },
   "auth.authorize.app-info": {
-    "message": "<strong>{appName}</strong> von <creator-link>{creator}</creator-link> wird können:"
+    "message": "<strong>{appName}</strong> von <creator-link>{creator}</creator-link> wird folgendes können:"
   },
   "auth.authorize.authorize-app-name": {
     "message": "Autorisiere {appName}"
   },
   "auth.authorize.error.no-redirect-url": {
-    "message": "Keine Weiterleitungsadresse in der Antwort gefunden"
+    "message": "Keine Weiterleitungsziel in Antwort gefunden"
   },
   "auth.authorize.redirect-url": {
     "message": "Du wirst zu <redirect-url>{url}</redirect-url> weitergeleitet"
@@ -231,10 +231,10 @@
     "message": "Eine E-Mail mit Anweisungen wurde dir gesendet, falls dein Konto zuvor mit der E-Mail verbunden war."
   },
   "auth.reset-password.notification.email-sent.title": {
-    "message": "E-Mail wurde gesendet"
+    "message": "E-Mail gesendet"
   },
   "auth.reset-password.notification.password-reset.text": {
-    "message": "Du kannst dich jetzt mit deinem neuen Passwort anmelden."
+    "message": "Du kannst dich jetzt mit deinem neuen Passwort bei deinem Konto anmelden."
   },
   "auth.reset-password.notification.password-reset.title": {
     "message": "Passwort erfolgreich zurückgesetzt"
@@ -252,7 +252,7 @@
     "message": "Passwort zurücksetzen"
   },
   "auth.reset-password.title.long": {
-    "message": "Ihr Passwort zurücksetzen"
+    "message": "Dein Passwort zurücksetzen"
   },
   "auth.sign-in.2fa.description": {
     "message": "Bitte gib einen Zwei-Faktor-Code ein, um fortzufahren."
@@ -306,7 +306,7 @@
     "message": "Du hast bereits ein Konto?"
   },
   "auth.sign-up.subscribe.label": {
-    "message": "Folge den Updates über Modrinth"
+    "message": "Updates zu Modrinth abonnieren"
   },
   "auth.sign-up.title": {
     "message": "Registrieren"
@@ -351,13 +351,13 @@
     "message": "E-Mail bestätigen"
   },
   "auth.welcome.checkbox.subscribe": {
-    "message": "Folge den Updates über Modrinth"
+    "message": "Erhalte Neuigkeiten zu Modrinth"
   },
   "auth.welcome.description": {
     "message": "Du bist jetzt Teil der großartigen Community von Entwicklern und Entdeckern die bereits fantastische Mods erstellen, herunterladen und auf dem neuesten Stand halten."
   },
   "auth.welcome.label.tos": {
-    "message": "Durch die Erstellung Deines Kontos hast Du den <terms-link>Nutzungsbedingungen</terms-link> und der <privacy-policy-link>Datenschutzrichtlinie</privacy-policy-link> von Modrinth zugestimmt."
+    "message": "Durch die Erstellung Deines Kontos hast du den <terms-link>Nutzungsbedingungen</terms-link> und der <privacy-policy-link>Datenschutzrichtlinie</privacy-policy-link> von Modrinth zugestimmt."
   },
   "auth.welcome.long-title": {
     "message": "Willkommen bei Modrinth!"
@@ -381,16 +381,16 @@
     "message": "Dies wird diese Sammlung für immer entfernen. Diese Aktion kann nicht rückgängig gemacht werden."
   },
   "collection.delete-modal.title": {
-    "message": "Bist Du Dir sicher, dass Du diese Sammlung löschen willst?"
+    "message": "Bist du Dir sicher, dass du diese Sammlung löschen willst?"
   },
   "collection.description": {
-    "message": "{description} - {name} von {username} auf Modrinth ansehen"
+    "message": "{description} – Schau dir die Kollektion {name} von {username} auf Modrinth an"
   },
   "collection.description.following": {
-    "message": "Automatisch generierte Sammlung aller Projekte, denen Du folgst."
+    "message": "Automatisch generierte Sammlung aller Projekte, denen du folgst."
   },
   "collection.error.not-found": {
-    "message": "Kollektion nicht Gefunden"
+    "message": "Kollektion nicht gefunden"
   },
   "collection.label.collection": {
     "message": "Kollektion"
@@ -465,10 +465,10 @@
     "message": "Support Kontaktieren"
   },
   "create.limit-alert.limit-reached": {
-    "message": "{type} Maximum erreicht"
+    "message": "{type}-Limit erreicht"
   },
   "create.limit-alert.limit-reached-description": {
-    "message": "Du hast dein {type} Maximum von {max} erreicht. Bitte Kontaktiere den Support."
+    "message": "Du hast dein {type}-Limit von {max} erreicht. Bitte kontaktiere den Support, um dein Limit zu erhöhen."
   },
   "create.limit-alert.type-collection": {
     "message": "Kollektion"
@@ -501,10 +501,10 @@
     "message": "Name"
   },
   "create.organization.name-placeholder": {
-    "message": "Gebe dein Organisationsname ein..."
+    "message": "Organisationname eingeben..."
   },
   "create.organization.ownership-info": {
-    "message": "Du wirst der Besitzer dieser Organisation sein, aber du kannst andere Mitglieder jederzeit einladen und die Eigentümerschaft jederzeit übertragen."
+    "message": "Du wirst der Besitzer dieser Organisation sein, kannst aber andere Mitglieder einladen und die Eigentumsrechte übertragen."
   },
   "create.organization.summary-description": {
     "message": "Ein oder zwei Sätze, die deine Organisation beschreiben."
@@ -537,13 +537,13 @@
     "message": "Projektnamen eingeben..."
   },
   "create.project.summary-description": {
-    "message": "Ein oder Zwei Sätze, die dein Projekt beschreiben."
+    "message": "Ein bis zwei Sätze, die dein Projekt beschreiben."
   },
   "create.project.summary-label": {
     "message": "Kurzbeschreibung"
   },
   "create.project.summary-placeholder": {
-    "message": "Dieses Projekt fügt folgendes hinzu: ..."
+    "message": "Dieses Projekt..."
   },
   "create.project.title": {
     "message": "Ein Projekt erstellen"
@@ -552,7 +552,7 @@
     "message": "URL"
   },
   "create.project.visibility-description": {
-    "message": "Die Sichtbarkeit deines Projektes nachdem es genehmigt wurde."
+    "message": "Die Sichtbarkeit deines Projektes, nachdem es genehmigt wurde."
   },
   "create.project.visibility-label": {
     "message": "Sichtbarkeit"
@@ -567,25 +567,25 @@
     "message": "Nicht gelistet"
   },
   "dashboard.affiliate-links.create.button": {
-    "message": "Affiliate-Link erstellen"
+    "message": "Partnerlink erstellen"
   },
   "dashboard.affiliate-links.error.title": {
-    "message": "Fehler beim Laden von Affiliate-Links"
+    "message": "Fehler beim Laden von Partnerlinks"
   },
   "dashboard.affiliate-links.header": {
-    "message": "Deine Affiliate-Links"
+    "message": "Deine Partnerlinks"
   },
   "dashboard.affiliate-links.revoke-confirm.body": {
-    "message": "Dadurch wird der Affiliate-Code `{id}` dauerhaft widerrufen, und alle bestehenden Links, die mit diesem Code geteilt wurden, sind dann nicht mehr gültig."
+    "message": "Dies wird permanent den Partnercode `{id}` widerrufen und alle existierenden Links, welche ihn nutzen, werden nicht mehr gültig sein."
   },
   "dashboard.affiliate-links.revoke-confirm.button": {
     "message": "Widerrufen"
   },
   "dashboard.affiliate-links.revoke-confirm.title": {
-    "message": "Möchtest Du Deinen Affiliate-Link ''{title}'' wirklich widerrufen?"
+    "message": "Bist du sicher, dass du deinen Partnerlink „{title}“ widerrufen möchtest?"
   },
   "dashboard.affiliate-links.search": {
-    "message": "Affiliate-Links suchen..."
+    "message": "Partnerlinks durchsuchen..."
   },
   "dashboard.collections.button.create-new": {
     "message": "Erstellen"
@@ -606,10 +606,10 @@
     "message": "Dein {formType} Steuerformular wurde erfolgreich eingereicht!"
   },
   "dashboard.creator-tax-form-modal.confirmation.support-text": {
-    "message": "Du kannst dich jetzt jederzeit abmelden. Falls du Fragen hast oder deine Daten aktualisieren möchtest, wende dich an den <support-link>Support</support-link>."
+    "message": "Du kannst jetzt frei abheben. Wenn du Fragen hast oder deine Angaben aktualisieren musst, <support-link>wende dich an den Support</support-link>."
   },
   "dashboard.creator-tax-form-modal.confirmation.title": {
-    "message": "Sie sind startklar! 🎉"
+    "message": "Du bist startklar! 🎉"
   },
   "dashboard.creator-tax-form-modal.entity.description": {
     "message": "Ein ausländisches Unternehmen bezeichnet eine Geschäftseinheit, die außerhalb der Vereinigten Staaten gegründet wurde (z. B. eine nicht-US-amerikanische Kapitalgesellschaft, Personengesellschaft oder LLC)."
@@ -735,7 +735,7 @@
     "message": "Netzwerk"
   },
   "dashboard.creator-withdraw-modal.nearing-threshold": {
-    "message": "Sie nähern sich der Auszahlungsgrenze. Sie können jetzt <b>{amountRemaining}</b> auszahlen lassen, für einen höheren Betrag ist jedoch ein Steuerformular erforderlich."
+    "message": "Du näherst dich der Auszahlungsgrenze. Du kannst jetzt <b>{amountRemaining}</b> abheben, für höhere Beträge ist jedoch ein Steuerformular erforderlich."
   },
   "dashboard.creator-withdraw-modal.paypal-details.account": {
     "message": "Konto"
@@ -969,10 +969,10 @@
     "message": "Bitte Steuerformular ausfüllen"
   },
   "error.collection.404.list_item.1": {
-    "message": "Du hast vielleicht die URL der Kollektion falsch geschrieben."
+    "message": "Möglicherweise hast du die URL der Kollektion falsch eingegeben."
   },
   "error.collection.404.list_item.2": {
-    "message": "Diese Kollektion ist vielleicht privat."
+    "message": "Diese Kollektion ist eventuell Privat."
   },
   "error.collection.404.list_item.3": {
     "message": "Diese Kollektion wurde vielleicht von Modrinth's Moderationsteam wegen Verstoßes gegen unsere <tou-link>Nutzungsbedingungen</tou-link> gesperrt."
@@ -981,10 +981,10 @@
     "message": "Warum?"
   },
   "error.collection.404.title": {
-    "message": "Sammlung nicht gefunden"
+    "message": "Kollektion nicht gefunden"
   },
   "error.generic.404.subtitle": {
-    "message": "Die Seite, die du aufrufen willst, scheint nicht zu existieren."
+    "message": "Die von dir gesuchte Seite scheint nicht zu existieren."
   },
   "error.generic.404.title": {
     "message": "Seite nicht gefunden"
@@ -1002,10 +1002,10 @@
     "message": "Wenn dies häufiger passiert, solltest du das Modrinth-Team informieren, indem du unserem <discord-link>Discord-Server</discord-link> beitrittst."
   },
   "error.generic.default.list_title": {
-    "message": "Versuche es in ein paar Minuten wieder."
+    "message": "Bitte versuch es in ein paar Minuten erneut."
   },
   "error.generic.default.subtitle": {
-    "message": "Etwas ist schiefgegangen."
+    "message": "Irgendwas ist schiefgegangen."
   },
   "error.generic.default.title": {
     "message": "Oh nein!"
@@ -1059,13 +1059,13 @@
     "message": "Du wurdest gefroscht! 🐸"
   },
   "frog.altText": {
-    "message": "Ein Fotorealistisches Gemälde eines Frosch-Labyrinths"
+    "message": "Ein fotorealistisches Gemälde eines Frosch-Labyrinths"
   },
   "frog.froggedPeople": {
-    "message": "{count, plural, one {Eine andere Person wurde} other {{count} andere Personen wurden}} auch gefroscht!"
+    "message": "{count, plural, one {{count} weitere Person wurde} other {{count} weitere Personen wuden}} ebenfalls gefroscht!"
   },
   "frog.sinceOpened": {
-    "message": "Diese Seite wurde vor {ago} geöffnet"
+    "message": "Diese Seite wurde {ago} geöffnet"
   },
   "frog.title": {
     "message": "Frosch"
@@ -1119,7 +1119,7 @@
     "message": "Erhalte Benachrichtigungen, sobald deine Lieblingsprojekte aktualisiert werden und bleibe immer auf dem Laufenden."
   },
   "landing.feature.follow.heading": {
-    "message": "Folge Projekten, die dir gefallen"
+    "message": "Folge Projekten, die du magst"
   },
   "landing.feature.launcher.description": {
     "message": "Die Open-Source-API von Modrinth ermöglicht Launchern eine tiefe Integration mit Modrinth. Du kannst Modrinth über <link>unsere eigene App</link> sowie einige der beliebtesten Launcher wie ATLauncher, MultiMC und Prism Launcher nutzen."
@@ -1137,10 +1137,10 @@
     "message": "Der Ort für Minecraft {content}"
   },
   "landing.heading.the-place-for-minecraft.data-packs": {
-    "message": "Datapacks"
+    "message": "Datenpakete"
   },
   "landing.heading.the-place-for-minecraft.modpacks": {
-    "message": "Modpack"
+    "message": "Modpacks"
   },
   "landing.heading.the-place-for-minecraft.mods": {
     "message": "Mods"
@@ -1149,7 +1149,7 @@
     "message": "Plugins"
   },
   "landing.heading.the-place-for-minecraft.resource-packs": {
-    "message": "Ressourcenpaket"
+    "message": "Ressourcenpakete"
   },
   "landing.heading.the-place-for-minecraft.servers": {
     "message": "Server"
@@ -1176,7 +1176,7 @@
     "message": "Benachrichtigungen"
   },
   "landing.notifications.received-time": {
-    "message": "Empfangen {time}"
+    "message": "Erhalten {time}"
   },
   "landing.notifications.version-released": {
     "message": "Version {version} wurde für die {gameVersion} veröffentlicht"
@@ -1194,7 +1194,7 @@
     "message": "Gib deinen Kreationen ein Online-Zuhause und erreiche ein riesiges Publikum engagierter Spieler."
   },
   "landing.section.for-creators.label": {
-    "message": "Für Creator"
+    "message": "Für Ersteller"
   },
   "landing.section.for-creators.tagline": {
     "message": "Teile deine Inhalte mit der Welt"
@@ -1218,7 +1218,7 @@
     "message": "Erstellen..."
   },
   "layout.action.file-lookup": {
-    "message": "Datei anschauen"
+    "message": "Dateisuche"
   },
   "layout.action.lookup-by-email": {
     "message": "Mit E-Mail nachschauen"
@@ -1248,7 +1248,7 @@
     "message": "Dein Avatar"
   },
   "layout.banner.account-action": {
-    "message": "Account Aktionen Benötigt"
+    "message": "Konto-Aktion benötigt"
   },
   "layout.banner.add-email.button": {
     "message": "Kontoeinstellungen besuchen"
@@ -1266,16 +1266,16 @@
     "message": "Die Staging-Umgebung ist vollständig von der Modrinth Produktionsdatenbank getrennt. Sie wird zu Test- und Debugging-Zwecken verwendet und kann Entwicklungsversionen des Modrinth Backends oder -Frontends ausführen, die neuer sind als die Produktionsinstanz."
   },
   "layout.banner.staging.title": {
-    "message": "Du schaust dir die Modrinth Staging Umgebung an"
+    "message": "Du schaust dir die Modrinth Staging-Umgebung an"
   },
   "layout.banner.subscription-payment-failed.button": {
-    "message": "Aktualisiere Zahlungsinformationen"
+    "message": "Zahlungsinformationen aktualisieren"
   },
   "layout.banner.subscription-payment-failed.description": {
     "message": "Ein oder mehrere Abonnements konnten nicht verlängert werden. Bitte aktualisiere deine Zahlungsmethode, um den Zugriff nicht zu verlieren!"
   },
   "layout.banner.subscription-payment-failed.title": {
-    "message": "Zahlungs-Aktion benötigt."
+    "message": "Zahlungsaktion benötigt."
   },
   "layout.banner.tax.action": {
     "message": "Steuerformular ausfüllen"
@@ -1287,7 +1287,7 @@
     "message": "Steuerformular erforderlich"
   },
   "layout.banner.tin-mismatch.action": {
-    "message": "Support Kontaktieren"
+    "message": "Support kontaktieren"
   },
   "layout.banner.tin-mismatch.description": {
     "message": "Deine Abbuchungen sind vorübergehend blockiert, da deine TIN oder SSN nicht mit IRS-Aufzeichnungen übereinstimmt. Bitte kontaktiere den Support, um dein Steuerformular zurückzusetzen und erneut zu übermitteln."
@@ -1305,10 +1305,10 @@
     "message": "Über"
   },
   "layout.footer.about.careers": {
-    "message": "Karriere"
+    "message": "Karrieren"
   },
   "layout.footer.about.changelog": {
-    "message": "Änderungsprotokoll"
+    "message": "Änderungen"
   },
   "layout.footer.about.news": {
     "message": "Neuigkeiten"
@@ -1344,10 +1344,10 @@
     "message": "Nutzungsbedingungen"
   },
   "layout.footer.modrinth-information": {
-    "message": "Modrinth Informationen"
+    "message": "Informationen zu Modrinth"
   },
   "layout.footer.open-source": {
-    "message": "Modrinth ist <github-link>Open Source</github-link>."
+    "message": "Modrinth ist <github-link>quelloffen</github-link>."
   },
   "layout.footer.products": {
     "message": "Produkte"
@@ -1365,10 +1365,10 @@
     "message": "Ressourcen"
   },
   "layout.footer.resources.api-docs": {
-    "message": "API Dokumentation"
+    "message": "API-Dokumentation"
   },
   "layout.footer.resources.help-center": {
-    "message": "Hilfezentrum"
+    "message": "Hilfecenter"
   },
   "layout.footer.resources.report-issues": {
     "message": "Fehler melden"
@@ -1389,7 +1389,7 @@
     "message": "Mastodon"
   },
   "layout.footer.social.x": {
-    "message": "Twitter (X)"
+    "message": "X"
   },
   "layout.menu-toggle.action": {
     "message": "Menü umschalten"
@@ -1410,7 +1410,7 @@
     "message": "Aktive Meldungen"
   },
   "layout.nav.analytics": {
-    "message": "Analytik"
+    "message": "Analysen"
   },
   "layout.nav.discover": {
     "message": "Entdecken"
@@ -1461,7 +1461,7 @@
     "message": "Auf Modrinth+ upgraden"
   },
   "moderation.filter.by": {
-    "message": "Sortiert bei"
+    "message": "Filtern nach"
   },
   "moderation.moderate": {
     "message": "Moderieren"
@@ -1473,7 +1473,7 @@
     "message": "Meldungen"
   },
   "moderation.page.technicalReview": {
-    "message": "Technische Rezension"
+    "message": "Technische Überprüfung"
   },
   "moderation.search.placeholder": {
     "message": "Suche..."
@@ -1752,10 +1752,10 @@
     "message": "Überprüfe deine Wallet-Adresse. An eine falsche Adresse gesendete Gelder können nicht wiederhergestellt werden."
   },
   "profile.bio.fallback.creator": {
-    "message": "Ein Modrinth Ersteller."
+    "message": "Ein Modrinth-Ersteller."
   },
   "profile.bio.fallback.user": {
-    "message": "Ein Modrinth Nutzer."
+    "message": "Ein Modrinth-Benutzer."
   },
   "profile.button.billing": {
     "message": "Verwalte Nutzer Zahlungen"
@@ -1764,7 +1764,7 @@
     "message": "Rolle ändern"
   },
   "profile.button.info": {
-    "message": "Schaue Nutzerdetails an"
+    "message": "Nutzerdetails ansehen"
   },
   "profile.button.manage-projects": {
     "message": "Projekte verwalten"
@@ -1839,7 +1839,7 @@
     "message": "{count} {count, plural, one {Projekt} other {Projekte}}"
   },
   "profile.label.saving": {
-    "message": "Speichern..."
+    "message": "Speichert..."
   },
   "profile.label.yes": {
     "message": "Ja"
@@ -1854,7 +1854,7 @@
     "message": "{count, plural, one {{count}} other {{count}}} Projekt Follower"
   },
   "profile.user-id": {
-    "message": "Nutzer ID: {id}"
+    "message": "Benutzer ID: {id}"
   },
   "project-member-header.accept": {
     "message": "Akzeptieren"
@@ -1866,10 +1866,10 @@
     "message": "Fehler"
   },
   "project-member-header.error-decline": {
-    "message": "Ablehnen der Team-Einladung fehlgeschlagen"
+    "message": "Teameinladung konnte nicht abgelehnt werden"
   },
   "project-member-header.error-join": {
-    "message": "Annehmen der Team-Einladung fehlgeschlagen"
+    "message": "Teameinladung konnte nicht angenommen werden"
   },
   "project-member-header.invitation-no-role": {
     "message": "Du wurdest eingeladen diesem Projekt beizutreten. Bitte nimm die Einladung an oder lehne sie ab."
@@ -1878,7 +1878,7 @@
     "message": "Einladung einem Projekt beizutreten"
   },
   "project-member-header.invitation-with-role": {
-    "message": "Du wurdest dazu eingeladen, ein Mitglied von diesem Projekt mit der Rolle \"{role}\" zu sein."
+    "message": "Du wurdest eingeladen, Mitglied dieses Projekts mit der Rolle \"{role}\" zu werden."
   },
   "project-member-header.success": {
     "message": "Erfolg"
@@ -1896,19 +1896,19 @@
     "message": "Erforderlich"
   },
   "project-moderation-nags.resubmit-for-review": {
-    "message": "Erneut zur Überprüfung einsenden"
+    "message": "Erneut zur Überprüfung einreichen"
   },
   "project-moderation-nags.resubmit-for-review-desc": {
-    "message": "Dein Projekt wurde vom Modrinth-Team {status, select, rejected {abgelehnt} withheld {zurückgehalten} other {{status}}}."
+    "message": "Dein Projekt wurde vom Modrinth-Team {status, select, rejected {abgelehnt} withheld {zurückgehalten} other {{status}}}. In der Regel hast du die Möglichkeit, es nach Umsetzung der Anmerkungen erneut einzureichen."
   },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Du musst erst die benötigten Schritte aus der Veröffentlichungsliste abschließen!"
   },
   "project-moderation-nags.submit-for-review": {
-    "message": "Zur Überprüfung einsenden"
+    "message": "Zur Überprüfung einreichen"
   },
   "project-moderation-nags.submit-for-review-button": {
-    "message": "Zur Überprüfung einsenden"
+    "message": "Zur Überprüfung einreichen"
   },
   "project-moderation-nags.submit-for-review-desc": {
     "message": "Dein Projekt kann nur von Mitgliedern dieses Projektes gesehen werden. Es muss erst von der Moderation bestätigt werden, damit es öffentlich zugänglich ist."
@@ -1929,10 +1929,10 @@
     "message": "Kollektion"
   },
   "project-type.datapack.plural": {
-    "message": "Data Pakete"
+    "message": "Datenpakete"
   },
   "project-type.datapack.singular": {
-    "message": "Data Paket"
+    "message": "Datenpaket"
   },
   "project-type.mod.plural": {
     "message": "Mods"
@@ -1971,13 +1971,13 @@
     "message": "Shader"
   },
   "project.about.details.created": {
-    "message": "Erstellt vor {date}"
+    "message": "Erstellt {date}"
   },
   "project.about.details.licensed": {
     "message": "Lizenziert {license}"
   },
   "project.about.details.published": {
-    "message": "Veröffentlicht am {date}"
+    "message": "Veröffentlicht {date}"
   },
   "project.about.details.submitted": {
     "message": "Veröffentlicht am {date}"
@@ -1986,7 +1986,7 @@
     "message": "Details"
   },
   "project.about.details.updated": {
-    "message": "Aktualisiert vor {date}"
+    "message": "Aktualisiert {date}"
   },
   "project.actions.create-server": {
     "message": "Erstelle einen Server"
@@ -1995,13 +1995,13 @@
     "message": "Erstelle einen Server"
   },
   "project.actions.dont-show-again": {
-    "message": "Nicht noch mal anzeigen"
+    "message": "Nicht erneut anzeigen"
   },
   "project.actions.review-project": {
     "message": "Projekt überprüfen"
   },
   "project.actions.servers-promo.description": {
-    "message": "Modrinth Server ist der einfachste Weg mit deinen Freunden ohne Aufwand zu spielen!"
+    "message": "Modrinth Servers ist der einfachste Weg, ohne Aufwand mit deinen Freunden zu spielen!"
   },
   "project.actions.servers-promo.pricing": {
     "message": "Ab {price}<small> / Monat</small>"
@@ -2019,46 +2019,46 @@
     "message": "Beschreibung"
   },
   "project.details.licensed": {
-    "message": "Lizensiert"
+    "message": "Lizenziert unter"
   },
   "project.download.game-version": {
-    "message": "Spiel Version: {version}"
+    "message": "Spielversion: {version}"
   },
   "project.download.game-version-error": {
-    "message": "Fehler: keine Spielversion gefunden"
+    "message": "Fehler: Keine Spielversion gefunden"
   },
   "project.download.game-version-tooltip": {
     "message": "{title} ist nur für {version} verfügbar"
   },
   "project.download.game-version-unsupported-tooltip": {
-    "message": "{title} Unterstützt nicht {gameVersion} für {platform}"
+    "message": "{title} unterstützt {gameVersion} für {platform} nicht"
   },
   "project.download.install-with-app": {
-    "message": "Mit der Modrinth App installieren"
+    "message": "Mit Modrinth App installieren"
   },
   "project.download.no-app": {
-    "message": "Hast du die Modrinth App nicht?"
+    "message": "Du hast die Modrinth App nicht?"
   },
   "project.download.no-versions-available": {
-    "message": "Keine Versionen für {gameVersion} und {platform} gefunden."
+    "message": "Keine Versionen für {gameVersion} und {platform} verfügbar."
   },
   "project.download.platform": {
     "message": "Plattform: {platform}"
   },
   "project.download.platform-error": {
-    "message": "Fehler: keine Plattform gefunden"
+    "message": "Fehler: Keine Platform gefunden"
   },
   "project.download.platform-tooltip": {
     "message": "{title} ist nur für {platform} verfügbar"
   },
   "project.download.platform-unsupported-tooltip": {
-    "message": "{title} unterstützt nicht {platform} für die {gameVersion}"
+    "message": "{title} unterstützt {platform} für die {gameVersion} nicht"
   },
   "project.download.search-game-versions": {
-    "message": "Suche nach Spielversionen..."
+    "message": "Spielversionen durchsuchen..."
   },
   "project.download.search-game-versions-label": {
-    "message": "Suche nach Spielversionen..."
+    "message": "Spielversionen durchuschen..."
   },
   "project.download.select-game-version": {
     "message": "Spielversion auswählen"
@@ -2076,10 +2076,10 @@
     "message": "Wir haben gerade das Umgebungssystem auf Modrinth überarbeitet und es stehen nun neue Optionen zur Verfügung. Du hast keine Berechtigung, diese Einstellungen zu ändern, aber bitte informiere andere Mitglieder des Projekts darüber, dass die Metadaten der Umgebung überprüft werden müssen."
   },
   "project.environment.migration-no-permission.title": {
-    "message": "Umgebungs-Metadaten müssen überprüft werden"
+    "message": "Umgebungsmetadaten müssen überprüft werden"
   },
   "project.environment.migration.learn-more": {
-    "message": "Lerne mehr über diese Änderung"
+    "message": "Erfahre mehr über diese Änderung"
   },
   "project.environment.migration.message": {
     "message": "Wir haben das Umgebungssystem auf Modrinth gerade überarbeitet, und neue Optionen sind jetzt verfügbar. Bitte besuche die Einstellungen deines Projekts und verifiziere, das die Metadaten korrekt sind."
@@ -2088,10 +2088,10 @@
     "message": "Umgebungseinstellungen überprüfen"
   },
   "project.environment.migration.title": {
-    "message": "Bitte die Umgebungs-Metadaten überprüfen"
+    "message": "Bitte die Umgebungsmetadaten überprüfen"
   },
   "project.error.loading": {
-    "message": "Fehler beim Laden der Projekt daten {message}"
+    "message": "Fehler beim laden der Projektdaten{message}"
   },
   "project.error.page-not-found": {
     "message": "Die Seite konnte nicht gefunden werden"
@@ -2115,7 +2115,7 @@
     "message": "Moderation"
   },
   "project.navigation.changelog": {
-    "message": "Änderungsprotokoll"
+    "message": "Änderungen"
   },
   "project.notification.icon-updated.message": {
     "message": "Dein Projekticon wurde aktualisiert."
@@ -2133,7 +2133,7 @@
     "message": "Es fehlen Umgebungs-Metadaten in deinem Projekt. Bitte wähle unten die passende Option aus."
   },
   "project.settings.environment.notice.missing-env.title": {
-    "message": "Bitte wähle eine Umgebung aus für dein Projekt"
+    "message": "Bitte wähle eine Umgebung für dein Projekt"
   },
   "project.settings.environment.notice.multiple-environments.description": {
     "message": "Verschiedene Versionen von deinem Projekt haben unterschiedliche Umgebungen ausgewählt, daher kannst du sie derzeit nicht global bearbeiten."
@@ -2154,7 +2154,7 @@
     "message": "Dieser Projekttyp unterstützt keine Umgebungs-Metadaten"
   },
   "project.settings.environment.verification.verify-button": {
-    "message": "Verifiziere"
+    "message": "Bestätigen"
   },
   "project.settings.environment.verification.verify-text": {
     "message": "Verifiziere, dass die Projektumgebung korrekt ausgewählt ist."
@@ -2163,19 +2163,19 @@
     "message": "Vermeide Präfixe, Suffixe, Klammern oder zusätzliche Beschreibungen—nur der tatsächliche Projektname."
   },
   "project.settings.general.name.placeholder.1": {
-    "message": "z.B. Nether Überarbeitung 2"
+    "message": "z.B. Nether Overhaul 2"
   },
   "project.settings.general.name.placeholder.2": {
-    "message": "z.B. Bau Ausrüstung"
+    "message": "z.B. Construction Equipment"
   },
   "project.settings.general.name.placeholder.3": {
-    "message": "z.B. Besser als Caving"
+    "message": "z.B. Better than Caving"
   },
   "project.settings.general.name.placeholder.4": {
-    "message": "z.B. Erweiterte Portale"
+    "message": "z.B. Enhanced Portals"
   },
   "project.settings.general.name.placeholder.5": {
-    "message": "z.B. Gefährliche Mobs"
+    "message": "z.B. Dangerous Mobs"
   },
   "project.settings.general.name.title": {
     "message": "Name"
@@ -2184,19 +2184,19 @@
     "message": "Fasse dein Projekt in höchstens einem Satz zusammen."
   },
   "project.settings.general.tagline.placeholder.1": {
-    "message": "z.B. Überarbeitet den Spielfortschritt, sodass er sich um den Nether dreht."
+    "message": "z.B. Overhauls game progression to revolve around the Nether."
   },
   "project.settings.general.tagline.placeholder.2": {
-    "message": "z.B. Fügt tragbare Bauausrüstung hinzu."
+    "message": "z.B. Adds wearable construction gear."
   },
   "project.settings.general.tagline.placeholder.3": {
-    "message": "z.B. Fügt realistische Mechaniken zum Bau von Minenschächten hinzu."
+    "message": "z.B. Adds realistic mineshaft-building mechanics."
   },
   "project.settings.general.tagline.placeholder.4": {
-    "message": "z.B. Verbessert die Verbindung zwischen Nether Portalen."
+    "message": "z.B. Improves how Nether portals link to each other."
   },
   "project.settings.general.tagline.placeholder.5": {
-    "message": "z.B. Fügt mächtige Boss Versionen der normalen Mobs hinzu, denen man nachts begegnen kann."
+    "message": "z.B. Adds powerful boss versions of the normal mobs to encounter in the night."
   },
   "project.settings.general.tagline.title": {
     "message": "Slogan"
@@ -2229,7 +2229,7 @@
     "message": "Versionen"
   },
   "report.already-reported": {
-    "message": "Du hast {title} bereits Reported"
+    "message": "Du hast {title} bereits gemeldet"
   },
   "report.already-reported-description": {
     "message": "Du hast bereits einen offenen Report für {item}. Du kannst weitere Details zu Deinem Report Hinzufügen, wenn Du weitere Informationen hast."
@@ -2241,7 +2241,7 @@
     "message": "Füge nach Möglichkeit und Relevanz Links und Bilder ein. Leere oder unzureichende Berichte werden geschlossen und ignoriert."
   },
   "report.body.title": {
-    "message": "Bitte gib uns mehr Kontext über deinen Report"
+    "message": "Bitte gib weiteren Kontext über deine Meldung"
   },
   "report.checking": {
     "message": "Überprüfe {item}..."
@@ -2259,19 +2259,19 @@
     "message": "Dieses Formular ist nicht für:"
   },
   "report.go-to-report": {
-    "message": "Gehe zum Report"
+    "message": "Gehe zur Meldung"
   },
   "report.not-for.bug-reports": {
-    "message": "Bug Reports"
+    "message": "Fehlermeldungen"
   },
   "report.not-for.bug-reports.description": {
     "message": "Du kannst Bugs reporten zu deren <issues-link>Problem Tracker</issues-link>."
   },
   "report.not-for.dmca": {
-    "message": "DMCA takedowns"
+    "message": "DMCA-Abmahnungen"
   },
   "report.not-for.dmca.description": {
-    "message": "Schaue unsere <policy-link>Urheberrechtsrichtlinie</policy-link>."
+    "message": "Schau dir unsere <policy-link>Urheberrechtsrichtlinie</policy-link> an."
   },
   "report.note.copyright.1": {
     "message": "Bitte beachte, dass du *keinen* DMCA-Antrag auf Entfernung einreichst, sondern vielmehr einen Bericht über erneut hochgeladene Inhalte."
@@ -2286,7 +2286,7 @@
     "message": "Zusammenfassungen von Microsoft Defender, VirusTotal oder KI-Virus-Detektoren sind keine ausreichenden Beweise und werden nicht akzeptiert."
   },
   "report.please-report": {
-    "message": "Bitte Reporte:"
+    "message": "Bitte melde:"
   },
   "report.question.content-id": {
     "message": "Was ist die ID von dem {item}?"
@@ -2307,10 +2307,10 @@
     "message": "Meldung einreichen"
   },
   "scopes.analytics.description": {
-    "message": "Zugriff auf Analysedaten"
+    "message": "Auf deine Analysedaten zugreifen"
   },
   "scopes.analytics.label": {
-    "message": "Analysen lesen"
+    "message": "Analysen einsehen"
   },
   "scopes.collectionCreate.description": {
     "message": "Kollektionen erstellen"
@@ -2325,52 +2325,52 @@
     "message": "Kollektionen löschen"
   },
   "scopes.collectionRead.description": {
-    "message": "Kollektionen lesen"
+    "message": "Kollektionen einsehen"
   },
   "scopes.collectionRead.label": {
-    "message": "Kollektionen lesen"
+    "message": "Kollektionen einsehen"
   },
   "scopes.collectionWrite.description": {
-    "message": "In Kollektionen schreiben"
+    "message": "Kollektionen bearbeiten"
   },
   "scopes.collectionWrite.label": {
-    "message": "In Kollektionen schreiben"
+    "message": "Kollektionen bearbeiten"
   },
   "scopes.notificationRead.description": {
-    "message": "Benachrichtigungen lesen"
+    "message": "Deine Benachrichtigungen einsehen"
   },
   "scopes.notificationRead.label": {
-    "message": "Benachrichtigungen lesen"
+    "message": "Benachrichtigungen einsehen"
   },
   "scopes.notificationWrite.description": {
-    "message": "Benachrichtigungen lesen/löschen"
+    "message": "Deine Benachrichtigungen einsehen/löschen"
   },
   "scopes.notificationWrite.label": {
-    "message": "Benachrichtigungen schreiben"
+    "message": "Benachrichtigungen verwalten"
   },
   "scopes.organizationCreate.description": {
-    "message": "Organisation erstellen"
+    "message": "Organisationen erstellen"
   },
   "scopes.organizationCreate.label": {
-    "message": "Organisation erstellen"
+    "message": "Organisationen erstellen"
   },
   "scopes.organizationDelete.description": {
-    "message": "Organisation löschen"
+    "message": "Organisationen löschen"
   },
   "scopes.organizationDelete.label": {
-    "message": "Organisation löschen"
+    "message": "Organisationen löschen"
   },
   "scopes.organizationRead.description": {
-    "message": "Organisationen lesen"
+    "message": "Organisationen einsehen"
   },
   "scopes.organizationRead.label": {
-    "message": "Organisationen lesen"
+    "message": "Organisationen einsehen"
   },
   "scopes.organizationWrite.description": {
-    "message": "In Organisationen schreiben"
+    "message": "Organisationen bearbeiten"
   },
   "scopes.organizationWrite.label": {
-    "message": "In Organisationen schreiben"
+    "message": "Organisationen bearbeiten"
   },
   "scopes.patCreate.description": {
     "message": "Persönliche API-Tokens erstellen"
@@ -2379,34 +2379,34 @@
     "message": "PATs erstellen"
   },
   "scopes.patDelete.description": {
-    "message": "Persönliche API-Tokens löschen"
+    "message": "Deine persönlichen API-Tokens löschen"
   },
   "scopes.patDelete.label": {
     "message": "PATs löschen"
   },
   "scopes.patRead.description": {
-    "message": "Erstellte API-Tokens anzeigen"
+    "message": "Erstellte API-Tokens einsehen"
   },
   "scopes.patRead.label": {
-    "message": "PATs lesen"
+    "message": "PATs einsehen"
   },
   "scopes.patWrite.description": {
     "message": "Persönliche API-Tokens bearbeiten"
   },
   "scopes.patWrite.label": {
-    "message": "PATs schreiben"
+    "message": "PATs bearbeiten"
   },
   "scopes.payoutsRead.description": {
-    "message": "Auszahlungsdaten lesen"
+    "message": "Deine Auszahlungsdaten einsehen"
   },
   "scopes.payoutsRead.label": {
-    "message": "Auszahlungen lesen"
+    "message": "Auszahlungen einsehen"
   },
   "scopes.payoutsWrite.description": {
     "message": "Geld auszahlen"
   },
   "scopes.payoutsWrite.label": {
-    "message": "Auszahlungen schreiben"
+    "message": "Auszahlungen verwalten"
   },
   "scopes.performAnalytics.description": {
     "message": "Analyseaktionen ausführen"
@@ -2415,25 +2415,25 @@
     "message": "Analysen durchführen"
   },
   "scopes.projectCreate.description": {
-    "message": "Neue Projekt erstellen"
+    "message": "Neue Projekte erstellen"
   },
   "scopes.projectCreate.label": {
-    "message": "Projekt erstellen"
+    "message": "Projekte erstellen"
   },
   "scopes.projectDelete.description": {
-    "message": "Dein Projekt löschen"
+    "message": "Deine Projekte löschen"
   },
   "scopes.projectDelete.label": {
-    "message": "Projekt löschen"
+    "message": "Projekte löschen"
   },
   "scopes.projectRead.description": {
-    "message": "Alle deine Projekte lesen"
+    "message": "Alle deine Projekte einsehen"
   },
   "scopes.projectRead.label": {
-    "message": "Projekte lesen"
+    "message": "Projekte einsehen"
   },
   "scopes.projectWrite.description": {
-    "message": "In Projektdaten schreiben"
+    "message": "Projektdaten bearbeiten"
   },
   "scopes.projectWrite.label": {
     "message": "Projekte schreiben"
@@ -2451,10 +2451,10 @@
     "message": "Meldungen löschen"
   },
   "scopes.reportRead.description": {
-    "message": "Meldungen lesen"
+    "message": "Meldungen einsehen"
   },
   "scopes.reportRead.label": {
-    "message": "Meldungen lesen"
+    "message": "Meldungen einsehen"
   },
   "scopes.reportWrite.description": {
     "message": "Meldungen bearbeiten"
@@ -2481,13 +2481,13 @@
     "message": "Sitzungen lesen"
   },
   "scopes.threadRead.description": {
-    "message": "Beiträge lesen"
+    "message": "Beiträge einsehen"
   },
   "scopes.threadRead.label": {
-    "message": "Beiträge lesen"
+    "message": "Beiträge einsehen"
   },
   "scopes.threadWrite.description": {
-    "message": "In Threads schreiben"
+    "message": "Beiträge bearbeiten"
   },
   "scopes.threadWrite.label": {
     "message": "Beiträge schreiben"
@@ -2496,7 +2496,7 @@
     "message": "Deine Authentifizierungsdaten ändern"
   },
   "scopes.userAuthWrite.label": {
-    "message": "Authentifizierungsdaten schreiben"
+    "message": "Authentifizierungsdaten bearbeiten"
   },
   "scopes.userDelete.description": {
     "message": "Dein Konto löschen"
@@ -2505,22 +2505,22 @@
     "message": "Dein Konto löschen"
   },
   "scopes.userRead.description": {
-    "message": "Auf Ihre öffentlichen Profilinformationen zugreifen"
+    "message": "Auf deine öffentlichen Profilinformationen zugreifen"
   },
   "scopes.userRead.label": {
-    "message": "Benutzerdaten lesen"
+    "message": "Benutzerdaten einsehen"
   },
   "scopes.userReadEmail.description": {
-    "message": "Deine E-Mail lesen"
+    "message": "Deine E-Mail einsehen"
   },
   "scopes.userReadEmail.label": {
-    "message": "Benutzer-E-Mail lesen"
+    "message": "Benutzer E-Mail einsehen"
   },
   "scopes.userWrite.description": {
-    "message": "In dein Profil schreiben"
+    "message": "Dein Profil bearbeiten"
   },
   "scopes.userWrite.label": {
-    "message": "Benutzerdaten schreiben"
+    "message": "Benutzerdaten bearbeiten"
   },
   "scopes.versionCreate.description": {
     "message": "Neue Versionen erstellen"
@@ -2529,7 +2529,7 @@
     "message": "Versionen erstellen"
   },
   "scopes.versionDelete.description": {
-    "message": "Version löschen"
+    "message": "Eine Version löschen"
   },
   "scopes.versionDelete.label": {
     "message": "Versionen löschen"
@@ -2541,19 +2541,19 @@
     "message": "Versionen einsehen"
   },
   "scopes.versionWrite.description": {
-    "message": "Versions-Daten schreiben"
+    "message": "Versionsdaten bearbeiten"
   },
   "scopes.versionWrite.label": {
-    "message": "Versionen Auswählen"
+    "message": "Versionen bearbeiten"
   },
   "search.filter.locked.server": {
-    "message": "Vom Server bereitgestellt"
+    "message": "Vom Server vorgegeben"
   },
   "search.filter.locked.server-game-version.title": {
-    "message": "Die Spielversion wird vom Server bereitgestellt"
+    "message": "Die Spielversion wird vom Server vorgegeben"
   },
   "search.filter.locked.server-loader.title": {
-    "message": "Der Loader wird vom Server bereitgestellt"
+    "message": "Loader wird vom Server vorgegeben"
   },
   "search.filter.locked.server.sync": {
     "message": "Mit Server synchronisieren"
@@ -2571,7 +2571,7 @@
     "message": "Erstelle Sicherung..."
   },
   "servers.backups.item.failed-to-create-backup": {
-    "message": "Erstellung der Sicherung ist fehlgeschlagen"
+    "message": "Sicherung konnte nicht erstellt werden"
   },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Wiederherstellung aus der Sicherung fehlgeschlagen"
@@ -2592,7 +2592,7 @@
     "message": "Wiederherstellen"
   },
   "servers.backups.item.restoring-backup": {
-    "message": "Backup wird geladen..."
+    "message": "Stellt aus Sicherung wieder her..."
   },
   "servers.backups.item.retry": {
     "message": "Erneut versuchen"
@@ -2622,13 +2622,13 @@
     "message": "Nicht entfernbar"
   },
   "servers.notices.create-notice": {
-    "message": "Erstelle Notizen"
+    "message": "Mitteilung erstellen"
   },
   "servers.notices.no-notices": {
-    "message": "Keine Notizen"
+    "message": "Keine Mitteilungen"
   },
   "servers.plan.large.description": {
-    "message": "Ideal für 15 bis 25 Spieler, Modpacks oder umfangreiche Modpacks."
+    "message": "Ideal für 15–25 Spieler, Modpacks oder intensives Modding."
   },
   "servers.plan.large.name": {
     "message": "Groß"
@@ -2646,16 +2646,16 @@
     "message": "Klein"
   },
   "settings.billing.modal.cancel.action": {
-    "message": "Abo Kündigen"
+    "message": "Abonnement kündigen"
   },
   "settings.billing.modal.cancel.description": {
     "message": "Dadurch wird dein Abonnement gekündigt. Du behältst deine Vorteile bis zum Ende des aktuellen Abrechnungszeitraums."
   },
   "settings.billing.modal.cancel.title": {
-    "message": "Bist du dir sicher das Abo zu kündigen?"
+    "message": "Bist du sicher, dass du dein Abonnement kündigen möchtest?"
   },
   "settings.billing.modal.delete.action": {
-    "message": "Zahlungsmethode entfernen"
+    "message": "Diese Zahlungsmethode entfernen"
   },
   "settings.billing.modal.delete.description": {
     "message": "Das löscht die Zahlungsmethode für immer (Wirklich für immer)."
@@ -2667,25 +2667,25 @@
     "message": "Zahlungsmethode hinzufügen"
   },
   "settings.billing.payment_method.action.history": {
-    "message": "Vergangene Änderungen ansehen"
+    "message": "Vorherige Änderungen ansehen"
   },
   "settings.billing.payment_method.action.primary": {
     "message": "Als primär festlegen"
   },
   "settings.billing.payment_method.card_display": {
-    "message": "{card_brand} endet in {last_four}"
+    "message": "{card_brand} mit Endung {last_four}"
   },
   "settings.billing.payment_method.card_expiry": {
     "message": "Läuft ab in {month}/{year}"
   },
   "settings.billing.payment_method.none": {
-    "message": "Du hast keine Zahlungsmethode hinzugefügt."
+    "message": "Du hast noch keine Zahlungsmethoden hinzugefügt."
   },
   "settings.billing.payment_method.primary": {
     "message": "Bevorzugte Zahlungsmethode"
   },
   "settings.billing.payment_method.title": {
-    "message": "Zahlungsmethode"
+    "message": "Zahlungsmethoden"
   },
   "settings.billing.payment_method_type.amazon_pay": {
     "message": "Amazon Pay"
@@ -2727,7 +2727,7 @@
     "message": "Verwalte deine Modrinth Server-Abonnements."
   },
   "settings.billing.pyro_subscription.title": {
-    "message": "Modrinth-Server-Abonnements"
+    "message": "Modrinth Server-Abonnements"
   },
   "settings.billing.subscription.description": {
     "message": "Verwalte deine Modrinth-Abonnements."
@@ -2769,7 +2769,7 @@
     "message": "Shader-Seite"
   },
   "settings.display.project-list-layouts.title": {
-    "message": "Projektlisten-Layouts"
+    "message": "Layouts für Projektlisten"
   },
   "settings.display.project-list-layouts.user": {
     "message": "Benutzerprofilseiten"
@@ -2793,7 +2793,7 @@
     "message": "Versteckt die \"Modrinth App herunterladen\"-Schaltflächen aus der Hauptnavigation. Die Seite der Modrinth App kann immer noch auf der Startseite oder in der Fußzeile gefunden werden."
   },
   "settings.display.sidebar.hide-app-promos.title": {
-    "message": "Modrinth App Werbung ausblenden"
+    "message": "Werbungen für die Modrinth App ausblenden"
   },
   "settings.display.sidebar.left-aligned-content-sidebar.title": {
     "message": "Linksbündige Seitenleiste auf Inhaltsseiten"
@@ -2823,7 +2823,7 @@
     "message": "Experimentelle Sprachen"
   },
   "settings.language.categories.fun": {
-    "message": "Spaß Sprachen"
+    "message": "Scherzsprachen"
   },
   "settings.language.categories.search-result": {
     "message": "Suchergebnisse"
@@ -2835,25 +2835,25 @@
     "message": "Mit der Systemsprache synchronisieren"
   },
   "settings.language.languages.language-label-applying": {
-    "message": "{label}. Anwenden..."
+    "message": "{label} Wende an..."
   },
   "settings.language.languages.language-label-error": {
     "message": "{label}. Fehler"
   },
   "settings.language.languages.load-failed": {
-    "message": "Diese Sprache kann nicht geladen werden. Versuche es bald erneut."
+    "message": "Diese Sprache kann nicht geladen werden. Versuche es später erneut."
   },
   "settings.language.languages.search-field.description": {
-    "message": "Das erste Suchergebnis als Fokus festlegen"
+    "message": "Drücke Enter um das erste Suchergebnis zu fokusieren"
   },
   "settings.language.languages.search-field.placeholder": {
-    "message": "Suche nach einer Sprache..."
+    "message": "Nach Sprache suchen..."
   },
   "settings.language.languages.search-results-announcement": {
     "message": "{matches, plural, =0 {Keine Sprache gefunden} one {# Sprache gefunden} other {# Sprachen gefunden}} für deine Suche."
   },
   "settings.language.languages.search.no-results": {
-    "message": "Es wurden keine Sprachen gefunden, die deiner Suche entsprechen."
+    "message": "Keine Sprache entspricht deiner Suche."
   },
   "settings.language.warning": {
     "message": "Das Ändern der Sprache kann dazu führen, dass in bestimmten Sprachen einige Inhalte auf Englisch angezeigt werden, da die Seite noch nicht vollständig übersetzt wurde. Wir arbeiten daran, unser Lokalisierungssystem zu verbessern, sodass Inhalte gelegentlich fehlerhaft dargestellt werden können."
@@ -2895,13 +2895,13 @@
     "message": "Token bearbeiten"
   },
   "settings.pats.token.action.revoke": {
-    "message": "Token zurückrufen und invalidieren"
+    "message": "Token widerrufen"
   },
   "settings.pats.token.expired-ago": {
     "message": "Abgelaufen {ago}"
   },
   "settings.pats.token.expires-in": {
-    "message": "Gültig bis {inTime}"
+    "message": "Läuft ab {inTime}"
   },
   "settings.pats.token.last-used": {
     "message": "Zuletzt verwendet {ago}"
@@ -2913,7 +2913,7 @@
     "message": "Eine kurze Beschreibung, um allen ein wenig über dich zu erzählen."
   },
   "settings.profile.bio.title": {
-    "message": "Biografie"
+    "message": "Bio"
   },
   "settings.profile.description": {
     "message": "Deine Profilinformationen sind auf Modrinth und über die <docs-link>Modrinth-API</docs-link> öffentlich einsehbar."
@@ -2934,19 +2934,19 @@
     "message": "Nutzername"
   },
   "settings.sessions.action.revoke-session": {
-    "message": "Sitzung abbrechen"
+    "message": "Sitzung widerrufen"
   },
   "settings.sessions.created-ago": {
-    "message": "Erstellt vor {ago}"
+    "message": "Erstellt {ago}"
   },
   "settings.sessions.current-session": {
     "message": "Aktuelle Sitzung"
   },
   "settings.sessions.description": {
-    "message": "Hier findest du alle Geräte, die derzeit mit deinem Modrinth-Konto angemeldet sind. Du kannst dich von jedem einzelnen Gerät abmelden.\n\nWenn du einen Eintrag siehst, den du nicht erkennst, melde dich von diesem Gerät ab und ändere sofort das Passwort deines Modrinth-Kontos."
+    "message": "Hier findest du alle Geräte, die derzeit mit deinem Modrinth-Konto angemeldet sind. Du kannst dich von jedem einzelnen Gerät abmelden.\n\nFalls du einen Eintrag siehst, den du nicht kennst, melde dich von diesem Gerät ab und ändere sofort das Passwort deines Modrinth-Kontos."
   },
   "settings.sessions.last-accessed-ago": {
-    "message": "Zuletzt aufgerufen vor {ago}"
+    "message": "Zuletzt aufgerufen {ago}"
   },
   "settings.sessions.unknown-os": {
     "message": "Unbekanntes Betriebssystem"
@@ -2955,7 +2955,7 @@
     "message": "Unbekannte Plattform"
   },
   "ui.latest-news-row.latest-news": {
-    "message": "Neusten Neuigkeiten von Modrinth"
+    "message": "Aktuelle Neuigkeiten von Modrinth"
   },
   "ui.latest-news-row.view-all": {
     "message": "Alle Neuigkeiten ansehen"
diff --git a/apps/frontend/src/locales/de-DE/languages.json b/apps/frontend/src/locales/de-DE/languages.json
index 6793df21..549a0240 100644
--- a/apps/frontend/src/locales/de-DE/languages.json
+++ b/apps/frontend/src/locales/de-DE/languages.json
@@ -20,7 +20,7 @@
 	"et": "Estnisch",
 	"fi": "Finnisch",
 	"fr": "Französisch",
-	"fr-BE": "Französisch (Belgien, Wallonisch)",
+	"fr-BE": "Französisch (Belgien)",
 	"fr-CA": "Französisch (Kanada)",
 	"he": "Hebräisch",
 	"hi": "Hindi",
@@ -35,9 +35,9 @@
 	"lt": "Litauisch",
 	"lv": "Lettisch",
 	"ms": "Malaiisch",
-	"nb": "Norwegisch, Bokmål",
+	"nb": "Norwegisch (Bokmål)",
 	"nl": "Niederländisch",
-	"nn": "Neues Norwegisch",
+	"nn": "Norwegisch (Nynorsk)",
 	"pes": "Persisch",
 	"pl": "Polnisch",
 	"pt": "Portugiesisch",
diff --git a/apps/frontend/src/locales/el-GR/index.json b/apps/frontend/src/locales/el-GR/index.json
index 86d01e45..b8b1ffab 100644
--- a/apps/frontend/src/locales/el-GR/index.json
+++ b/apps/frontend/src/locales/el-GR/index.json
@@ -1,7 +1,43 @@
 {
+  "action.continue": {
+    "message": "Συνέχεια"
+  },
   "admin.billing.error.not-found": {
     "message": "Ο χρήστης δε βρέθηκε"
   },
+  "app-marketing.download.description": {
+    "message": "Η εφαρμογή μας για υπολογιστές είναι διαθέσιμη σε όλες τις πλατφόρμες, επιλέξτε την έκδοση που επιθυμείτε."
+  },
+  "app-marketing.download.download-appimage": {
+    "message": "Λήψη του AppImages"
+  },
+  "app-marketing.download.download-beta": {
+    "message": "Λήψη της beta"
+  },
+  "app-marketing.download.download-deb": {
+    "message": "Λήψη του DEB"
+  },
+  "app-marketing.download.download-rpm": {
+    "message": "Λήψη του RPM"
+  },
+  "app-marketing.download.linux": {
+    "message": "Linux"
+  },
+  "app-marketing.download.linux-disclaimer": {
+    "message": "Οι εκδόσεις Linux της εφαρμογής Modrinth είναι <issues-link>γνωστό ότι παρουσιάζουν προβλήματα</issues-link> σε ορισμένα συστήματα και διαμορφώσεις. Εάν η εφαρμογή Modrinth είναι ασταθής στο σύστημά σας, σας ενθαρρύνουμε να δοκιμάσετε άλλες εφαρμογές όπως το <prism-link>Prism Launcher</prism-link> για να εγκαταστήσετε εύκολα το περιεχόμενο του Modrinth."
+  },
+  "app-marketing.download.mac": {
+    "message": "Mac"
+  },
+  "app-marketing.download.options-title": {
+    "message": "Επιλογές λήψης"
+  },
+  "app-marketing.download.terms": {
+    "message": "Με τη λήψη του Modrinth App, συμφωνείτε με τους <terms-link>Όρους</terms-link> και την <privacy-link>Πολιτική Απορρήτου</privacy-link> μας."
+  },
+  "app-marketing.download.third-party-packages": {
+    "message": "Πακέτα τρίτων"
+  },
   "auth.authorize.action.authorize": {
     "message": "Εξουσιοδότηση"
   },
diff --git a/apps/frontend/src/locales/el-GR/languages.json b/apps/frontend/src/locales/el-GR/languages.json
index c05991a7..a9c93e6d 100644
--- a/apps/frontend/src/locales/el-GR/languages.json
+++ b/apps/frontend/src/locales/el-GR/languages.json
@@ -11,6 +11,7 @@
 	"el": "Ελληνικά",
 	"en-GB": "Αγγλικά (Ηνωμένο Βασίλειο)",
 	"en-US": "Αγγλικά (Ηνωμένες Πολιτείες)",
+	"en-x-lolcat": "LOLCAT",
 	"en-x-pirate": "Αγγλικά (Πειρατικά)",
 	"en-x-updown": "Αγγλικά (Ανάποδα)",
 	"en-x-uwu": "Αγγλικά (UwU)",
@@ -47,6 +48,7 @@
 	"sk": "Σλοβακικά",
 	"sv": "Σουηδικά",
 	"th": "Ταϊλανδικά",
+	"tok": "Τόκι Πόνα",
 	"tr": "Τουρκικά",
 	"tt": "Ταταρικά",
 	"uk": "Ουκρανικά",
diff --git a/apps/frontend/src/locales/es-ES/index.json b/apps/frontend/src/locales/es-ES/index.json
index c85ea91d..a17fff2a 100644
--- a/apps/frontend/src/locales/es-ES/index.json
+++ b/apps/frontend/src/locales/es-ES/index.json
@@ -653,6 +653,9 @@
   "dashboard.creator-withdraw-modal.method-selection.select-method": {
     "message": "Seleccionar método de retirada"
   },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Dueño de la cuenta"
+  },
   "dashboard.creator-withdraw-modal.muralpay-details.coin": {
     "message": "Moneda"
   },
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index 289340c7..96f2bd6e 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -614,6 +614,66 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "Amerikai állampolgár vagy?"
   },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Folytatás limittel"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Részletek"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Mennyiség"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "FX rate"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Válaszd ki az országodat"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Országok keresése..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Régió"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Fiók tulajdonosa"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Érme"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Hálózat"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Fiók"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Fiók leválasztása"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Fizetési mód"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "PayPal fiók"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Csatlakoztasd a PayPal fiókodat hogy tudjál fizetni keresztül rajta."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Mentés"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Venmo handle sikeresen mentve!"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Mentve"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Bejelentkezés PayPalálal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
+    "message": "@felhasználónév"
+  },
   "error.collection.404.list_item.1": {
     "message": "Elírhatad a gyűjtemémyed URL-ét."
   },
diff --git a/apps/frontend/src/locales/id-ID/index.json b/apps/frontend/src/locales/id-ID/index.json
index 355ce69e..06cc19d4 100644
--- a/apps/frontend/src/locales/id-ID/index.json
+++ b/apps/frontend/src/locales/id-ID/index.json
@@ -209,36 +209,93 @@
   "auth.authorize.authorize-app-name": {
     "message": "Mengesahkan {appName}"
   },
+  "auth.authorize.redirect-url": {
+    "message": "Anda akan dialihkan ke <redirect-url>{url}</redirect-url>"
+  },
+  "auth.reset-password.method-choice.action": {
+    "message": "Kirim sur-el pemulihan"
+  },
+  "auth.reset-password.method-choice.description": {
+    "message": "Masukkan sur-el Anda di bawah dan kami akan mengirimkan tautan untuk memulihkan akun Anda."
+  },
+  "auth.reset-password.method-choice.email-username.label": {
+    "message": "Sur-el atau nama pengguna"
+  },
   "auth.reset-password.method-choice.email-username.placeholder": {
     "message": "Sur-el"
   },
+  "auth.reset-password.notification.email-sent.text": {
+    "message": "Sur-el berisi instruksi telah dikirim kepada Anda bila sur-el tersebut sebelumnya tersimpan di akun Anda."
+  },
   "auth.reset-password.notification.email-sent.title": {
     "message": "Sur-el terkirim"
   },
+  "auth.reset-password.notification.password-reset.text": {
+    "message": "Anda sekarang dapat masuk ke akun Anda dengan kata sandi baru."
+  },
+  "auth.reset-password.notification.password-reset.title": {
+    "message": "Kata sandi berhasil diatur ulang"
+  },
   "auth.reset-password.post-challenge.action": {
     "message": "Atur ulang kata sandi"
   },
   "auth.reset-password.post-challenge.confirm-password.label": {
     "message": "Konfirmasi kata sandi"
   },
+  "auth.reset-password.post-challenge.description": {
+    "message": "Masukkan kata sandi baru di bawah untuk mengakses akun Anda."
+  },
   "auth.reset-password.title": {
     "message": "Atur Ulang Kata Sandi"
   },
   "auth.reset-password.title.long": {
     "message": "Atur ulang kata sandi Anda"
   },
+  "auth.sign-in.2fa.description": {
+    "message": "Mohon masukkan kode autentikasi dwifaktor untuk melanjutkan."
+  },
+  "auth.sign-in.2fa.label": {
+    "message": "Masukkan kode dwifaktor"
+  },
+  "auth.sign-in.2fa.placeholder": {
+    "message": "Masukkan kode..."
+  },
+  "auth.sign-in.additional-options": {
+    "message": "<forgot-password-link>Lupa kata sandi?</forgot-password-link> • <create-account-link>Buat akun</create-account-link>"
+  },
   "auth.sign-in.email-username.label": {
     "message": "Sur-el atau nama pengguna"
   },
   "auth.sign-in.password.label": {
     "message": "Kata sandi"
   },
+  "auth.sign-in.sign-in-with": {
+    "message": "Masuk dengan"
+  },
+  "auth.sign-in.title": {
+    "message": "Masuk"
+  },
+  "auth.sign-in.use-password": {
+    "message": "Atau gunakan kata sandi"
+  },
+  "auth.sign-up.action.create-account": {
+    "message": "Buat akun"
+  },
+  "auth.sign-up.confirm-password.label": {
+    "message": "Konfirmasi kata sandi"
+  },
   "auth.sign-up.email.label": {
     "message": "Sur-el"
   },
   "auth.sign-up.label.username": {
     "message": "Nama pengguna"
   },
+  "auth.sign-up.legal-dislaimer": {
+    "message": "Dengan membuat sebuah akun, Anda menyetujui <terms-link>Ketentuan</terms-link> dan <privacy-policy-link>Kebijakan Privasi</privacy-policy-link> Modrinth."
+  },
+  "auth.sign-up.notification.password-mismatch.text": {
+    "message": "Kata sandi tidak cocok!"
+  },
   "frog": {
     "message": "Anda terkodok-kodok!🐸"
   }
diff --git a/apps/frontend/src/locales/ja-JP/index.json b/apps/frontend/src/locales/ja-JP/index.json
index 7f104553..b5d126b7 100644
--- a/apps/frontend/src/locales/ja-JP/index.json
+++ b/apps/frontend/src/locales/ja-JP/index.json
@@ -413,6 +413,9 @@
   "create.collection.cancel": {
     "message": "キャンセル"
   },
+  "create.collection.collection-info": {
+    "message": "新しいコレクションは、{count, plural, =0 {空の} other {#個のプロジェクトを含む}}公開コレクションとして作成されます。"
+  },
   "create.collection.create-collection": {
     "message": "コレクションを作成"
   },
@@ -437,6 +440,9 @@
   "create.limit-alert.contact-support": {
     "message": "サポートに連絡"
   },
+  "create.limit-alert.type-collection": {
+    "message": "コレクション"
+  },
   "create.limit-alert.type-organization": {
     "message": "組織"
   },
@@ -467,9 +473,15 @@
   "create.organization.name-placeholder": {
     "message": "組織名を入力…"
   },
+  "create.organization.summary-description": {
+    "message": "1~2文程度のあなたの組織の説明。"
+  },
   "create.organization.summary-label": {
     "message": "概要"
   },
+  "create.organization.summary-placeholder": {
+    "message": "…のための組織です"
+  },
   "create.organization.title": {
     "message": "組織を作成"
   },
@@ -515,6 +527,9 @@
   "create.project.visibility-unlisted": {
     "message": "限定公開"
   },
+  "dashboard.affiliate-links.create.button": {
+    "message": "アフィリエイトリンクを作成"
+  },
   "dashboard.collections.button.create-new": {
     "message": "新規作成"
   },
@@ -533,6 +548,18 @@
   "dashboard.creator-tax-form-modal.us-citizen.question": {
     "message": "あなたはアメリカ国民ですか？"
   },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "ネットワーク"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "アカウント"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "保存"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "保存済み"
+  },
   "error.collection.404.list_item.1": {
     "message": "コレクションの URL を誤って入力した可能性があります。"
   },
@@ -627,7 +654,7 @@
     "message": "データパック"
   },
   "landing.heading.the-place-for-minecraft.modpacks": {
-    "message": "modパック"
+    "message": "Modパック"
   },
   "landing.heading.the-place-for-minecraft.mods": {
     "message": "mod"
@@ -728,9 +755,18 @@
   "layout.footer.about.status": {
     "message": "ステータス"
   },
+  "layout.footer.legal-disclaimer": {
+    "message": "Minecraftの公式サービスではありません。MojangまたはMicrosoftの承認または連携はありません。"
+  },
+  "layout.footer.legal.copyright-policy": {
+    "message": "著作権ポリシーとDMCA"
+  },
   "layout.footer.legal.privacy-policy": {
     "message": "プライバシーポリシー"
   },
+  "layout.footer.legal.rules": {
+    "message": "コンテンツルール"
+  },
   "layout.footer.legal.security-notice": {
     "message": "セキュリティに関するお知らせ"
   },
@@ -788,9 +824,27 @@
   "layout.nav.analytics": {
     "message": "統計"
   },
+  "layout.nav.get-modrinth-app": {
+    "message": "Modrinthアプリを入手"
+  },
   "layout.nav.home": {
     "message": "ホーム"
   },
+  "layout.nav.host-a-server": {
+    "message": "サーバーをホスト"
+  },
+  "layout.nav.organizations": {
+    "message": "組織"
+  },
+  "layout.nav.profile": {
+    "message": "プロフィール"
+  },
+  "layout.nav.projects": {
+    "message": "プロジェクト"
+  },
+  "layout.nav.revenue": {
+    "message": "収益"
+  },
   "layout.nav.search": {
     "message": "検索"
   },
@@ -890,6 +944,12 @@
   "project-type.modpack.singular": {
     "message": "Modパック"
   },
+  "project-type.resourcepack.plural": {
+    "message": "リソースパック"
+  },
+  "project-type.shader.plural": {
+    "message": "シェーダー"
+  },
   "project.collections.create-new": {
     "message": "コレクションを作成"
   },
@@ -910,5 +970,26 @@
   },
   "project.navigation.changelog": {
     "message": "変更履歴"
+  },
+  "settings.display.sidebar.advanced-rendering.description": {
+    "message": "ぼかし効果などの高度なレンダリングを有効にします。グラフィック アクセラレーションが使用できない場合は、パフォーマンスが低下する可能性があります。"
+  },
+  "settings.display.sidebar.advanced-rendering.title": {
+    "message": "高度なレンダリング"
+  },
+  "settings.display.theme.description": {
+    "message": "このデバイスでのお好みのテーマを選択してください。"
+  },
+  "settings.display.theme.title": {
+    "message": "テーマ"
+  },
+  "settings.pats.modal.create.action": {
+    "message": "PATを作成"
+  },
+  "ui.latest-news-row.latest-news": {
+    "message": "Modrinthの最新ニュース"
+  },
+  "ui.latest-news-row.view-all": {
+    "message": "すべてのニュースを見る"
   }
 }
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index 0af0a862..cae597c6 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -879,7 +879,7 @@
     "message": "Tutaj pojawią się otrzymane fundusze i wypłaty."
   },
   "dashboard.revenue.transactions.see-all": {
-    "message": "Pokaż wszystkie"
+    "message": "Zobacz wszystkie"
   },
   "dashboard.revenue.withdraw.blocked-tin-mismatch": {
     "message": "Twoje wypłaty są tymczasowo zablokowane, ponieważ Twój TIN lub SSN nie pasował do zapisów IRS. Skontaktuj się z obsługą, by resetować i ponownie wysłać Twój formularz podatkowy."
@@ -1572,7 +1572,7 @@
     "message": "Rodzaj numeru konta"
   },
   "muralpay.field.account-type": {
-    "message": "Rodzaj konta"
+    "message": "Typ konta"
   },
   "muralpay.field.bank-account-number": {
     "message": "Numer konta"
@@ -1650,7 +1650,7 @@
     "message": "E-mail"
   },
   "muralpay.pix-type.phone": {
-    "message": "Numer tel."
+    "message": "Numer telefonu"
   },
   "muralpay.placeholder.account-number": {
     "message": "Podaj numer konta"
@@ -1662,37 +1662,37 @@
     "message": "CBU lub CVU"
   },
   "muralpay.placeholder.cci": {
-    "message": "Podaj 20-cyfrowe CCI"
+    "message": "Wprowadź 20-cyfrowe CCI"
   },
   "muralpay.placeholder.cuit-cuil": {
-    "message": "Podaj CUIT lub CUIL"
+    "message": "Wprowadź CUIT lub CUIL"
   },
   "muralpay.placeholder.enter-account-number": {
-    "message": "Podaj numer konta"
+    "message": "Wprowadź numer konta"
   },
   "muralpay.placeholder.enter-branch-code": {
     "message": "Podaj kod oddziału"
   },
   "muralpay.placeholder.enter-clabe": {
-    "message": "Podaj 18-cyfrowe CLABE"
+    "message": "Wprowadź 18-cyfrowe CLABE"
   },
   "muralpay.placeholder.enter-cpf-cnpj": {
-    "message": "Podaj CPF lub CNPJ"
+    "message": "Wprowadź CPF lub CNPJ"
   },
   "muralpay.placeholder.enter-iban": {
-    "message": "Podaj IBAN"
+    "message": "Wprowadź IBAN"
   },
   "muralpay.placeholder.enter-pix-email": {
-    "message": "Podaj e-mail PIX"
+    "message": "Wprowadź e-mail PIX"
   },
   "muralpay.placeholder.enter-routing-number": {
     "message": "Podaj 9-cyfrowy numer rozliczeniowy"
   },
   "muralpay.placeholder.enter-swift-bic": {
-    "message": "Podaj kod SWIFT/BIC"
+    "message": "Wprowadź kod SWIFT/BIC"
   },
   "muralpay.placeholder.iban-crc": {
-    "message": "Podaj kostarykański IBAN"
+    "message": "Wprowadź kostarykański IBAN"
   },
   "muralpay.placeholder.phone-cop": {
     "message": "+57..."
@@ -1815,7 +1815,7 @@
     "message": "{count} {count, plural, one {pobranie} few {pobrania} other {pobrań}}"
   },
   "profile.label.joined": {
-    "message": "Dołączył/a"
+    "message": "Dołączył(-a)"
   },
   "profile.label.no": {
     "message": "Nie"
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index 3e6335f6..1f7ad993 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -569,12 +569,24 @@
   "dashboard.affiliate-links.create.button": {
     "message": "Criar link de afiliado"
   },
+  "dashboard.affiliate-links.error.title": {
+    "message": "Erro ao carregar links de afiliado"
+  },
   "dashboard.affiliate-links.header": {
     "message": "Seus links de afiliado"
   },
+  "dashboard.affiliate-links.revoke-confirm.body": {
+    "message": "Isso permanentemente revocará o código afiliado `{id}` e quaisquer links existentes com este código que foram compartilhados não serão mais válidos."
+  },
   "dashboard.affiliate-links.revoke-confirm.button": {
     "message": "Revogar"
   },
+  "dashboard.affiliate-links.revoke-confirm.title": {
+    "message": "Você tem certeza de que quer revocar seu link de afiliado \"{title}\"?"
+  },
+  "dashboard.affiliate-links.search": {
+    "message": "Procurar links de afiliado..."
+  },
   "dashboard.collections.button.create-new": {
     "message": "Criar nova"
   },
@@ -626,27 +638,336 @@
   "dashboard.creator-withdraw-modal.complete-tax-form": {
     "message": "Preencha o formulário fiscal"
   },
+  "dashboard.creator-withdraw-modal.continue-with-limit": {
+    "message": "Continuar com limite"
+  },
   "dashboard.creator-withdraw-modal.details-label": {
     "message": "Detalhes"
   },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Quantia"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate": {
+    "message": "Taxa de câmbio"
+  },
   "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
     "message": "Taxa"
   },
+  "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
+    "message": "Valor líquido"
+  },
+  "dashboard.creator-withdraw-modal.kyc.business-entity": {
+    "message": "Entidade corporativa"
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-description": {
+    "message": "Uma entidade corporativa se refere a uma organização registrada, tais como uma corporação, parceria ou LLC."
+  },
+  "dashboard.creator-withdraw-modal.kyc.entity-question": {
+    "message": "Você está retirando como um indivíduo ou negócio?"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Indivíduo privado"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
+    "message": "Selecione teu país"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
+    "message": "Pesquisar países..."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-text": {
+    "message": "Não foi possível obter os métodos de pagamento disponíveis. Por favor, tente novamente mais tarde."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.error-title": {
+    "message": "Falha ao carregar métodos de pagamento"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region": {
+    "message": "Região"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Alguns métodos de pagamento não estão disponíveis em certas regiões."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Selecione o método de retirada"
+  },
   "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
     "message": "Seu limite de saque é de <b>{amount}</b>. <tax-link>Preencha um formulário fiscal</tax-link> para sacar mais."
   },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Dono da conta"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.coin": {
+    "message": "Moeda"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Confirme o endereço da sua carteira"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "Número de ID nacional"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "Digite o número de ID nacional"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "Número de passaporte"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "Digite o número de passaporte"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
+    "message": "Número de ID de residente"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "Digite o número de ID de residente"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "Número do RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "Digite o número RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "Número de ID fiscal"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "Digite o número de ID fiscal"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Rede"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "Você está perto do limite de retirada. Você pode retirar <b>{amountRemaining}</b> agora, mas será necessário um formulário fiscal para poder retirar mais."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Conta"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Desconectar conta"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Método de pagamento"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "Conta do PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Conecte sua conta PayPal para receber pagamentos diretos."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-button": {
+    "message": "Guardar"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Nome de usuário do Venmo salvo com sucesso!"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
+    "message": "Guardado"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Iniciar sessão com o PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "Digite seu nome de usuário do Venmo para receber pagamentos."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Nome de usuário do Venmo"
+  },
   "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
     "message": "@usuário"
   },
+  "dashboard.creator-withdraw-modal.stage.completion": {
+    "message": "Concluído"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Método"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Detalhes da Conta"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "Verificação"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "Formulário fiscal"
+  },
   "dashboard.creator-withdraw-modal.stage.tremendous-details": {
     "message": "Detalhes"
   },
+  "dashboard.creator-withdraw-modal.tax-form-required.body": {
+    "message": "Para retirar seu saldo total de <b>{available}</b> disponível, por favor, complete o formulário abaixo. É necessário para a declaração de impostos e é apenas necessário ser feito uma vez."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.body-with-limit": {
+    "message": "Você deve completar um formulário W-9 ou W-8 para os registros fiscais de Modrinth, para assim, mantermos nossas regulações de impostos em dia."
+  },
+  "dashboard.creator-withdraw-modal.tax-form-required.header": {
+    "message": "Formulário fiscal necessário"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Método de pagamento"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward": {
+    "message": "Recompensa"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "Selecionar recompensa"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
+    "message": "Recompensas"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "E-mail não verificado"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-message": {
+    "message": "O e-mail de entrega que você digitou não está associado com sua conta Modrinth. A Modrinth não pode recuperar recompensas enviada para um endereço de e-mail incorreto."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
+    "message": "Taxas mais baixas disponíveis"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-message": {
+    "message": "Você selecionou USD para PayPal Internacional. <direct-paypal-link>Alterne para o PayPal direto</direct-paypal-link> para obter taxas melhores (≈2% ao invés de ≈6%)."
+  },
+  "dashboard.creator-withdraw-modal.withdraw-button": {
+    "message": "Retirar"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit": {
+    "message": "Limite de retirada"
+  },
+  "dashboard.creator-withdraw-modal.withdraw-limit-used": {
+    "message": "Você esgotou seu limite de retirada <b>{withdrawLimit}</b>. Você deve completar o formulário fiscal para retirar mais."
+  },
+  "dashboard.revenue.available-now": {
+    "message": "Disponível agora"
+  },
   "dashboard.revenue.balance": {
     "message": "Saldo"
   },
+  "dashboard.revenue.estimated-tooltip.msg1": {
+    "message": "A renda estimada pode está sujeita a mudanças até que esteja disponível."
+  },
+  "dashboard.revenue.estimated-tooltip.msg2": {
+    "message": "Clique para ler sobre como a Modrinth lida com sua renda."
+  },
+  "dashboard.revenue.estimated-with-date": {
+    "message": "Estimada {date}"
+  },
+  "dashboard.revenue.processing": {
+    "message": "Processando"
+  },
+  "dashboard.revenue.processing.tooltip": {
+    "message": "A renda permanece processando até o fim do mês, e então, fica disponível 60 dias depois."
+  },
+  "dashboard.revenue.stats.received": {
+    "message": "Recebido"
+  },
+  "dashboard.revenue.stats.transactions": {
+    "message": "Transações"
+  },
+  "dashboard.revenue.stats.withdrawn": {
+    "message": "Retirado"
+  },
+  "dashboard.revenue.tos": {
+    "message": "Ao enviar projetos a Mondrith e retirar dinheiro da sua conta, você concorda com nossos <terms-link>Termos do Programa de Recompensas</terms-link>.Saiba mais sobre o <info-link>Programa de Recompensa</info-link>."
+  },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "Baixar como CSV"
+  },
+  "dashboard.revenue.transactions.header": {
+    "message": "Transações"
+  },
+  "dashboard.revenue.transactions.none": {
+    "message": "Sem transações"
+  },
+  "dashboard.revenue.transactions.none.desc": {
+    "message": "Seus pagamentos e retiradas aparecerão aqui."
+  },
+  "dashboard.revenue.transactions.see-all": {
+    "message": "Ver todas"
+  },
+  "dashboard.revenue.withdraw.blocked-tin-mismatch": {
+    "message": "Suas restiradas estão temporariamente bloqueadas devido a seu TIN ou SSN não coincidirem com seus registros do IRS. Por favor, contate o suporte para reestabelecer e reenviar seu formulário fiscal."
+  },
   "dashboard.revenue.withdraw.card.description": {
     "message": "Transfira o saldo disponível usando o método de pagamento desejado."
   },
+  "dashboard.revenue.withdraw.card.title": {
+    "message": "Retirar"
+  },
+  "dashboard.revenue.withdraw.header": {
+    "message": "Retirar"
+  },
+  "dashboard.withdraw.completion.account": {
+    "message": "Conta"
+  },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Quantia"
+  },
+  "dashboard.withdraw.completion.close-button": {
+    "message": "Fechar"
+  },
+  "dashboard.withdraw.completion.date": {
+    "message": "Data"
+  },
+  "dashboard.withdraw.completion.email-confirmation": {
+    "message": "Você receberá um e-mail em <b>{email}</b> com instruções para resgatar sua retirada."
+  },
+  "dashboard.withdraw.completion.exchange-rate": {
+    "message": "Taxa de troca"
+  },
+  "dashboard.withdraw.completion.fee": {
+    "message": "Taxa"
+  },
+  "dashboard.withdraw.completion.method": {
+    "message": "Método"
+  },
+  "dashboard.withdraw.completion.net-amount": {
+    "message": "Quantidade da rede"
+  },
+  "dashboard.withdraw.completion.recipient": {
+    "message": "Destinatário"
+  },
+  "dashboard.withdraw.completion.title": {
+    "message": "Retirada completa"
+  },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "Transações"
+  },
+  "dashboard.withdraw.completion.wallet": {
+    "message": "Carteira"
+  },
+  "dashboard.withdraw.error.generic.text": {
+    "message": "Não conseguimos enviar seu pedido de retirada, por favor, cheque seus dados ou contate o suporte."
+  },
+  "dashboard.withdraw.error.generic.title": {
+    "message": "Não "
+  },
+  "dashboard.withdraw.error.invalid-address.text": {
+    "message": "O endereço que providenciou não pôde ser verificado. Por favor, cheque os dados do seu endereço."
+  },
+  "dashboard.withdraw.error.invalid-address.title": {
+    "message": "Erro ao verificar o endereço"
+  },
+  "dashboard.withdraw.error.invalid-bank.text": {
+    "message": "Os dados da conta do banco que providenciou são inválidos. Por favor, verifique as informações."
+  },
+  "dashboard.withdraw.error.invalid-bank.title": {
+    "message": "Dados do banco inválidos"
+  },
+  "dashboard.withdraw.error.invalid-wallet.text": {
+    "message": "O endereço da carteira de criptomoedas que providenciou é inválido. Por favor, revise e tente novamente."
+  },
+  "dashboard.withdraw.error.invalid-wallet.title": {
+    "message": "Endereço da carteira inválido"
+  },
+  "dashboard.withdraw.error.minimum-not-met.text": {
+    "message": "A quantidade que retirada (após as taxas) não coincide com o requisito mínimo. Por favor, aumente a quantidade a retirar."
+  },
+  "dashboard.withdraw.error.minimum-not-met.title": {
+    "message": "Quantia muito baixo"
+  },
+  "dashboard.withdraw.error.tax-form.text": {
+    "message": "Você deve completar o formulário fiscal para enviar seu pedido de retirada."
+  },
+  "dashboard.withdraw.error.tax-form.title": {
+    "message": "Por favor, complete seu formulário fiscal"
+  },
   "error.collection.404.list_item.1": {
     "message": "Você pode ter digitado incorretamente o URL da coleção."
   },
@@ -998,6 +1319,9 @@
   "layout.footer.about.status": {
     "message": "Status"
   },
+  "layout.footer.copyright": {
+    "message": "© {year} Rinth, Inc."
+  },
   "layout.footer.legal": {
     "message": "Termos e Políticas"
   },
@@ -1076,6 +1400,15 @@
   "layout.meta.og-description": {
     "message": "Descubra e publique conteúdo de Minecraft!"
   },
+  "layout.mobile.close-menu": {
+    "message": "Fechar menu"
+  },
+  "layout.mobile.open-menu": {
+    "message": "Abrir menu"
+  },
+  "layout.nav.active-reports": {
+    "message": "Ativar relatórios"
+  },
   "layout.nav.analytics": {
     "message": "Estatísticas"
   },
@@ -1103,6 +1436,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Página principal do Modrinth"
   },
+  "layout.nav.my-servers": {
+    "message": "Meus servidores"
+  },
   "layout.nav.organizations": {
     "message": "Organizações"
   },
@@ -1148,6 +1484,273 @@
   "moderation.technical.search.placeholder": {
     "message": "Buscar revisões técnicas..."
   },
+  "muralpay.account-type.checking": {
+    "message": "Checando"
+  },
+  "muralpay.account-type.savings": {
+    "message": "Poupança"
+  },
+  "muralpay.country.at": {
+    "message": "Áustria"
+  },
+  "muralpay.country.be": {
+    "message": "Bélgica"
+  },
+  "muralpay.country.cy": {
+    "message": "Chipre"
+  },
+  "muralpay.country.de": {
+    "message": "Alemanha"
+  },
+  "muralpay.country.ee": {
+    "message": "Estônia"
+  },
+  "muralpay.country.es": {
+    "message": "Espanha"
+  },
+  "muralpay.country.fi": {
+    "message": "Finlândia"
+  },
+  "muralpay.country.fr": {
+    "message": "França"
+  },
+  "muralpay.country.gr": {
+    "message": "Grécia"
+  },
+  "muralpay.country.ie": {
+    "message": "Irlanda"
+  },
+  "muralpay.country.it": {
+    "message": "Itália"
+  },
+  "muralpay.country.lt": {
+    "message": "Lituânia"
+  },
+  "muralpay.country.lu": {
+    "message": "Luxemburgo"
+  },
+  "muralpay.country.lv": {
+    "message": "Letônia"
+  },
+  "muralpay.country.mt": {
+    "message": "Malta"
+  },
+  "muralpay.country.nl": {
+    "message": "Países Baixos"
+  },
+  "muralpay.country.pt": {
+    "message": "Portugal"
+  },
+  "muralpay.country.sk": {
+    "message": "Eslováquia"
+  },
+  "muralpay.document-type.national-id": {
+    "message": "ID Nacional"
+  },
+  "muralpay.document-type.passport": {
+    "message": "Passaporte"
+  },
+  "muralpay.document-type.resident-id": {
+    "message": "ID de Residente"
+  },
+  "muralpay.document-type.ruc": {
+    "message": "RUC"
+  },
+  "muralpay.document-type.tax-id": {
+    "message": "ID Fiscal"
+  },
+  "muralpay.field.account-number": {
+    "message": "Número da conta"
+  },
+  "muralpay.field.account-number-cbu-cvu": {
+    "message": "Número da conta (CBU/CVU)"
+  },
+  "muralpay.field.account-number-cci": {
+    "message": "Número da conta (CCI)"
+  },
+  "muralpay.field.account-number-type": {
+    "message": "Tipo de número da conta"
+  },
+  "muralpay.field.account-type": {
+    "message": "Tipo da conta"
+  },
+  "muralpay.field.bank-account-number": {
+    "message": "Número da conta"
+  },
+  "muralpay.field.branch-code": {
+    "message": "Código da filial"
+  },
+  "muralpay.field.clabe": {
+    "message": "CLABE"
+  },
+  "muralpay.field.country": {
+    "message": "País"
+  },
+  "muralpay.field.cpf-cnpj": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.field.cuit-cuil": {
+    "message": "CUIT/CUIL"
+  },
+  "muralpay.field.document-type": {
+    "message": "Tipo de documento"
+  },
+  "muralpay.field.iban": {
+    "message": "IBAN"
+  },
+  "muralpay.field.phone-number": {
+    "message": "Número de telefone"
+  },
+  "muralpay.field.pix-email": {
+    "message": "E-mail do PIX"
+  },
+  "muralpay.field.pix-key-type": {
+    "message": "Chave do PIX"
+  },
+  "muralpay.field.pix-phone": {
+    "message": "Telefone do PIX"
+  },
+  "muralpay.field.routing-number": {
+    "message": "Número de rota"
+  },
+  "muralpay.field.swift-bic": {
+    "message": "SWIFT/BIC"
+  },
+  "muralpay.field.wallet-address": {
+    "message": "Endereço da carteira"
+  },
+  "muralpay.help.cbu-cvu": {
+    "message": "Clave Bancaria Uniforme ou Clave Virtual Uniforme"
+  },
+  "muralpay.help.cci": {
+    "message": "Código de Cuenta Interbancaria"
+  },
+  "muralpay.help.clabe": {
+    "message": "Clave Bancaria Estandarizada (Número de conta bancará Mexicana)"
+  },
+  "muralpay.help.cpf-cnpj": {
+    "message": "Número de identificação fiscal brasileiro"
+  },
+  "muralpay.help.cuit-cuil": {
+    "message": "ID fiscal Argentino"
+  },
+  "muralpay.help.iban": {
+    "message": "Número de Conta Bancaria Internacional"
+  },
+  "muralpay.help.swift-bic": {
+    "message": "Código de Identificação Bancaria"
+  },
+  "muralpay.pix-type.bank-account": {
+    "message": "Conta bancaria"
+  },
+  "muralpay.pix-type.document": {
+    "message": "CPF/CNPJ"
+  },
+  "muralpay.pix-type.email": {
+    "message": "E-mail"
+  },
+  "muralpay.pix-type.phone": {
+    "message": "Número de telefone"
+  },
+  "muralpay.placeholder.account-number": {
+    "message": "Digitar número da conta"
+  },
+  "muralpay.placeholder.cbu-cvu": {
+    "message": "Digitar o CBU ou CVU"
+  },
+  "muralpay.placeholder.cbu-cvu-type": {
+    "message": "CBU ou CVU"
+  },
+  "muralpay.placeholder.cci": {
+    "message": "Digitar CCI de 20 dígitos"
+  },
+  "muralpay.placeholder.cuit-cuil": {
+    "message": "Digitar CUIT ou CUIL"
+  },
+  "muralpay.placeholder.enter-account-number": {
+    "message": "Digitar número da conta"
+  },
+  "muralpay.placeholder.enter-branch-code": {
+    "message": "Digitar código de poupança"
+  },
+  "muralpay.placeholder.enter-clabe": {
+    "message": "Digitar a CLABE de 18 dígitos"
+  },
+  "muralpay.placeholder.enter-cpf-cnpj": {
+    "message": "Digitar CPF ou CNPJ"
+  },
+  "muralpay.placeholder.enter-iban": {
+    "message": "Digitar IBAN"
+  },
+  "muralpay.placeholder.enter-pix-email": {
+    "message": "Digitar e-mail PIX"
+  },
+  "muralpay.placeholder.enter-routing-number": {
+    "message": "Digitar número de rota de 9 dígitos"
+  },
+  "muralpay.placeholder.enter-swift-bic": {
+    "message": "Digitar código SWIFT/BIC"
+  },
+  "muralpay.placeholder.iban-crc": {
+    "message": "Digitar IBAN Costa-riquenho"
+  },
+  "muralpay.placeholder.phone-cop": {
+    "message": "+57..."
+  },
+  "muralpay.placeholder.pix-phone": {
+    "message": "+55..."
+  },
+  "muralpay.placeholder.wallet-address-eth": {
+    "message": "0x..."
+  },
+  "muralpay.rail.fiat-ars.name": {
+    "message": "Transferência bancária (ARS)"
+  },
+  "muralpay.rail.fiat-brl.name": {
+    "message": "Transferência PIX (BRL)"
+  },
+  "muralpay.rail.fiat-clp.name": {
+    "message": "Transferência bancária (CLP)"
+  },
+  "muralpay.rail.fiat-cop.name": {
+    "message": "Transferência bancária (COP)"
+  },
+  "muralpay.rail.fiat-crc.name": {
+    "message": "Transferência bancária (CRC)"
+  },
+  "muralpay.rail.fiat-eur.name": {
+    "message": "Transferência bancária (EUR)"
+  },
+  "muralpay.rail.fiat-mxn.name": {
+    "message": "Transferência bancária (MXN)"
+  },
+  "muralpay.rail.fiat-pen.name": {
+    "message": "Transferência bancária (PEN)"
+  },
+  "muralpay.rail.fiat-usd-peru.name": {
+    "message": "Transferência bancária (USD - Peru)"
+  },
+  "muralpay.rail.fiat-usd.name": {
+    "message": "Transferência bancária (USD)"
+  },
+  "muralpay.rail.fiat-zar.name": {
+    "message": "Transferência bancária (ZAR)"
+  },
+  "muralpay.rail.usdc-base.name": {
+    "message": "USDC (Base)"
+  },
+  "muralpay.rail.usdc-celo.name": {
+    "message": "USDC (Celo)"
+  },
+  "muralpay.rail.usdc-ethereum.name": {
+    "message": "USDC (Ethereum)"
+  },
+  "muralpay.rail.usdc-polygon.name": {
+    "message": "Cripto (USDC)"
+  },
+  "muralpay.warning.wallet-address": {
+    "message": "Verifique novamente seu endereço da carteira. Fundos enviados para um endereço incorreto não podem ser recuperados."
+  },
   "profile.bio.fallback.creator": {
     "message": "Um criador Modrinth."
   },
@@ -1169,6 +1772,9 @@
   "profile.button.remove-affiliate": {
     "message": "Remover como afiliado"
   },
+  "profile.button.set-affiliate": {
+    "message": "Configurar como afiliado"
+  },
   "profile.details.label.auth-providers": {
     "message": "Provedores de autenticação"
   },
@@ -1292,6 +1898,9 @@
   "project-moderation-nags.resubmit-for-review": {
     "message": "Reenviar para revisão"
   },
+  "project-moderation-nags.resubmit-for-review-desc": {
+    "message": "Seu projeto foi {status, select, rejected {rejeitado} withheld {retido} other {{status}}} pela equipe da Mondrith. Na maioria dos casos, você pode reenviar para revisão após responder às observações que a equipe lhe deu."
+  },
   "project-moderation-nags.submit-checklist-tooltip": {
     "message": "Você precisa completar as etapas necessárias nas tarefas de publicação!"
   },
diff --git a/apps/frontend/src/locales/pt-PT/index.json b/apps/frontend/src/locales/pt-PT/index.json
index a03661d2..a4629093 100644
--- a/apps/frontend/src/locales/pt-PT/index.json
+++ b/apps/frontend/src/locales/pt-PT/index.json
@@ -683,18 +683,114 @@
   "dashboard.creator-withdraw-modal.method-selection.region": {
     "message": "Região"
   },
+  "dashboard.creator-withdraw-modal.method-selection.region-tooltip": {
+    "message": "Alguns métodos de pagamento não estão disponíveis em determinadas regiões."
+  },
+  "dashboard.creator-withdraw-modal.method-selection.select-method": {
+    "message": "Selecionar método de levantamento"
+  },
+  "dashboard.creator-withdraw-modal.method-selection.tax-limit-warning": {
+    "message": "O teu limite de levantamento é <b>{amount}</b>, <tax-link>completa um formulário de imposto</tax-link> para levantar mais."
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.account-owner": {
+    "message": "Dono da conta"
+  },
   "dashboard.creator-withdraw-modal.muralpay-details.coin": {
     "message": "Moeda"
   },
+  "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
+    "message": "Confirma o endereço da tua carteira"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
+    "message": "Número de identificação nacional"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
+    "message": "Insere o número de identificação nacional"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
+    "message": "Número do passaporte"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport-placeholder": {
+    "message": "Insere o número do passaporte"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id": {
+    "message": "Número de residência"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-resident-id-placeholder": {
+    "message": "Insere o número da residência"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc": {
+    "message": "Número RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-ruc-placeholder": {
+    "message": "Insere o número RUC"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id": {
+    "message": "Número de identificação de imposto"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.document-number-tax-id-placeholder": {
+    "message": "Insere o número de identificação de imposto"
+  },
+  "dashboard.creator-withdraw-modal.muralpay-details.network": {
+    "message": "Rede"
+  },
+  "dashboard.creator-withdraw-modal.nearing-threshold": {
+    "message": "Estás próximo de atingir o limite de levantamento. Podes levantar <b>{amountRemaining}</b> agora, mas é necessário um formulário de imposto para levantar mais."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.account": {
+    "message": "Conta"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.disconnect-account": {
+    "message": "Desconectar conta"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Método de pagamento"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "Conta PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
+    "message": "Conecta a tua conta PayPal para receber pagamentos diretamente."
+  },
   "dashboard.creator-withdraw-modal.paypal-details.save-button": {
     "message": "Guardar"
   },
+  "dashboard.creator-withdraw-modal.paypal-details.save-success": {
+    "message": "Nome de utilizador Venmo guardado com sucesso!"
+  },
   "dashboard.creator-withdraw-modal.paypal-details.saved-button": {
     "message": "Guardado"
   },
+  "dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
+    "message": "Iniciar sessão com PayPal"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-description": {
+    "message": "Insere o teu nome de utilizador Venmo para receber pagamentos."
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.venmo-handle": {
+    "message": "Nome de utilizador Venmo"
+  },
   "dashboard.creator-withdraw-modal.paypal-details.venmo-handle-placeholder": {
     "message": "@nome de utilizador"
   },
+  "dashboard.creator-withdraw-modal.stage.completion": {
+    "message": "Concluído"
+  },
+  "dashboard.creator-withdraw-modal.stage.method-selection": {
+    "message": "Método"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-details": {
+    "message": "Detalhes da conta"
+  },
+  "dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
+    "message": "Verificação"
+  },
+  "dashboard.creator-withdraw-modal.stage.tax-form": {
+    "message": "Formulário de imposto"
+  },
+  "dashboard.creator-withdraw-modal.stage.tremendous-details": {
+    "message": "Detalhes"
+  },
   "dashboard.creator-withdraw-modal.withdraw-button": {
     "message": "Levantar"
   },
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index 167ca5fd..fa2ab768 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -6,7 +6,7 @@
     "message": "继续"
   },
   "admin.billing.error.not-found": {
-    "message": "未找到用户"
+    "message": "用户不存在"
   },
   "app-marketing.download.description": {
     "message": "我们的桌面应用程序可在所有平台上使用，请选择你想要的版本。"
@@ -1403,6 +1403,12 @@
   "layout.mobile.close-menu": {
     "message": ""
   },
+  "layout.mobile.open-menu": {
+    "message": "打开菜单"
+  },
+  "layout.nav.active-reports": {
+    "message": "进行中的举报"
+  },
   "layout.nav.analytics": {
     "message": "数据"
   },
@@ -1430,6 +1436,9 @@
   "layout.nav.modrinth-home-page": {
     "message": "Modrinth 首页"
   },
+  "layout.nav.my-servers": {
+    "message": "我的服务器"
+  },
   "layout.nav.organizations": {
     "message": "组织"
   },
@@ -1475,6 +1484,66 @@
   "moderation.technical.search.placeholder": {
     "message": "搜索技术评价……"
   },
+  "muralpay.account-type.checking": {
+    "message": "支票账户"
+  },
+  "muralpay.account-type.savings": {
+    "message": "储蓄账户"
+  },
+  "muralpay.country.at": {
+    "message": "奥地利"
+  },
+  "muralpay.country.be": {
+    "message": "比利时"
+  },
+  "muralpay.country.cy": {
+    "message": "塞浦路斯"
+  },
+  "muralpay.country.de": {
+    "message": "德国"
+  },
+  "muralpay.country.ee": {
+    "message": "爱沙尼亚"
+  },
+  "muralpay.country.es": {
+    "message": "西班牙"
+  },
+  "muralpay.country.fi": {
+    "message": "芬兰"
+  },
+  "muralpay.country.fr": {
+    "message": "法国"
+  },
+  "muralpay.country.gr": {
+    "message": "希腊"
+  },
+  "muralpay.country.ie": {
+    "message": "爱尔兰"
+  },
+  "muralpay.country.it": {
+    "message": "意大利"
+  },
+  "muralpay.country.lt": {
+    "message": "立陶宛"
+  },
+  "muralpay.country.lu": {
+    "message": "卢森堡"
+  },
+  "muralpay.country.lv": {
+    "message": "拉脱维亚"
+  },
+  "muralpay.country.mt": {
+    "message": "马耳他"
+  },
+  "muralpay.country.nl": {
+    "message": "荷兰"
+  },
+  "muralpay.country.pt": {
+    "message": "葡萄牙"
+  },
+  "muralpay.country.sk": {
+    "message": "斯洛伐克"
+  },
   "muralpay.document-type.national-id": {
     "message": "国民身份证"
   },
@@ -1487,9 +1556,15 @@
   "muralpay.document-type.ruc": {
     "message": "唯一纳税人登记号"
   },
+  "muralpay.document-type.tax-id": {
+    "message": "税号"
+  },
   "muralpay.field.clabe": {
     "message": "CLABE"
   },
+  "muralpay.field.country": {
+    "message": "国家"
+  },
   "muralpay.field.cpf-cnpj": {
     "message": "CPF/CNPJ"
   },
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index 8af5b3c7..7e79e317 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -656,6 +656,9 @@
   "dashboard.creator-withdraw-modal.fee-breakdown-net-amount": {
     "message": "淨額"
   },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "PayPal 帳號"
+  },
   "error.collection.404.list_item.1": {
     "message": "你可能輸錯了該收藏的網址。"
   },
diff --git a/packages/moderation/src/locales/de-DE/index.json b/packages/moderation/src/locales/de-DE/index.json
index 217a3ef8..eb7af290 100644
--- a/packages/moderation/src/locales/de-DE/index.json
+++ b/packages/moderation/src/locales/de-DE/index.json
@@ -1,18 +1,18 @@
 {
   "nags.add-description.description": {
-    "defaultMessage": "Eine Beschreibung, die den Zweck und die Funktion des Projekts klar beschreibt, ist erforderlich."
+    "defaultMessage": "Eine Beschreibung, die den Zweck und die Funktion des Projekts klar darstellt, ist erforderlich."
   },
   "nags.add-description.title": {
     "defaultMessage": "Beschreibung hinzufügen"
   },
   "nags.add-icon.description": {
-    "defaultMessage": "Das Hinzufügen eines einzigartigen, relevanten und ansprechenden Icon macht Ihr Projekt unverwechselbar und hilft ihm, sich von anderen abzuheben."
+    "defaultMessage": "Das Hinzufügen eines einzigartigen, relevanten und ansprechenden Icons macht dein Projekt klar erkennbar und hilft ihm, sich von anderen abzuheben."
   },
   "nags.add-icon.title": {
-    "defaultMessage": "Symbol hinzufügen"
+    "defaultMessage": "Icon hinzufügen"
   },
   "nags.add-links.description": {
-    "defaultMessage": "Fügen Sie alle relevanten Links hinzu, die außerhalb von Modrinth verlinkt sind, wie z. B. Quellcode, einen Issue Tracker oder eine Discord-Einladung."
+    "defaultMessage": "Füge alle relevanten Links hinzu, die außerhalb von Modrinth liegen, wie zum Beispiel Quellcode, ein Issue-Tracker oder eine Discord-Einladung."
   },
   "nags.add-links.title": {
     "defaultMessage": "Externe Links hinzufügen"
@@ -21,7 +21,7 @@
     "defaultMessage": "Du hast alle {totalAvailableTags, plural, one {# verfügbaren Tag} other {# verfügbaren Tags}} ausgewählt. Das widerspricht dem Zweck von Tags, die dazu dienen, Nutzern zu helfen, relevante Projekte zu finden. Bitte wähle nur die Tags aus, die wirklich zu deinem Projekt passen."
   },
   "nags.all-tags-selected.title": {
-    "defaultMessage": "Wählen Sie sinnvolle Tags aus"
+    "defaultMessage": "Wähle passende Tags"
   },
   "nags.description-too-short.description": {
     "defaultMessage": "Deine Beschreibung enthält {length, plural, one {# lesbares Zeichen} other {# lesbare Zeichen}}. Es wird empfohlen, mindestens {minChars, plural, one {# Zeichen} other {# Zeichen}} zu verwenden, um eine klare und informative Beschreibung zu erstellen."
@@ -36,7 +36,7 @@
     "defaultMessage": "Lizenz bearbeiten"
   },
   "nags.edit-summary.title": {
-    "defaultMessage": "Kurzfassung bearbeiten"
+    "defaultMessage": "Zusammenfassung bearbeiten"
   },
   "nags.edit-tags.title": {
     "defaultMessage": "Tags bearbeiten"
@@ -45,13 +45,13 @@
     "defaultMessage": "Titel bearbeiten"
   },
   "nags.feature-gallery-image.description": {
-    "defaultMessage": "Das vorgestellte Bild in der Galerie ist das Erste, was man von dem Projekt sieht."
+    "defaultMessage": "Das hervorgehobene Galeriebild ist oft der erste Eindruck, den dein Projekt hinterlässt."
   },
   "nags.feature-gallery-image.title": {
-    "defaultMessage": "Stelle ein Galeriebild vor"
+    "defaultMessage": "Galeriebild hervorheben"
   },
   "nags.gallery.title": {
-    "defaultMessage": "Zur Galerie-Seite"
+    "defaultMessage": "Gallerieseite besuchen"
   },
   "nags.gpl-license-source-required.description": {
     "defaultMessage": "Dein {type, select, mod {Mod} plugin {Plugin} other {Projekt}} verwendet eine Lizenz, die erfordert, dass der Quellcode verfügbar ist. Bitte gib für jede zusätzliche Version einen Link zum Quellcode oder eine Quelldatei an, oder erwäge, eine andere Lizenz zu verwenden."
@@ -60,58 +60,58 @@
     "defaultMessage": "Quellcode bereitstellen"
   },
   "nags.image-heavy-description.description": {
-    "defaultMessage": "Ihre Beschreibung sollte ausreichend Klartext oder Bild-Alt-Text enthalten, damit sie für Nutzer von Bildschirmleseprogrammen oder mit langsamen Internetverbindungen zugänglich bleibt."
+    "defaultMessage": "Deine Beschreibung sollte ausreichend Klartext oder Alt-Text für Bilder enthalten, damit sie für Nutzer mit Bildschirmleseprogrammen oder langsamer Internetverbindung zugänglich bleibt."
   },
   "nags.image-heavy-description.title": {
     "defaultMessage": "Barrierefreiheit sicherstellen"
   },
   "nags.invalid-license-url.description.default": {
-    "defaultMessage": "Die Lizenz-URL ist ungültig."
+    "defaultMessage": "Lizenz-URL ist ungültig."
   },
   "nags.invalid-license-url.description.domain": {
-    "defaultMessage": "Ihre Lizenz-URL verweist auf {domain}, was für Lizenzinformationen nicht geeignet ist. Lizenz-URLs sollten direkt auf Ihre Lizenzdatei verweisen, nicht auf soziale Medien, Gaming-Plattformen usw."
+    "defaultMessage": "Deine Lizenz-URL verweist auf {domain}, was für Lizenzinformationen nicht geeignet ist. Lizenz-URLs sollten direkt auf deine Lizenzdatei verweisen, nicht auf soziale Medien, Gaming-Plattformen usw."
   },
   "nags.invalid-license-url.description.malformed": {
-    "defaultMessage": "Ihre Lizenz-URL scheint fehlerhaft zu sein. Bitte geben Sie eine gültige URL an."
+    "defaultMessage": "Deine Lizenz-URL scheint fehlerhaft zu sein. Bitte gib eine gültige URL zu deinem Lizenztext an."
   },
   "nags.invalid-license-url.title": {
-    "defaultMessage": "Fügen Sie einen gültigen Lizenzlink hinzu"
+    "defaultMessage": "Gültigen Lizenzlink hinzufügen"
   },
   "nags.link-shortener-usage.description": {
-    "defaultMessage": "Die Verwendung von Linkverkürzern oder anderen Methoden, um zu verschleiern, wohin ein Link in Ihren externen Links oder Lizenzlinks führt, ist verboten. Bitte verwenden Sie nur geeignete Links in voller Länge."
+    "defaultMessage": "Die Verwendung von Linkverkürzern oder anderen Methoden, um zu verschleiern, wohin ein Link in deinen externen Links oder Lizenz-Links führt, ist verboten. Bitte nutze nur vollständige, eindeutige Links."
   },
   "nags.link-shortener-usage.title": {
-    "defaultMessage": "Verwenden Sie keine Linkverkürzer"
+    "defaultMessage": "Verwende keine Linkverkürzer"
   },
   "nags.long-headers.description": {
-    "defaultMessage": "{count, plural, one {# Überschrift} other {# Überschriften}} in deiner Beschreibung {count, plural, one {ist} other {sind}} zu lang. Überschriften sollten kurz und prägnant sein und als Abschnittstitel dienen, nicht als vollständige Sätze."
+    "defaultMessage": "{count, plural, one {# Überschrift} other {# Überschriften}} in deiner Beschreibung {count, plural, one {ist} other {sind}} zu lang. Überschriften sollten kurz sein und als Abschnittstitel dienen, nicht als vollständige Sätze."
   },
   "nags.long-headers.title": {
-    "defaultMessage": "Überschrift kürzen"
+    "defaultMessage": "Überschriften kürzen"
   },
   "nags.minecraft-title-clause.description": {
-    "defaultMessage": "Projekte dürfen weder das Markenzeichen von Minecraft verwenden noch \"Minecraft\" als wesentlichen Bestandteil des Namens enthalten."
+    "defaultMessage": "Projekte dürfen die Marke Minecraft nicht verwenden oder „Minecraft“ als wesentlichen Teil des Namens enthalten."
   },
   "nags.minecraft-title-clause.title": {
-    "defaultMessage": "Vermeiden Sie Markenrechtsverletzungen"
+    "defaultMessage": "Vermeide Markenrechtsverletzungen"
   },
   "nags.missing-alt-text.description": {
-    "defaultMessage": "Einige Ihrer Bilder haben keinen Alt-Text, der für die Barrierefreiheit wichtig ist, insbesondere für sehbehinderte Nutzer."
+    "defaultMessage": "Bei einigen deiner Bilder fehlt der Alt-Text, der besonders für sehbehinderte Nutzer wichtig ist, um die Barrierefreiheit zu gewährleisten."
   },
   "nags.missing-alt-text.title": {
     "defaultMessage": "Alternativen Bild-Text Hinzufügen"
   },
   "nags.misused-discord-link-description": {
-    "defaultMessage": "Discord-Einladungen können nicht für andere Link-Typen verwendet werden. Bitte fügen Sie Ihren Discord-Link nur in das Feld „Discord-Einladungslink“ ein."
+    "defaultMessage": "Discord-Einladungen können nicht für andere Link-Typen verwendet werden. Bitte füge deinen Discord-Link nur in das Feld „Discord-Einladungslink“ ein."
   },
   "nags.misused-discord-link.title": {
     "defaultMessage": "Discord-Einladung verschieben"
   },
   "nags.moderation.title": {
-    "defaultMessage": "Moderations-Seite besuchen"
+    "defaultMessage": "Moderationsthread besuchen"
   },
   "nags.moderator-feedback.description": {
-    "defaultMessage": "Überprüfen Sie alle Bedenken des Moderationsteams und gehen Sie darauf ein, bevor Sie den Beitrag erneut einreichen."
+    "defaultMessage": "Überprüfe und behebe alle Hinweise des Moderationsteams, bevor du erneut einreichst."
   },
   "nags.moderator-feedback.title": {
     "defaultMessage": "Feedback überprüfen"
@@ -120,7 +120,7 @@
     "defaultMessage": "Du hast {count, plural, one {# Auflösungs-Tag} other {# Auflösungs-Tags}} ({tags}) ausgewählt. Ressourcenpakete sollten in der Regel nur ein Auflösungs-Tag haben, das ihrer Hauptauflösung entspricht."
   },
   "nags.multiple-resolution-tags.title": {
-    "defaultMessage": "Wählen Sie die richtige Auflösung aus"
+    "defaultMessage": "Richtige Auflösung auswählen"
   },
   "nags.select-environments.description": {
     "defaultMessage": "Wähle die Umgebungen aus, in denen dein {type, select, mod {Mod} modpack {Modpack} other {Projekt}} funktioniert."
@@ -135,37 +135,37 @@
     "defaultMessage": "Lizenz auswählen"
   },
   "nags.select-tags.description": {
-    "defaultMessage": "Wählen Sie die Tags aus, die für Ihr Projekt zutreffend sind, damit die richtigen Nutzer es finden können."
+    "defaultMessage": "Wähle die Tags aus, die auf dein Projekt zutreffen, damit die richtigen Nutzer es finden."
   },
   "nags.select-tags.title": {
     "defaultMessage": "Tags auswählen"
   },
   "nags.settings.description.title": {
-    "defaultMessage": "Beschreibungsseite aufrufen"
+    "defaultMessage": "Beschreibungseinstellungen ansehen"
   },
   "nags.settings.environments.title": {
-    "defaultMessage": "Umgebungseinstellungen besuchen"
+    "defaultMessage": "Umgebungseinstellungen ansehen"
   },
   "nags.settings.license.title": {
-    "defaultMessage": "Lizenz-Einstellungen aufrufen"
+    "defaultMessage": "Lizenzeinstellungen ansehen"
   },
   "nags.settings.links.title": {
-    "defaultMessage": "Links-Einstellungen aufrufen"
+    "defaultMessage": "Linkeinstellungen ansehen"
   },
   "nags.settings.tags.title": {
-    "defaultMessage": "Tag-Einstellungen aufrufen"
+    "defaultMessage": "Tageinstellungen ansehen"
   },
   "nags.settings.title": {
     "defaultMessage": "Einstellungen aufrufen"
   },
   "nags.summary-same-as-title.description": {
-    "defaultMessage": "Ihre Zusammenfassung darf nicht mit dem Namen Ihres Projekts identisch sein. Es ist wichtig, eine informative und ansprechende Zusammenfassung zu erstellen."
+    "defaultMessage": "Deine Zusammenfassung darf nicht mit dem Namen deines Projekts identisch sein. Es ist wichtig, eine informative und ansprechende Zusammenfassung zu erstellen."
   },
   "nags.summary-same-as-title.title": {
-    "defaultMessage": "Machen Sie die Zusammenfassung einzigartig"
+    "defaultMessage": "Mach die Zusammenfassung einzigartig"
   },
   "nags.summary-special-formatting.description": {
-    "defaultMessage": "Ihre Zusammenfassung sollte keine Formatierungen, Zeilenumbrüche, Sonderzeichen oder Links enthalten, da die Zusammenfassung nur als einfacher Text angezeigt wird."
+    "defaultMessage": "Deine Zusammenfassung sollte keine Formatierungen, Zeilenumbrüche, Sonderzeichen oder Links enthalten, da die Zusammenfassung nur als unformatierter Text angezeigt wird."
   },
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Zusammenfassung bereinigen"
@@ -186,7 +186,7 @@
     "defaultMessage": "Du hast {tagCount, plural, one {# Tag} other {# Tags}} ausgewählt. Reduziere die Anzahl auf {maxTagCount} oder weniger, damit dein Projekt in den relevanten Suchergebnissen erscheint."
   },
   "nags.too-many-tags.title": {
-    "defaultMessage": "Wählen Sie genaue Tags aus"
+    "defaultMessage": "Wähle passende Tags aus"
   },
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Mindestens ein Galeriebild ist erforderlich, um den Inhalt deines {type, select,\nresourcepack {Ressourcenpakets zu präsentieren, außer bei Audio- oder Sprachpaketen. Wenn dies auf dein Paket zutrifft, wähle bitte das entsprechende Tag aus} shader {Shaders} other {Projekts}} zu zeigen."
@@ -195,22 +195,22 @@
     "defaultMessage": "Galeriebild hochladen"
   },
   "nags.upload-version.description": {
-    "defaultMessage": "Für die Einreichung eines Projekts zur Überprüfung, ist mindestens eine Version erforderlich."
+    "defaultMessage": "Mindestens eine Version ist erforderlich, damit ein Projekt zur Prüfung eingereicht werden kann."
   },
   "nags.upload-version.title": {
     "defaultMessage": "Version hochladen"
   },
   "nags.verify-external-links.description": {
-    "defaultMessage": "Einige Ihrer externen Links verwenden möglicherweise Domains, die für diese Art von Links ungeeignet sind."
+    "defaultMessage": "Einige deiner externen Links verwenden möglicherweise Domains, die für diesen Linktyp ungeeignet sind."
   },
   "nags.verify-external-links.title": {
-    "defaultMessage": "Externe Links bestätigen/überprüfen"
+    "defaultMessage": "Externe Links überprüfen"
   },
   "nags.versions.title": {
-    "defaultMessage": "Versions Seite aufrufen"
+    "defaultMessage": "Versionsseite ansehen"
   },
   "nags.visit-links-settings.title": {
-    "defaultMessage": "Lizenz-Einstellungen aufrufen"
+    "defaultMessage": "Linkeinstellungen ansehen"
   }
 }
 
diff --git a/packages/moderation/src/locales/ja-JP/index.json b/packages/moderation/src/locales/ja-JP/index.json
index b199e7ea..0923ba41 100644
--- a/packages/moderation/src/locales/ja-JP/index.json
+++ b/packages/moderation/src/locales/ja-JP/index.json
@@ -158,6 +158,9 @@
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "名前を整理"
   },
+  "nags.too-many-tags.description": {
+    "defaultMessage": "{tagCount, plural, other {#個}}のタグを選択しました。関連する検索結果に表示されるように、{maxTagCount}個以下に減らすことを検討してください。"
+  },
   "nags.too-many-tags.title": {
     "defaultMessage": "正確なタグを選択"
   },
diff --git a/packages/moderation/src/locales/nl-NL/index.json b/packages/moderation/src/locales/nl-NL/index.json
index df707ab5..4bf9a835 100644
--- a/packages/moderation/src/locales/nl-NL/index.json
+++ b/packages/moderation/src/locales/nl-NL/index.json
@@ -137,6 +137,9 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Verhelder de samenvatting"
   },
+  "nags.summary-too-short.description": {
+    "defaultMessage": "Je samenvatting is {length, plural,one {# character} other {# characters}}. Minimaal {minChars, plural, one {# character}} is aanbevolen om een informatieve en interessante samevatting te maken."
+  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Breidt de samenvatting uit"
   },
diff --git a/packages/moderation/src/locales/pt-BR/index.json b/packages/moderation/src/locales/pt-BR/index.json
index ae781875..32ae40b1 100644
--- a/packages/moderation/src/locales/pt-BR/index.json
+++ b/packages/moderation/src/locales/pt-BR/index.json
@@ -17,9 +17,15 @@
   "nags.add-links.title": {
     "defaultMessage": "Adicione links externos"
   },
+  "nags.all-tags-selected.description": {
+    "defaultMessage": "Você selecionou todas {totalAvailableTags, plural, one {# etiqueta disponível} other {# etiquetas disponíveis}}. Isso desvia do propósito das etiquetas, que são feitas para ajudar os usuários a acharem projetos relevantes. Por favor, selecione apenas as etiquetas relevantes a seu projeto."
+  },
   "nags.all-tags-selected.title": {
     "defaultMessage": "Selecione etiquetas específicas"
   },
+  "nags.description-too-short.description": {
+    "defaultMessage": "Sua descrição é {length, plural, one {# caractére legível} other {# caractéres legíveis}}. É recomendado pelo menos {minChars, plural, one {# caractére} other {# caractéres}} para criar uma descrição informativa e limpa."
+  },
   "nags.description-too-short.title": {
     "defaultMessage": "Expandir a descrição"
   },
@@ -47,6 +53,9 @@
   "nags.gallery.title": {
     "defaultMessage": "Visitar página da galeria"
   },
+  "nags.gpl-license-source-required.description": {
+    "defaultMessage": "Seu {type, select, mod {mod} plugin {plugin} other {projeto}} usa uma licença que necessita que o código fonte esteja disponível. Por favor, providencie o link do código fonte ou o arquivo de origem para cada versão adicional, ou considere usar uma licença diferente."
+  },
   "nags.gpl-license-source-required.title": {
     "defaultMessage": "Forneça o código-fonte"
   },
@@ -104,12 +113,24 @@
   "nags.moderator-feedback.description": {
     "defaultMessage": "Revise e resolva todos os problemas listados pela moderação antes de reenviar."
   },
+  "nags.moderator-feedback.title": {
+    "defaultMessage": "Verificar feedback"
+  },
+  "nags.multiple-resolution-tags.description": {
+    "defaultMessage": "Você selecionou {count, plural, one {# etiqueta de resolução} other {# etiquetas de resolução}} ({tags}). Resource packs devem tipicamente ter apenas uma etiqueta de resolução que corresponda a sua resolução primária"
+  },
   "nags.multiple-resolution-tags.title": {
     "defaultMessage": "Selecione a resolução correta"
   },
+  "nags.select-environments.description": {
+    "defaultMessage": "Selecione os ambientes em que seu {type, select, mod {mod} modpack {modpack} other {projeto}} trabalha."
+  },
   "nags.select-environments.title": {
     "defaultMessage": "Selecione um ambiente"
   },
+  "nags.select-license.description": {
+    "defaultMessage": "Selecione a licença em que seu {type, select, mod {mod} modpack {modpack} resourcepack {resource pack} shader {shader} plugin {plugin} datapack {data pack} other {project}} está distribuido."
+  },
   "nags.select-license.title": {
     "defaultMessage": "Selecione uma licença"
   },
@@ -149,15 +170,27 @@
   "nags.summary-special-formatting.title": {
     "defaultMessage": "Limpe o resumo"
   },
+  "nags.summary-too-short.description": {
+    "defaultMessage": "Seu sumário é {length, plural, one {# caractére} other {# caractéres}}. É recomendado pelo menos {minChars, plural, one {# caractére} other {# caractéres}} para criar um sumário informativo e atraente."
+  },
   "nags.summary-too-short.title": {
     "defaultMessage": "Aumente o resumo"
   },
+  "nags.title-contains-technical-info.description": {
+    "defaultMessage": "Manter o Nome do seu projeto limpo faz ele ser memorável e mais fácil de achar. As informações sobre a versão e o carregador são automaticamente exibidas com seu projeto."
+  },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Limpe o nome"
   },
+  "nags.too-many-tags.description": {
+    "defaultMessage": "Você selecionou {tagCount, plural, one {# etiqueta} other {# etiquetas}}. Considere reduzir para {maxTagCount} ou menos para ter certeza que seu projeto aparece nos resultados de pesquisa relevantes."
+  },
   "nags.too-many-tags.title": {
     "defaultMessage": "Selecione etiquetas específicas"
   },
+  "nags.upload-gallery-image.description": {
+    "defaultMessage": "Pelo menos uma imagem da galeria é requerida para mostrar o conteúdo do seu {type, select, resourcepack {pacto de recursos, com excessão do áudio e pacotes de localização. Se isto descreve seu pacote, por favor selecione a etiqueta apropriada} shader {shader} other {projeto}}."
+  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Envie uma imagem para a galeria"
   },
diff --git a/packages/ui/src/locales/da-DK/index.json b/packages/ui/src/locales/da-DK/index.json
index e8d8f0bc..63f0289a 100644
--- a/packages/ui/src/locales/da-DK/index.json
+++ b/packages/ui/src/locales/da-DK/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "Opret affiliate link"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "Opretter et nyt affiliate kode"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Giv dit affiliate link et navn så du ved hvor folk kommer fra!"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "Title af affiliate link"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "f.eks. YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "Brugernavnet af brugeren for at lave en affiliate kode til"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Brugernavn"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Indskriv brugernavn..."
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "Lavet af {user}"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "Opretter affiliate link..."
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "Fjern affiliate link"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Se analyser"
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -8,6 +44,9 @@
   "badge.new": {
     "defaultMessage": "Ny"
   },
+  "button.affiliate-links": {
+    "defaultMessage": "Affiliate links"
+  },
   "button.analytics": {
     "defaultMessage": "Analytics"
   },
@@ -17,6 +56,12 @@
   "button.cancel": {
     "defaultMessage": "Annuller"
   },
+  "button.clear": {
+    "defaultMessage": "Ryd"
+  },
+  "button.close": {
+    "defaultMessage": "Luk"
+  },
   "button.continue": {
     "defaultMessage": "Forsæt"
   },
@@ -41,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "Følg"
   },
+  "button.max": {
+    "defaultMessage": "Max"
+  },
   "button.more-options": {
     "defaultMessage": "Flere muligheder"
   },
@@ -113,6 +161,84 @@
   "collection.label.private": {
     "defaultMessage": "Privat"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Adresse"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "Adresse 2 (Valgfri)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Antal"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Bank navn"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Virksomhedens navn"
+  },
+  "form.label.city": {
+    "defaultMessage": "By"
+  },
+  "form.label.country": {
+    "defaultMessage": "Land"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Fødselsdags dato"
+  },
+  "form.label.email": {
+    "defaultMessage": "Email"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Fornavn"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Efternavn"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Postnummer/ZIP kode"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Stat/provins"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Indskriv adresse"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "Lejlighed, suite osv."
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "Indskriv antal"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "Indskriv bank navn"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "Vælg bank navn"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "Indskriv virksomhedsnavn"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Indskriv by"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Vælg land"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "Indskriv email adresse"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Indskriv fornavn"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Indskriv efternavn"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Indskriv postkode"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Indskriv state/province"
+  },
   "icon-select.edit": {
     "defaultMessage": "Rediger ikon"
   },
@@ -149,6 +275,30 @@
   "instance.worlds.game_mode.survival": {
     "defaultMessage": "Overlevelsestilstand"
   },
+  "instance.worlds.game_mode.unknown": {
+    "defaultMessage": "Ukendt gamemode"
+  },
+  "label.available": {
+    "defaultMessage": "{amount} tilgængelig."
+  },
+  "label.changes-saved": {
+    "defaultMessage": "Ændringer gemt"
+  },
+  "label.collections": {
+    "defaultMessage": "Samlinger"
+  },
+  "label.created-ago": {
+    "defaultMessage": "Oprettet {ago}"
+  },
+  "label.dashboard": {
+    "defaultMessage": "Kontrolpanel"
+  },
+  "label.delete": {
+    "defaultMessage": "Slet"
+  },
+  "label.description": {
+    "defaultMessage": "Beskrivelse"
+  },
   "omorphia.component.badge.label.under-review": {
     "defaultMessage": "Under gennemgang"
   },
@@ -209,12 +359,66 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Virtuelle Visas"
+  },
   "project-type.all": {
     "defaultMessage": "Alle"
   },
+  "project-type.datapack.capital": {
+    "defaultMessage": "{count, plural, one {Data Pack} other {Data Packs}}"
+  },
+  "project-type.datapack.category": {
+    "defaultMessage": "Data Packs"
+  },
+  "project-type.datapack.lowercase": {
+    "defaultMessage": "{count, plural, one {data pack} other {data packs}}"
+  },
+  "project-type.mod.capital": {
+    "defaultMessage": "{count, plural, one {Mod} other {Mods}}"
+  },
+  "project-type.mod.category": {
+    "defaultMessage": "Mods"
+  },
   "project-type.mod.lowercase": {
     "defaultMessage": "{count, plural, one {modifikation} other {modifikationer}}"
   },
+  "project-type.modpack.capital": {
+    "defaultMessage": "{count, plural, one {Modpack} other {Modpacks}}"
+  },
+  "project-type.modpack.category": {
+    "defaultMessage": "Modpacks"
+  },
+  "project-type.modpack.lowercase": {
+    "defaultMessage": "{count, plural, one {modpack} other {modpacks}}"
+  },
+  "project-type.plugin.capital": {
+    "defaultMessage": "{count, plural, one {Plugin} other {Plugins}}"
+  },
+  "project-type.plugin.category": {
+    "defaultMessage": "Plugins"
+  },
+  "project-type.plugin.lowercase": {
+    "defaultMessage": "{count, plural, one {plugin} other {plugins}}"
+  },
+  "project-type.resourcepack.capital": {
+    "defaultMessage": "{count, plural, one {Resource Pack} other {Resource Packs}}"
+  },
+  "project-type.resourcepack.category": {
+    "defaultMessage": "Resource Packs"
+  },
+  "project-type.resourcepack.lowercase": {
+    "defaultMessage": "{count, plural, one {resource pack} other {resource packs}}"
+  },
+  "project-type.shader.capital": {
+    "defaultMessage": "{count, plural, one {Shader} other {Shaders}}"
+  },
+  "project-type.shader.category": {
+    "defaultMessage": "Shaders"
+  },
+  "project-type.shader.lowercase": {
+    "defaultMessage": "{count, plural, one {shader} other {shaders}}"
+  },
   "project.about.links.donate.generic": {
     "defaultMessage": "Doner"
   },
diff --git a/packages/ui/src/locales/de-CH/index.json b/packages/ui/src/locales/de-CH/index.json
index 649df2b9..03014b87 100644
--- a/packages/ui/src/locales/de-CH/index.json
+++ b/packages/ui/src/locales/de-CH/index.json
@@ -693,7 +693,7 @@
     "defaultMessage": "Nur Dedizierte Server"
   },
   "project.settings.environment.server_only.description": {
-    "defaultMessage": "Alle Funktionen werden auf dem Server ausgeführt und sind mit Vanilla-Clientskompatibel."
+    "defaultMessage": "Alle Funktionen werden auf dem Server ausgeführt und sind mit Vanilla-Clients kompatibel."
   },
   "project.settings.environment.server_only.supports_singleplayer.title": {
     "defaultMessage": "Funktioniert auch im Einzelspieler"
@@ -906,7 +906,7 @@
     "defaultMessage": "Perfekt für 1 bis 5 Freunde mit ein paar leichten Mods."
   },
   "servers.purchase.step.plan.subtitle": {
-    "defaultMessage": "Wähle die Menge an Arbeitsspeicher und Eigenschafter, welche deinen Anforderungen entsrechen."
+    "defaultMessage": "Wähle die RAM-Kapazität und die technischen Spezifikationen, die deinen Anforderungen entsprechen."
   },
   "servers.purchase.step.plan.title": {
     "defaultMessage": "Plan"
diff --git a/packages/ui/src/locales/de-DE/index.json b/packages/ui/src/locales/de-DE/index.json
index 6c7bb0e0..d2a76ba8 100644
--- a/packages/ui/src/locales/de-DE/index.json
+++ b/packages/ui/src/locales/de-DE/index.json
@@ -48,7 +48,7 @@
     "defaultMessage": "Partnerlinks"
   },
   "button.analytics": {
-    "defaultMessage": "Analytik"
+    "defaultMessage": "Analysen"
   },
   "button.back": {
     "defaultMessage": "Zurück"
@@ -252,7 +252,7 @@
     "defaultMessage": "Icon auswählen"
   },
   "input.search.placeholder": {
-    "defaultMessage": "Suche..."
+    "defaultMessage": "Suchen..."
   },
   "input.view.gallery": {
     "defaultMessage": "Galerieansicht"
@@ -303,7 +303,7 @@
     "defaultMessage": "Fehler"
   },
   "label.followed-projects": {
-    "defaultMessage": "Projekte, denen Du folgst"
+    "defaultMessage": "Gefolgte Projekte"
   },
   "label.loading": {
     "defaultMessage": "Lädt..."
@@ -336,7 +336,7 @@
     "defaultMessage": "Gespeichert"
   },
   "label.scopes": {
-    "defaultMessage": "Anwendungsbereiche"
+    "defaultMessage": "Berechtigungen"
   },
   "label.server": {
     "defaultMessage": "Server"
@@ -372,7 +372,7 @@
     "defaultMessage": "Ein Fehler ist aufgetreten"
   },
   "omorphia.component.badge.label.accepted": {
-    "defaultMessage": "Angenommen"
+    "defaultMessage": "Akzeptiert"
   },
   "omorphia.component.badge.label.approved": {
     "defaultMessage": "Angenommen"
@@ -450,7 +450,7 @@
     "defaultMessage": "Nicht unterstützt"
   },
   "omorphia.component.purchase_modal.payment_method_card_display": {
-    "defaultMessage": "{card_brand} endet in {last_four}"
+    "defaultMessage": "{card_brand} mit Endung {last_four}"
   },
   "omorphia.component.purchase_modal.payment_method_type.amazon_pay": {
     "defaultMessage": "Amazon Pay"
@@ -513,7 +513,7 @@
     "defaultMessage": "Virtuelle Visa"
   },
   "project-type.all": {
-    "defaultMessage": "Alle Projekte"
+    "defaultMessage": "Alle"
   },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Datenpaket} other {Datenpakete}}"
@@ -555,7 +555,7 @@
     "defaultMessage": "{count, plural, one {Ressourcenpaket} other {Ressourcenpakete}}"
   },
   "project-type.resourcepack.category": {
-    "defaultMessage": "Ressourcenpaket"
+    "defaultMessage": "Ressourcenpakete"
   },
   "project-type.resourcepack.lowercase": {
     "defaultMessage": "{count, plural, one {Ressourcenpaket} other {Ressourcenpakete}}"
@@ -606,25 +606,25 @@
     "defaultMessage": "Ersteller"
   },
   "project.about.details.created": {
-    "defaultMessage": "Erstellt vor {date}"
+    "defaultMessage": "Erstellt am {date}"
   },
   "project.about.details.licensed": {
-    "defaultMessage": "Lizenziert {license}"
+    "defaultMessage": "Lizenziert mit {license}"
   },
   "project.about.details.published": {
     "defaultMessage": "Veröffentlicht am {date}"
   },
   "project.about.details.submitted": {
-    "defaultMessage": "Veröffentlicht am {date}"
+    "defaultMessage": "Eingereicht am {date}"
   },
   "project.about.details.title": {
     "defaultMessage": "Details"
   },
   "project.about.details.updated": {
-    "defaultMessage": "Aktualisiert vor {date}"
+    "defaultMessage": "Aktualisiert am {date}"
   },
   "project.about.links.discord": {
-    "defaultMessage": "Discord Server beitreten"
+    "defaultMessage": "Discordserver beitreten"
   },
   "project.about.links.donate.bmac": {
     "defaultMessage": "Buy me a coffee"
@@ -657,52 +657,52 @@
     "defaultMessage": "Wiki besuchen"
   },
   "project.settings.analytics.title": {
-    "defaultMessage": "Analytik"
+    "defaultMessage": "Analysen"
   },
   "project.settings.description.title": {
     "defaultMessage": "Beschreibung"
   },
   "project.settings.environment.client_and_server.description": {
-    "defaultMessage": "Hat Funktionen auf Client und Server, auch wenn nur teilweise."
+    "defaultMessage": "Hat Funktionen auf Client und Server, wenn auch nur teilweise."
   },
   "project.settings.environment.client_and_server.optional_both.title": {
-    "defaultMessage": "Optional auf beiden Seiten. Funktioniert gleich, egal auf welcher Seite installiert"
+    "defaultMessage": "Optional auf beiden, funktioniert gleich egal auf welcher Seite installiert"
   },
   "project.settings.environment.client_and_server.optional_both_prefers_both.title": {
-    "defaultMessage": "Optional auf beiden Seiten. Funktioniert am besten, wenn auf beiden Seite installiert"
+    "defaultMessage": "Optional auf beiden Seiten. Funktioniert am besten wenn auf beiden Seiten installiert"
   },
   "project.settings.environment.client_and_server.optional_client.title": {
-    "defaultMessage": "Auf dem Client optional"
+    "defaultMessage": "Auf Client optional"
   },
   "project.settings.environment.client_and_server.optional_server.title": {
-    "defaultMessage": "Auf dem Server optional"
+    "defaultMessage": "Auf Server optional"
   },
   "project.settings.environment.client_and_server.required_both.title": {
-    "defaultMessage": "Auf beiden Seite erfordert"
+    "defaultMessage": "Auf beiden Seiten benötigt"
   },
   "project.settings.environment.client_and_server.title": {
     "defaultMessage": "Client und Server"
   },
   "project.settings.environment.client_only.description": {
-    "defaultMessage": "Alle Funktionen werden auf dem Client ausgeführt und sind mit Vanilla-Servern kompatibel."
+    "defaultMessage": "Alle Funktionen werden auf der Client-Seite ausgeführt und sind mit Vanilla-Servern kompatibel."
   },
   "project.settings.environment.client_only.title": {
-    "defaultMessage": "Nur clientseitig"
+    "defaultMessage": "Nur Clientseitig"
   },
   "project.settings.environment.server_only.dedicated_only.title": {
     "defaultMessage": "Nur Dedizierter Server"
   },
   "project.settings.environment.server_only.description": {
-    "defaultMessage": "Alle Funktionen werden auf dem Client ausgeführt und sind mit Vanilla-Servern kompatibel."
+    "defaultMessage": "Alle Funktionen werden auf dem Server ausgeführt und sind mit Vanilla-Clients kompatibel."
   },
   "project.settings.environment.server_only.supports_singleplayer.title": {
-    "defaultMessage": "Funktioniert auch im Einzelspielermodus"
+    "defaultMessage": "Funktioniert auch im Einzelspieler"
   },
   "project.settings.environment.server_only.title": {
-    "defaultMessage": "Nur serverseitig"
+    "defaultMessage": "Nur Serverseitig"
   },
   "project.settings.environment.singleplayer.description": {
-    "defaultMessage": "Funktioniert nur im Einzelspielermodus oder, wenn keine Verbindung zu einem Mehrspieler-Server besteht."
+    "defaultMessage": "Funktioniert nur im Einzelspieler oder wenn nicht mit einem Mehrspieler-Server verbunden."
   },
   "project.settings.environment.singleplayer.title": {
     "defaultMessage": "Nur Einzelspieler"
@@ -786,13 +786,13 @@
     "defaultMessage": "Nicht gelistet"
   },
   "project.visibility.unlisted-by-staff": {
-    "defaultMessage": "Von der Verwaltung ausgeblendet"
+    "defaultMessage": "Von Mitarbeitern entlistet"
   },
   "search.filter.locked.default": {
     "defaultMessage": "Filter gesperrt"
   },
   "search.filter.locked.default.description": {
-    "defaultMessage": "Entsperrung dieses Filters könnte dir ermöglichen inkompatible Inhalte zu installieren."
+    "defaultMessage": "Durch das Entsperren dieses Filters installierst du möglicherweise inkompatible Inhalte."
   },
   "search.filter.locked.default.sync": {
     "defaultMessage": "Filter synchronisieren"
@@ -813,7 +813,7 @@
     "defaultMessage": "Server"
   },
   "search.filter_type.game_version": {
-    "defaultMessage": "Spiel Version"
+    "defaultMessage": "Spielversion"
   },
   "search.filter_type.game_version.all_versions": {
     "defaultMessage": "Alle Versionen anzeigen"
@@ -822,7 +822,7 @@
     "defaultMessage": "Lizenz"
   },
   "search.filter_type.license.open_source": {
-    "defaultMessage": "Quelle öffnen"
+    "defaultMessage": "Open Source"
   },
   "search.filter_type.mod_loader": {
     "defaultMessage": "Loader"
@@ -837,7 +837,7 @@
     "defaultMessage": "Plattform"
   },
   "search.filter_type.project_id": {
-    "defaultMessage": "Projekt ID"
+    "defaultMessage": "Projekt-ID"
   },
   "search.filter_type.shader_loader": {
     "defaultMessage": "Loader"
@@ -846,7 +846,7 @@
     "defaultMessage": "Ausblenden"
   },
   "servers.notice.dismissable": {
-    "defaultMessage": "Entfernbar"
+    "defaultMessage": "Ausblendbar"
   },
   "servers.notice.heading.attention": {
     "defaultMessage": "Achtung"
@@ -858,7 +858,7 @@
     "defaultMessage": "Kritisch"
   },
   "servers.notice.level.info.name": {
-    "defaultMessage": "Informationen"
+    "defaultMessage": "Info"
   },
   "servers.notice.level.survey.name": {
     "defaultMessage": "Umfrage"
@@ -867,10 +867,10 @@
     "defaultMessage": "Warnung"
   },
   "servers.notice.undismissable": {
-    "defaultMessage": "Nicht entfernbar"
+    "defaultMessage": "Nicht ausblendbar"
   },
   "servers.purchase.step.payment.description": {
-    "defaultMessage": "Es werden Ihnen noch keine Kosten berechnet."
+    "defaultMessage": "Es werden dir noch keine Kosten berechnet."
   },
   "servers.purchase.step.payment.prompt": {
     "defaultMessage": "Zahlungsmethode auswählen"
@@ -879,22 +879,22 @@
     "defaultMessage": "Zahlungsmethode"
   },
   "servers.purchase.step.plan.billed": {
-    "defaultMessage": "in Rechnung gestellt {interval}"
+    "defaultMessage": "{interval} in Rechnung gestellt"
   },
   "servers.purchase.step.plan.custom.desc": {
-    "defaultMessage": "Wählen Sie einen individuellen Plan mit genau den Spezifikationen, die Sie benötigen."
+    "defaultMessage": "Wähle einen benutzerdefinierten Plan mit genau den Spezifikationen, die du brauchst."
   },
   "servers.purchase.step.plan.get-started": {
     "defaultMessage": "Loslegen"
   },
   "servers.purchase.step.plan.large.desc": {
-    "defaultMessage": "Ideal für 15 bis 25 Spieler, Modpacks oder umfangreiche Modding-Projekte."
+    "defaultMessage": "Ideal für 15–25 Spieler, Modpacks oder umfangreiche Modding-Projekte."
   },
   "servers.purchase.step.plan.medium.desc": {
-    "defaultMessage": "Ideal für 6 bis 15 Spieler und mehrere Mods."
+    "defaultMessage": "Ideal für 6–15 Spieler und mehrere Mods."
   },
   "servers.purchase.step.plan.most-popular": {
-    "defaultMessage": "Bekannteste"
+    "defaultMessage": "Am beliebtesten"
   },
   "servers.purchase.step.plan.prompt": {
     "defaultMessage": "Wähle einen Plan aus"
@@ -903,10 +903,10 @@
     "defaultMessage": "Plan auswählen"
   },
   "servers.purchase.step.plan.small.desc": {
-    "defaultMessage": "Perfekt für 1–5 Freunde mit ein paar kleinen Modifikationen."
+    "defaultMessage": "Perfekt für 1–5 Freunde mit ein paar kleinen Mods."
   },
   "servers.purchase.step.plan.subtitle": {
-    "defaultMessage": "Wähle die RAM-Kapazität und die technischen Daten, die deinen Anforderungen entsprechen."
+    "defaultMessage": "Wähle die RAM-Kapazität und die technischen Spezifikationen, die deinen Anforderungen entsprechen."
   },
   "servers.purchase.step.plan.title": {
     "defaultMessage": "Plan"
@@ -921,7 +921,7 @@
     "defaultMessage": "Zentraleuropa"
   },
   "servers.region.custom.prompt": {
-    "defaultMessage": "Wie viel RAM willst du für deinen Server haben?"
+    "defaultMessage": "Wie viel RAM soll dein Server haben?"
   },
   "servers.region.north-america": {
     "defaultMessage": "Nordamerika"
@@ -930,7 +930,7 @@
     "defaultMessage": "Wo soll sich dein Server befinden?"
   },
   "servers.region.region-unsupported": {
-    "defaultMessage": "Region nicht aufgeführt? <link>Teilen Sie uns mit, wo Sie Modrinth-Server als Nächstes sehen möchten!</link>"
+    "defaultMessage": "Region nicht aufgeführt? <link>Teile uns mit, wo du Modrinth-Server als Nächstes sehen möchtest!</link>"
   },
   "servers.region.southeast-asia": {
     "defaultMessage": "Südostasien"
@@ -942,7 +942,7 @@
     "defaultMessage": "Konto und Sicherheit"
   },
   "settings.appearance.title": {
-    "defaultMessage": "Aussehen"
+    "defaultMessage": "Erscheinungsbild"
   },
   "settings.applications.title": {
     "defaultMessage": "Deine Anwendungen"
@@ -951,7 +951,7 @@
     "defaultMessage": "Autorisierte Apps"
   },
   "settings.billing.title": {
-    "defaultMessage": "Rechnungsstellung und Abos"
+    "defaultMessage": "Abrechnung und Abonnements"
   },
   "settings.display.theme.dark": {
     "defaultMessage": "Dunkel"
diff --git a/packages/ui/src/locales/hu-HU/index.json b/packages/ui/src/locales/hu-HU/index.json
index d0190db6..31e20c46 100644
--- a/packages/ui/src/locales/hu-HU/index.json
+++ b/packages/ui/src/locales/hu-HU/index.json
@@ -1,4 +1,13 @@
 {
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "pl: YouTube"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "Felhasználónév"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Írj be a felhasználónevet..."
+  },
   "badge.beta": {
     "defaultMessage": "Béta"
   },
@@ -119,6 +128,48 @@
   "collection.label.private": {
     "defaultMessage": "Privát"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Cím"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "Cím 2 (választható)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Összeg"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Bank neve"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Cég név"
+  },
+  "form.label.city": {
+    "defaultMessage": "Város"
+  },
+  "form.label.country": {
+    "defaultMessage": "Ország"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Születési idő"
+  },
+  "form.label.email": {
+    "defaultMessage": "Email-cím"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Keresztnév"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Vezetéknév"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Irányítószám"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Megye/tartomány"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Adja meg a címet"
+  },
   "icon-select.edit": {
     "defaultMessage": "Ikon szerkesztése"
   },
diff --git a/packages/ui/src/locales/ja-JP/index.json b/packages/ui/src/locales/ja-JP/index.json
index 7ae2c772..7e4ac153 100644
--- a/packages/ui/src/locales/ja-JP/index.json
+++ b/packages/ui/src/locales/ja-JP/index.json
@@ -1,4 +1,40 @@
 {
+  "affiliate.create.button": {
+    "defaultMessage": "アフィリエイトリンクを作成"
+  },
+  "affiliate.create.header": {
+    "defaultMessage": "新しいアフィリエイトコードを作成中"
+  },
+  "affiliate.create.title.description": {
+    "defaultMessage": "流入元が分かる名前を付けてください！"
+  },
+  "affiliate.create.title.label": {
+    "defaultMessage": "アフィリエイトリンクのタイトル"
+  },
+  "affiliate.create.title.placeholder": {
+    "defaultMessage": "例：YouTube"
+  },
+  "affiliate.create.user.description": {
+    "defaultMessage": "アフィリエイトコードを作成するユーザー名"
+  },
+  "affiliate.create.user.label": {
+    "defaultMessage": "ユーザーネーム"
+  },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "ユーザーネームを入力…"
+  },
+  "affiliate.createdBy": {
+    "defaultMessage": "{user}によって作成"
+  },
+  "affiliate.creating.button": {
+    "defaultMessage": "アフィリエイトリンクを作成中…"
+  },
+  "affiliate.revoke": {
+    "defaultMessage": "アフィリエイトリンクを無効化"
+  },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "アナリティクスを表示"
+  },
   "badge.beta": {
     "defaultMessage": "ベータ"
   },
@@ -6,7 +42,10 @@
     "defaultMessage": "ベータ版リリース"
   },
   "badge.new": {
-    "defaultMessage": "新しい"
+    "defaultMessage": "New"
+  },
+  "button.affiliate-links": {
+    "defaultMessage": "アフィリエイトリンク"
   },
   "button.analytics": {
     "defaultMessage": "統計"
@@ -47,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "フォロー"
   },
+  "button.max": {
+    "defaultMessage": "最大"
+  },
   "button.more-options": {
     "defaultMessage": "追加のオプション"
   },
@@ -119,6 +161,75 @@
   "collection.label.private": {
     "defaultMessage": "個人用"
   },
+  "form.label.address-line": {
+    "defaultMessage": "住所 1行目"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "住所 2行目(任意)"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "銀行名"
+  },
+  "form.label.city": {
+    "defaultMessage": "市区町村"
+  },
+  "form.label.country": {
+    "defaultMessage": "国"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "生年月日"
+  },
+  "form.label.email": {
+    "defaultMessage": "メールアドレス"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "名"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "姓"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "郵便番号"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "都道府県"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "住所を入力"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "マンション名・部屋番号など。"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "銀行名を入力"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "銀行名を選択"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "事業名を入力"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "市区町村を入力"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "国を選択"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "メールアドレスを入力"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "名を入力"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "姓を入力"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "郵便番号を入力"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "都道府県を入力"
+  },
   "icon-select.edit": {
     "defaultMessage": "アイコンを編集"
   },
@@ -158,6 +269,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "不明なゲームモード"
   },
+  "label.available": {
+    "defaultMessage": "{amount}つが利用可能。"
+  },
   "label.changes-saved": {
     "defaultMessage": "変更が保存されました"
   },
@@ -353,6 +467,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -362,6 +479,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "寄付"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "寄付"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "ギフトカード"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "ギフトカード"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "バーチャル Visa"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "バーチャル Visa"
+  },
   "project-type.all": {
     "defaultMessage": "すべて"
   },
diff --git a/packages/ui/src/locales/pl-PL/index.json b/packages/ui/src/locales/pl-PL/index.json
index 63d1a486..ff1865bf 100644
--- a/packages/ui/src/locales/pl-PL/index.json
+++ b/packages/ui/src/locales/pl-PL/index.json
@@ -168,7 +168,7 @@
     "defaultMessage": "Adres, wiersz 2 (niewymagane)"
   },
   "form.label.amount": {
-    "defaultMessage": "Kwota"
+    "defaultMessage": "Ilość"
   },
   "form.label.bank-name": {
     "defaultMessage": "Nazwa banku"
@@ -177,7 +177,7 @@
     "defaultMessage": "Nazwa przedsiębiorczości"
   },
   "form.label.city": {
-    "defaultMessage": "Miejscowość"
+    "defaultMessage": "Miasto"
   },
   "form.label.country": {
     "defaultMessage": "Kraj"
@@ -225,19 +225,19 @@
     "defaultMessage": "Wybierz kraj"
   },
   "form.placeholder.email": {
-    "defaultMessage": "Podaj adres e-mail"
+    "defaultMessage": "Wprowadź adres e-mail"
   },
   "form.placeholder.first-name": {
-    "defaultMessage": "Podaj imię"
+    "defaultMessage": "Wprowadź imię"
   },
   "form.placeholder.last-name": {
-    "defaultMessage": "Podaj nazwisko"
+    "defaultMessage": "Wprowadź nazwisko"
   },
   "form.placeholder.postal-code": {
-    "defaultMessage": "Podaj kod pocztowy"
+    "defaultMessage": "Wprowadź kod pocztowy"
   },
   "form.placeholder.state": {
-    "defaultMessage": "Podaj województwo"
+    "defaultMessage": "Wprowadź województwo"
   },
   "icon-select.edit": {
     "defaultMessage": "Edytuj ikonę"
diff --git a/packages/ui/src/locales/pt-BR/index.json b/packages/ui/src/locales/pt-BR/index.json
index 0e979f04..0d215d4c 100644
--- a/packages/ui/src/locales/pt-BR/index.json
+++ b/packages/ui/src/locales/pt-BR/index.json
@@ -5,15 +5,24 @@
   "affiliate.create.header": {
     "defaultMessage": "Criando novo código de afiliado"
   },
+  "affiliate.create.title.description": {
+    "defaultMessage": "Dar a seu link afiliado um nome para que saiba de onde as pessoas estão vindo!"
+  },
   "affiliate.create.title.label": {
     "defaultMessage": "Título do link de afiliado"
   },
   "affiliate.create.title.placeholder": {
     "defaultMessage": "ex.: YouTube"
   },
+  "affiliate.create.user.description": {
+    "defaultMessage": "O nome de usuário para quem vai criar o código afiliado"
+  },
   "affiliate.create.user.label": {
     "defaultMessage": "Nome de usuário"
   },
+  "affiliate.create.user.placeholder": {
+    "defaultMessage": "Digitar nome de usuário..."
+  },
   "affiliate.createdBy": {
     "defaultMessage": "Criado por {user}"
   },
@@ -23,6 +32,9 @@
   "affiliate.revoke": {
     "defaultMessage": "Revogar link de afiliado"
   },
+  "affiliate.viewAnalytics": {
+    "defaultMessage": "Ver estatísticas"
+  },
   "badge.beta": {
     "defaultMessage": "Beta"
   },
@@ -74,6 +86,9 @@
   "button.follow": {
     "defaultMessage": "Seguir"
   },
+  "button.max": {
+    "defaultMessage": "Máx"
+  },
   "button.more-options": {
     "defaultMessage": "Mais opções"
   },
@@ -111,7 +126,7 @@
     "defaultMessage": "Salvando"
   },
   "button.sign-in": {
-    "defaultMessage": "Entrar"
+    "defaultMessage": "Iniciar sessão"
   },
   "button.sign-out": {
     "defaultMessage": "Sair"
@@ -146,6 +161,84 @@
   "collection.label.private": {
     "defaultMessage": "Privado"
   },
+  "form.label.address-line": {
+    "defaultMessage": "Endereço"
+  },
+  "form.label.address-line-2": {
+    "defaultMessage": "2° Endereço (opcional)"
+  },
+  "form.label.amount": {
+    "defaultMessage": "Quantia"
+  },
+  "form.label.bank-name": {
+    "defaultMessage": "Nome do banco"
+  },
+  "form.label.business-name": {
+    "defaultMessage": "Nome do negócio"
+  },
+  "form.label.city": {
+    "defaultMessage": "Cidade"
+  },
+  "form.label.country": {
+    "defaultMessage": "País"
+  },
+  "form.label.date-of-birth": {
+    "defaultMessage": "Data de nascimento"
+  },
+  "form.label.email": {
+    "defaultMessage": "E-mail"
+  },
+  "form.label.first-name": {
+    "defaultMessage": "Nome"
+  },
+  "form.label.last-name": {
+    "defaultMessage": "Sobrenome"
+  },
+  "form.label.postal-code": {
+    "defaultMessage": "Código postal"
+  },
+  "form.label.state-province": {
+    "defaultMessage": "Estado"
+  },
+  "form.placeholder.address": {
+    "defaultMessage": "Digitar endereço"
+  },
+  "form.placeholder.address-2": {
+    "defaultMessage": "Apartamento, Suíte, etc."
+  },
+  "form.placeholder.amount": {
+    "defaultMessage": "Digitar quantia"
+  },
+  "form.placeholder.bank-name": {
+    "defaultMessage": "Digitar nome bancário"
+  },
+  "form.placeholder.bank-name-dropdown": {
+    "defaultMessage": "Selecionar nome bancário"
+  },
+  "form.placeholder.business-name": {
+    "defaultMessage": "Digitar nome do negócio"
+  },
+  "form.placeholder.city": {
+    "defaultMessage": "Digitar cidade"
+  },
+  "form.placeholder.country": {
+    "defaultMessage": "Selecionar país"
+  },
+  "form.placeholder.email": {
+    "defaultMessage": "Digitar endereço de e-mail"
+  },
+  "form.placeholder.first-name": {
+    "defaultMessage": "Digitar nome"
+  },
+  "form.placeholder.last-name": {
+    "defaultMessage": "Digitar sobrenome"
+  },
+  "form.placeholder.postal-code": {
+    "defaultMessage": "Digitar código postal"
+  },
+  "form.placeholder.state": {
+    "defaultMessage": "Digitar estado"
+  },
   "icon-select.edit": {
     "defaultMessage": "Editar ícone"
   },
@@ -185,6 +278,9 @@
   "instance.worlds.game_mode.unknown": {
     "defaultMessage": "Modo de jogo desconhecido"
   },
+  "label.available": {
+    "defaultMessage": "{amount} disponível."
+  },
   "label.changes-saved": {
     "defaultMessage": "Alterações salvas"
   },
@@ -233,6 +329,9 @@
   "label.rejected": {
     "defaultMessage": "Negado"
   },
+  "label.rewards-program-terms-agreement": {
+    "defaultMessage": "Eu concordo com os <terms-link>Termos do Programa de Recompensas</terms-link>"
+  },
   "label.saved": {
     "defaultMessage": "Salvo"
   },
@@ -380,6 +479,9 @@
   "omorphia.component.purchase_modal.payment_method_type.paypal": {
     "defaultMessage": "PayPal"
   },
+  "omorphia.component.purchase_modal.payment_method_type.paypal_international": {
+    "defaultMessage": "PayPal Internacional"
+  },
   "omorphia.component.purchase_modal.payment_method_type.unionpay": {
     "defaultMessage": "UnionPay"
   },
@@ -389,6 +491,27 @@
   "omorphia.component.purchase_modal.payment_method_type.visa": {
     "defaultMessage": "Visa"
   },
+  "payment-method.charity": {
+    "defaultMessage": "Caridade"
+  },
+  "payment-method.charity-plural": {
+    "defaultMessage": "Caridades"
+  },
+  "payment-method.gift-card": {
+    "defaultMessage": "Vale-presente"
+  },
+  "payment-method.gift-card-plural": {
+    "defaultMessage": "Vale-presentes"
+  },
+  "payment-method.venmo": {
+    "defaultMessage": "Venmo"
+  },
+  "payment-method.virtual-visa": {
+    "defaultMessage": "Visa Virtual"
+  },
+  "payment-method.virtual-visa-plural": {
+    "defaultMessage": "Visas Virtuais"
+  },
   "project-type.all": {
     "defaultMessage": "Todos"
   },
diff --git a/packages/ui/src/locales/tl-PH/index.json b/packages/ui/src/locales/tl-PH/index.json
index 224b0ef4..14276491 100644
--- a/packages/ui/src/locales/tl-PH/index.json
+++ b/packages/ui/src/locales/tl-PH/index.json
@@ -96,7 +96,7 @@
     "defaultMessage": "App"
   },
   "changelog.product.servers": {
-    "defaultMessage": "Mga tagapagsilbi"
+    "defaultMessage": "Mga pansilbi"
   },
   "changelog.product.web": {
     "defaultMessage": "Pahinarya"
@@ -189,10 +189,10 @@
     "defaultMessage": "Mga Sakop"
   },
   "label.server": {
-    "defaultMessage": "Tagapagsilbi"
+    "defaultMessage": "Pansilbi"
   },
   "label.servers": {
-    "defaultMessage": "Mga tagapagsilbi"
+    "defaultMessage": "Mga pansilbi"
   },
   "label.settings": {
     "defaultMessage": "Mga kagustuhan"
@@ -276,13 +276,13 @@
     "defaultMessage": "Kliyente"
   },
   "omorphia.component.environment-indicator.label.client-and-server": {
-    "defaultMessage": "Kliyente at tagapagsilbi"
+    "defaultMessage": "Kliyente at pansilbi"
   },
   "omorphia.component.environment-indicator.label.client-or-server": {
-    "defaultMessage": "Kliyente o tagapagsilbi"
+    "defaultMessage": "Kliyente o pansilbi"
   },
   "omorphia.component.environment-indicator.label.server": {
-    "defaultMessage": "Tagapagsilbi"
+    "defaultMessage": "Pansilbi"
   },
   "omorphia.component.environment-indicator.label.type": {
     "defaultMessage": "Isang {type}"
@@ -372,7 +372,7 @@
     "defaultMessage": "Gagana rin sa pang-isahang laro"
   },
   "project.settings.environment.singleplayer.description": {
-    "defaultMessage": "Gagana lamang sa Pang-isahang laro o kung hindi nakakonekta sa isang tagapagsilbing Pangmaramihang laro."
+    "defaultMessage": "Gagana lamang sa Pang-isahang laro o kung hindi nakakonekta sa isang pansilbing Pangmaramihang laro."
   },
   "project.settings.environment.singleplayer.title": {
     "defaultMessage": "Pang-isahang laro lamang"
@@ -438,7 +438,7 @@
     "defaultMessage": "Kapaligiran"
   },
   "search.filter_type.environment.server": {
-    "defaultMessage": "Tagapagsilbi"
+    "defaultMessage": "Pansilbi"
   },
   "search.filter_type.license.open_source": {
     "defaultMessage": "Bukas na pinagmulan"

From 93b79759c719cb7a6668bf0ec09d3bf0b27a0d47 Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Mon, 17 Nov 2025 18:41:52 +0000
Subject: [PATCH 62/64] Add auth servers unreachable warning to app (#4774)

* Add auth servers unreachable warning to app

* Check auth status every 5 minutes

* Use admonition in auth server warning

* feat: tanstack

* Fix auth server reachability query

* Format

* intl extract

---------

Co-authored-by: Calum H. (IMB11) <contact@cal.engineer>
---
 .vscode/settings.json                         |  2 +-
 apps/app-frontend/src/App.vue                 | 57 +++++++++++++++++--
 apps/app-frontend/src/helpers/auth.js         |  8 +++
 .../app-frontend/src/locales/en-US/index.json |  6 ++
 apps/app/build.rs                             |  1 +
 apps/app/src/api/auth.rs                      |  8 +++
 packages/app-lib/src/api/minecraft_auth.rs    | 16 ++++++
 7 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index d4d338f6..ec2392f5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,7 +13,7 @@
 	},
 	"editor.defaultFormatter": "esbenp.prettier-vscode",
 	"[vue]": {
-		"editor.defaultFormatter": "esbenp.prettier-vscode"
+		"editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
 	},
 	"[typescript]": {
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index da980ba1..75528807 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -26,6 +26,7 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 import {
+	Admonition,
 	Avatar,
 	Button,
 	ButtonStyled,
@@ -36,8 +37,10 @@ import {
 	ProgressSpinner,
 	provideModrinthClient,
 	provideNotificationManager,
+	useDebugLogger,
 } from '@modrinth/ui'
 import { renderString } from '@modrinth/utils'
+import { useQuery } from '@tanstack/vue-query'
 import { getVersion } from '@tauri-apps/api/app'
 import { invoke } from '@tauri-apps/api/core'
 import { getCurrentWindow } from '@tauri-apps/api/window'
@@ -71,6 +74,7 @@ import URLConfirmModal from '@/components/ui/URLConfirmModal.vue'
 import { useCheckDisableMouseover } from '@/composables/macCssFix.js'
 import { hide_ads_window, init_ads_window, show_ads_window } from '@/helpers/ads.js'
 import { debugAnalytics, initAnalytics, optOutAnalytics, trackEvent } from '@/helpers/analytics'
+import { check_reachable } from '@/helpers/auth.js'
 import { get_user } from '@/helpers/cache.js'
 import { command_listener, warning_listener } from '@/helpers/events.js'
 import { useFetch } from '@/helpers/fetch.js'
@@ -139,6 +143,27 @@ const criticalErrorMessage = ref()
 
 const isMaximized = ref(false)
 
+const authUnreachableDebug = useDebugLogger('AuthReachableChecker')
+const authServerQuery = useQuery({
+	queryKey: ['authServerReachability'],
+	queryFn: async () => {
+		await check_reachable()
+		authUnreachableDebug('Auth servers are reachable')
+		return true
+	},
+	refetchInterval: 5 * 60 * 1000, // 5 minutes
+	retry: false,
+	refetchOnWindowFocus: false,
+})
+
+const authUnreachable = computed(() => {
+	if (authServerQuery.isError.value && !authServerQuery.isLoading.value) {
+		console.warn('Failed to reach auth servers', authServerQuery.error.value)
+		return true
+	}
+	return false
+})
+
 onMounted(async () => {
 	await useCheckDisableMouseover()
 
@@ -177,6 +202,15 @@ const messages = defineMessages({
 		id: 'app.update.downloading-update',
 		defaultMessage: 'Downloading update ({percent}%)',
 	},
+	authUnreachableHeader: {
+		id: 'app.auth-servers.unreachable.header',
+		defaultMessage: 'Cannot reach authentication servers',
+	},
+	authUnreachableBody: {
+		id: 'app.auth-servers.unreachable.body',
+		defaultMessage:
+			'Minecraft authentication servers may be down right now. Check your internet connection and try again later.',
+	},
 })
 
 async function setupApp() {
@@ -325,7 +359,11 @@ const handleClose = async () => {
 
 const router = useRouter()
 router.afterEach((to, from, failure) => {
-	trackEvent('PageView', { path: to.path, fromPath: from.path, failed: failure })
+	trackEvent('PageView', {
+		path: to.path,
+		fromPath: from.path,
+		failed: failure,
+	})
 })
 const route = useRoute()
 
@@ -989,16 +1027,25 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 					width: 'calc(100% - var(--right-bar-width))',
 				}"
 			></div>
-			<div
+			<Admonition
 				v-if="criticalErrorMessage"
-				class="m-6 mb-0 flex flex-col border-red bg-bg-red rounded-2xl border-2 border-solid p-4 gap-1 font-semibold text-contrast"
+				type="critical"
+				:header="criticalErrorMessage.header"
+				class="m-6 mb-0"
 			>
-				<h1 class="m-0 text-lg font-extrabold">{{ criticalErrorMessage.header }}</h1>
 				<div
 					class="markdown-body text-primary"
 					v-html="renderString(criticalErrorMessage.body ?? '')"
 				></div>
-			</div>
+			</Admonition>
+			<Admonition
+				v-if="authUnreachable"
+				type="warning"
+				:header="formatMessage(messages.authUnreachableHeader)"
+				class="m-6 mb-0"
+			>
+				{{ formatMessage(messages.authUnreachableBody) }}
+			</Admonition>
 			<RouterView v-slot="{ Component }">
 				<template v-if="Component">
 					<Suspense @pending="loading.startLoading()" @resolve="loading.stopLoading()">
diff --git a/apps/app-frontend/src/helpers/auth.js b/apps/app-frontend/src/helpers/auth.js
index 4e9ea9d8..0201f6b6 100644
--- a/apps/app-frontend/src/helpers/auth.js
+++ b/apps/app-frontend/src/helpers/auth.js
@@ -13,6 +13,14 @@ import { invoke } from '@tauri-apps/api/core'
 //   await authenticate_await_completion()
 // }
 
+/**
+ * Check if the authentication servers are reachable, throwing an exception if
+ * not reachable.
+ */
+export async function check_reachable() {
+	await invoke('plugin:auth|check_reachable')
+}
+
 /**
  * Authenticate a user with Hydra - part 1.
  * This begins the authentication flow quasi-synchronously.
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 854998fe..f695cbca 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1,4 +1,10 @@
 {
+  "app.auth-servers.unreachable.body": {
+    "message": "Minecraft authentication servers may be down right now. Check your internet connection and try again later."
+  },
+  "app.auth-servers.unreachable.header": {
+    "message": "Cannot reach authentication servers"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Developer mode enabled."
   },
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 468b5c27..aacad577 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -12,6 +12,7 @@ fn main() {
                 "auth",
                 InlinedPlugin::new()
                     .commands(&[
+                        "check_reachable",
                         "login",
                         "remove_user",
                         "get_default_user",
diff --git a/apps/app/src/api/auth.rs b/apps/app/src/api/auth.rs
index d7bbe3a9..e482680f 100644
--- a/apps/app/src/api/auth.rs
+++ b/apps/app/src/api/auth.rs
@@ -7,6 +7,7 @@ use theseus::prelude::*;
 pub fn init<R: Runtime>() -> TauriPlugin<R> {
     tauri::plugin::Builder::<R>::new("auth")
         .invoke_handler(tauri::generate_handler![
+            check_reachable,
             login,
             remove_user,
             get_default_user,
@@ -16,6 +17,13 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
         .build()
 }
 
+/// Checks if the authentication servers are reachable.
+#[tauri::command]
+pub async fn check_reachable() -> Result<()> {
+    minecraft_auth::check_reachable().await?;
+    Ok(())
+}
+
 /// Authenticate a user with Hydra - part 1
 /// This begins the authentication flow quasi-synchronously, returning a URL to visit (that the user will sign in at)
 #[tauri::command]
diff --git a/packages/app-lib/src/api/minecraft_auth.rs b/packages/app-lib/src/api/minecraft_auth.rs
index ae5e1a6d..8de63a1f 100644
--- a/packages/app-lib/src/api/minecraft_auth.rs
+++ b/packages/app-lib/src/api/minecraft_auth.rs
@@ -1,7 +1,23 @@
 //! Authentication flow interface
 
+use reqwest::StatusCode;
+
 use crate::State;
 use crate::state::{Credentials, MinecraftLoginFlow};
+use crate::util::fetch::REQWEST_CLIENT;
+
+#[tracing::instrument]
+pub async fn check_reachable() -> crate::Result<()> {
+    let resp = REQWEST_CLIENT
+        .get("https://api.minecraftservices.com/entitlements/mcstore")
+        .send()
+        .await?;
+    if resp.status() == StatusCode::UNAUTHORIZED {
+        return Ok(());
+    }
+    resp.error_for_status()?;
+    Ok(())
+}
 
 #[tracing::instrument]
 pub async fn begin_login() -> crate::Result<MinecraftLoginFlow> {

From e837d9fa30df9e63f51fa7785c794655a1178b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Talbot?=
 <108630700+fetchfern@users.noreply.github.com>
Date: Tue, 18 Nov 2025 03:36:55 -0800
Subject: [PATCH 63/64] Add route to reprocess a refund charge's tax record
 (#4791)

---
 apps/labrinth/src/routes/internal/billing.rs | 188 ++++++++++++++++++-
 1 file changed, 184 insertions(+), 4 deletions(-)

diff --git a/apps/labrinth/src/routes/internal/billing.rs b/apps/labrinth/src/routes/internal/billing.rs
index 6e6c180e..6c8276e3 100644
--- a/apps/labrinth/src/routes/internal/billing.rs
+++ b/apps/labrinth/src/routes/internal/billing.rs
@@ -394,16 +394,196 @@ pub async fn refund_charge(
         transaction.commit().await?;
 
         if let Some(Err(error)) = anrok_result {
-            return Ok(HttpResponse::InternalServerError().json(serde_json::json!({
-                "error": "partial_failure",
-                "description": &format!("This refund was not processed by the tax processing system. It was still processed on Stripe's end. Manual intervention is required to add a tax record for the refund charge. This will not impact the customer. Tax API Error: {error}")
-            })));
+            if let anrok::AnrokError::Conflict(m) = &error
+                && m.contains("transactionExpectedVersionMismatch")
+            {
+                return Err(ApiError::InvalidInput(
+                    "This refund has been processed on Stripe's end, but not on the tax processor's end. The tax transaction has been modified externally since its creation. \
+                    This is likely caused by a change in nexus for the customer's jurisdiction, which lead to a new tax amount paid by the seller being calculated on the transaction. \
+                    Manual intervention is required to verify the tax transaction on the platform's end and update the refund's tax transaction record."
+                        .to_owned(),
+                ));
+            } else {
+                return Err(ApiError::InvalidInput(format!(
+                    "This refund has been processed on Stripe's end, but not on the tax processor's end. An unexpected error occurred, preventing the refund transaction from being processed \
+                    on the tax platform's end. Error: {error}"
+                )));
+            }
         }
     }
 
     Ok(HttpResponse::NoContent().finish())
 }
 
+#[post("charge/{id}/tax/reprocess")]
+pub async fn reprocess_charge_tax(
+    req: HttpRequest,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    session_queue: web::Data<AuthQueue>,
+    info: web::Path<(crate::models::ids::ChargeId,)>,
+    anrok_client: web::Data<anrok::Client>,
+    stripe_client: web::Data<stripe::Client>,
+) -> Result<HttpResponse, ApiError> {
+    let user = get_user_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Scopes::SESSION_ACCESS,
+    )
+    .await?
+    .1;
+
+    let (id,) = info.into_inner();
+
+    if !user.role.is_admin() {
+        return Err(ApiError::CustomAuthentication(
+            "You do not have permission to reprocess a tax transaction!"
+                .to_string(),
+        ));
+    }
+
+    let mut txn = pool.begin().await?;
+
+    let charge_refund = charge_item::DBCharge::get(id.into(), &mut *txn)
+        .await?
+        .ok_or_else(|| ApiError::NotFound)?;
+
+    let Some(parent_charge_id) = charge_refund.parent_charge_id else {
+        return Err(ApiError::InvalidInput(
+            "This charge does not have a parent!".to_string(),
+        ));
+    };
+
+    match charge_refund.tax_platform_id {
+        Some(_) => {
+            return Err(ApiError::InvalidInput(
+                "Refund charge already has a tax transaction ID!".to_string(),
+            ));
+        }
+        None => {
+            let charge =
+                charge_item::DBCharge::get(parent_charge_id, &mut *txn)
+                    .await?
+                    .ok_or_else(|| ApiError::NotFound)?;
+
+            let payment_platform_id = charge
+                .payment_platform_id
+                .ok_or_else(|| {
+                    ApiError::Internal(eyre::eyre!(
+                        "parent charge is missing a payment platform ID"
+                    ))
+                })?
+                .parse::<stripe::PaymentIntentId>()
+                .map_err(|_| {
+                    ApiError::Internal(eyre::eyre!(
+                        "parent charge has an invalid payment platform ID."
+                    ))
+                })?;
+
+            let pi = stripe::PaymentIntent::retrieve(
+                &stripe_client,
+                &payment_platform_id,
+                &["payment_method"],
+            )
+            .await?;
+
+            let Some(billing_address) = pi
+                .payment_method
+                .and_then(|x| x.into_object())
+                .and_then(|x| x.billing_details.address)
+            else {
+                return Err(ApiError::InvalidInput(
+                    "Missing billing address for payment method.".to_owned(),
+                ));
+            };
+
+            let tax_id =
+                product_info_by_product_price_id(charge.price_id, &mut *txn)
+                    .await?
+                    .ok_or_else(|| {
+                        ApiError::InvalidInput(
+                            "Could not find product tax info for price ID!"
+                                .to_owned(),
+                        )
+                    })?
+                    .tax_identifier
+                    .tax_processor_id;
+
+            let Some((
+                (original_tax_platform_id, original_tax_transaction_version),
+                original_tax_platform_accounting_time,
+            )) = charge
+                .tax_platform_id
+                .clone()
+                .zip(charge.tax_transaction_version)
+                .zip(charge.tax_platform_accounting_time)
+            else {
+                return Err(ApiError::InvalidInput(
+                    "Charge is missing full tax information. Please wait for the original charge to be synchronized with the tax processor."
+                        .to_owned(),
+                ));
+            };
+            let refund_id =
+                charge_refund.payment_platform_id.ok_or_else(|| {
+                    ApiError::Internal(eyre::eyre!(
+                        "Refund charge is missing a payment platform ID!"
+                    ))
+                })?;
+
+            let refund_id =
+                stripe::RefundId::from_str(&refund_id).map_err(|_| {
+                    ApiError::Internal(eyre::eyre!("Invalid refund ID!"))
+                })?;
+
+            let anrok_txn_result = anrok_client
+                .negate_or_create_partial_negation(
+                    original_tax_platform_id,
+                    original_tax_transaction_version,
+                    charge.amount + charge.tax_amount,
+                    &anrok::Transaction {
+                        id: anrok::transaction_id_stripe_pyr(&refund_id),
+                        fields: anrok::TransactionFields {
+                            customer_address:
+                                anrok::Address::from_stripe_address(
+                                    &billing_address,
+                                ),
+                            currency_code: charge.currency_code.clone(),
+                            accounting_time:
+                                original_tax_platform_accounting_time,
+                            accounting_time_zone:
+                                anrok::AccountingTimeZone::Utc,
+                            line_items: vec![
+                                anrok::LineItem::new_including_tax_amount(
+                                    tax_id,
+                                    -charge_refund.amount,
+                                ),
+                            ],
+                            customer_id: Some(format!(
+                                "stripe:cust:{}",
+                                user.stripe_customer_id
+                                    .unwrap_or_else(|| "unknown".to_owned())
+                            )),
+                            customer_name: Some("Customer".to_owned()),
+                        },
+                    },
+                )
+                .await;
+
+            if let Err(error) = anrok_txn_result {
+                return Err(ApiError::InvalidInput(format!(
+                    "There was an error processing the tax transaction: {error}. Please make sure the version has been incremented in case of an external modification."
+                )));
+            }
+        }
+    }
+
+    txn.commit().await?;
+
+    Ok(HttpResponse::NoContent().finish())
+}
+
 #[derive(Deserialize)]
 pub struct SubscriptionEdit {
     pub interval: Option<PriceDuration>,

From 9af19d01e54cdf5092157ef1f7bdfb2fb4148a3b Mon Sep 17 00:00:00 2001
From: Truman Gao <106889354+tdgao@users.noreply.github.com>
Date: Tue, 18 Nov 2025 10:05:24 -0800
Subject: [PATCH 64/64] Fix modrinth+ firing ad requests on load (#4792)

---
 apps/app-frontend/src/App.vue | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 75528807..6f2a17a8 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -387,7 +387,7 @@ async function fetchCredentials() {
 	if (creds && creds.user_id) {
 		creds.user = await get_user(creds.user_id).catch(handleError)
 	}
-	credentials.value = creds
+	credentials.value = creds ?? null
 }
 
 async function signIn() {
@@ -434,20 +434,18 @@ const forceSidebar = computed(
 	() => route.path.startsWith('/browse') || route.path.startsWith('/project'),
 )
 const sidebarVisible = computed(() => sidebarToggled.value || forceSidebar.value)
-const showAd = computed(() => !(!sidebarVisible.value || hasPlus.value))
-
-watch(
-	showAd,
-	() => {
-		if (!showAd.value) {
-			hide_ads_window(true)
-		} else {
-			init_ads_window(true)
-		}
-	},
-	{ immediate: true },
+const showAd = computed(
+	() => sidebarVisible.value && !hasPlus.value && credentials.value !== undefined,
 )
 
+watch(showAd, () => {
+	if (!showAd.value) {
+		hide_ads_window(true)
+	} else {
+		init_ads_window(true)
+	}
+})
+
 onMounted(() => {
 	invoke('show_window')